Imported Debian patch 0.0.2-3
Keng-Yu Lin authored 13 years ago
Osamu Aoki committed 10 years ago
0 | This package uses quilt to manage all modifications to the upstream source. | |
1 | Changes are stored in the source package as diffs in debian/patches and | |
2 | applied during the build. | |
3 | ||
4 | See /usr/share/doc/quilt/README.source for a detailed explanation. |
0 | ibus-array (0.0.2-3) unstable; urgency=critical | |
1 | ||
2 | * Switch to dpkg-source 3.0 (quilt) format | |
3 | * fixed crash of gobject_unref() assertion on libibus2 (Closes: bug#596975) | |
4 | ||
5 | -- Keng-Yu Lin <kengyu@lexical.tw> Thu, 16 Sep 2010 13:37:29 +0800 | |
6 | ||
0 | 7 | ibus-array (0.0.2-2) unstable; urgency=low |
1 | 8 | |
2 | 9 | * Add autopoint, remove cvs from Build-depends (Closes: bug#572472) |
1 | 1 | Section: utils |
2 | 2 | Priority: optional |
3 | 3 | Maintainer: Keng-Yu Lin <kengyu@lexical.tw> |
4 | Build-Depends: debhelper (>= 7.0.50~), autotools-dev, python (>= 2.4), pkg-config, libibus-dev (>= 1.2), libtool (>= 2.2), autoconf (>= 2.5), automake, python-support, autopoint | |
5 | Standards-Version: 3.8.4 | |
4 | Build-Depends: debhelper (>= 7.0.50~), autotools-dev, python (>= 2.4), pkg-config, libibus-dev (>= 1.3), libtool (>= 2.2), autoconf (>= 2.5), automake, python-support, autopoint, quilt (>= 0.46-7~) | |
5 | Standards-Version: 3.9.1 | |
6 | 6 | XS-Python-Version: current, >= 2.4 |
7 | 7 | Homepage: http://code.google.com/p/ibus-array/ |
8 | 8 | |
9 | 9 | Package: ibus-array |
10 | 10 | Architecture: any |
11 | Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ibus (>= 1.2), libsqlite3-0 (>= 3.6) | |
11 | Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ibus (>= 1.3), libsqlite3-0 (>= 3.6) | |
12 | 12 | XB-Python-Version: ${python:Versions} |
13 | 13 | Description: Array 30 input engine for iBus |
14 | 14 | IBus is an Intelligent Input Bus. It is a new input framework for Linux |
15 | 15 | License: GPL-2+ |
16 | 16 | |
17 | 17 | Files: debian/* |
18 | Copyright: 2009, Keng-Yu Lin <kengyu@lexical.tw> | |
19 | License: GPL-2 | |
18 | Copyright: 2010, Keng-Yu Lin <kengyu@lexical.tw> | |
19 | License: GPL-2+ | |
20 | 20 | |
21 | 21 | License: GPL-2 |
22 | 22 | This program is free software; you can redistribute it and/or modify |
23 | 23 | it under the terms of the GNU General Public License as published by |
24 | 24 | the Free Software Foundation; version 2 dated June, 1991. |
25 | ||
25 | . | |
26 | 26 | This program is distributed in the hope that it will be useful, |
27 | 27 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
28 | 28 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
29 | 29 | GNU General Public License for more details. |
30 | ||
30 | . | |
31 | 31 | You should have received a copy of the GNU General Public License |
32 | 32 | along with this program; if not, write to the Free Software |
33 | 33 | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, |
34 | 34 | MA 02110-1301, USA. |
35 | ||
35 | . | |
36 | 36 | On Debian GNU/Linux systems, the complete text of the GNU General |
37 | 37 | Public License can be found in /usr/share/common-licenses/GPL-2. |
38 | 38 | |
41 | 41 | it under the terms of the GNU General Public License as published by |
42 | 42 | the Free Software Foundation; either version 2, or (at your option) |
43 | 43 | any later version. |
44 | ||
44 | . | |
45 | 45 | This program is distributed in the hope that it will be useful, |
46 | 46 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
47 | 47 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
48 | 48 | GNU General Public License for more details. |
49 | ||
49 | . | |
50 | 50 | You should have received a copy of the GNU General Public License |
51 | 51 | along with this program; if not, write to the Free Software |
52 | 52 | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. |
53 | ||
53 | . | |
54 | 54 | On Debian GNU/Linux systems, the complete text of the GNU General |
55 | 55 | Public License can be found in /usr/share/common-licenses/GPL-2. |
0 | --- a/src/engine.c | |
1 | +++ b/src/engine.c | |
2 | @@ -151,7 +151,8 @@ | |
3 | { | |
4 | array_release_context(array_context); | |
5 | ||
6 | - g_object_unref(config); | |
7 | + if (g_object_is_floating (config)) | |
8 | + g_object_unref(config); | |
9 | config = NULL; | |
10 | } | |
11 | ||
12 | @@ -189,6 +190,7 @@ | |
13 | arrayeng->space_press_count = 0; | |
14 | ||
15 | arrayeng->table = ibus_lookup_table_new (10, 0, FALSE, TRUE); | |
16 | + g_object_ref_sink (arrayeng->table); | |
17 | setup_label = ibus_text_new_from_string("Setup"); | |
18 | setup_tooltip = ibus_text_new_from_string("Configure Array 30 engine"); | |
19 | setup_prop = ibus_property_new("setup", | |
20 | @@ -197,12 +199,12 @@ | |
21 | "gtk-preferences", | |
22 | setup_tooltip, | |
23 | TRUE, TRUE, 0, NULL); | |
24 | - g_object_unref(setup_label); | |
25 | - g_object_unref(setup_tooltip); | |
26 | + g_object_ref_sink (setup_prop); | |
27 | ||
28 | arrayeng->prop_list = ibus_prop_list_new(); | |
29 | + g_object_ref_sink (arrayeng->prop_list); | |
30 | + | |
31 | ibus_prop_list_append(arrayeng->prop_list, setup_prop); | |
32 | - g_object_unref(setup_prop); | |
33 | ||
34 | g_signal_connect (config, "value-changed", | |
35 | G_CALLBACK(ibus_config_value_changed), arrayeng); | |
36 | @@ -336,7 +338,8 @@ | |
37 | text, | |
38 | array_preedit->len, //arrayeng->cursor_pos, | |
39 | TRUE); | |
40 | - g_object_unref (text); | |
41 | + if (G_IS_OBJECT (text) && g_object_is_floating (text)) | |
42 | + g_object_unref (text); | |
43 | ||
44 | g_string_free(array_preedit, TRUE); | |
45 | } | |
46 | @@ -430,7 +433,8 @@ | |
47 | IBusText *text; | |
48 | text = ibus_text_new_from_static_string (string); | |
49 | ibus_engine_commit_text ((IBusEngine *)arrayeng, text); | |
50 | - g_object_unref (text); | |
51 | + if (g_object_is_floating (text)) | |
52 | + g_object_unref (text); | |
53 | } | |
54 | ||
55 | static void | |
56 | @@ -669,7 +673,9 @@ | |
57 | if (aux_string) { | |
58 | text = ibus_text_new_from_string(aux_string); | |
59 | ibus_engine_update_auxiliary_text((IBusEngine*)arrayeng, text, TRUE); | |
60 | - g_object_unref(text); | |
61 | + | |
62 | + if (g_object_is_floating (text)) | |
63 | + g_object_unref (text); | |
64 | } | |
65 | } | |
66 |
0 | remove_gobject_unref.patch |
0 | 3.0 (quilt) |