From 05d0dbf5f0c9b6352d5f7b3f7390878b8c2ae521 Mon Sep 17 00:00:00 2001 From: Peng Huang Date: Tue, 2 Feb 2010 03:25:05 +0000 Subject: [PATCH] Update to 1.2.99.20100202 --- .cvsignore | 2 +- ibus-m17n-iok.patch | 37 +++++++++++++++++++++---------------- ibus-m17n.spec | 8 ++++++-- sources | 2 +- 4 files changed, 29 insertions(+), 20 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5e6a1f3..c1d2137 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ibus-m17n-1.2.0.20091217.tar.gz +ibus-m17n-1.2.99.20100202.tar.gz diff --git a/ibus-m17n-iok.patch b/ibus-m17n-iok.patch index 5810dd2..403fa09 100644 --- a/ibus-m17n-iok.patch +++ b/ibus-m17n-iok.patch @@ -1,5 +1,5 @@ diff --git a/src/engine.c b/src/engine.c -index 8dc5c46..1f602a1 100644 +index dcfbe48..057307a 100644 --- a/src/engine.c +++ b/src/engine.c @@ -17,6 +17,8 @@ struct _IBusM17NEngine { @@ -20,9 +20,9 @@ index 8dc5c46..1f602a1 100644 m17n->status_prop = ibus_property_new ("status", PROP_TYPE_NORMAL, NULL, -@@ -144,8 +148,21 @@ ibus_m17n_engine_init (IBusM17NEngine *m17n) - 0, +@@ -145,9 +149,22 @@ ibus_m17n_engine_init (IBusM17NEngine *m17n) NULL); + g_object_ref_sink (m17n->status_prop); + text = ibus_text_new_from_string ("iok"); + m17n->show_iok_prop = ibus_property_new ("iok", @@ -34,15 +34,16 @@ index 8dc5c46..1f602a1 100644 + FALSE, + 0, + NULL); -+ g_object_unref (text); ++ g_object_ref_sink (m17n->show_iok_prop); + m17n->prop_list = ibus_prop_list_new (); + g_object_ref_sink (m17n->prop_list); ibus_prop_list_append (m17n->prop_list, m17n->status_prop); + ibus_prop_list_append (m17n->prop_list, m17n->show_iok_prop); m17n->table = ibus_lookup_table_new (9, 0, TRUE, TRUE); - m17n->context = NULL; -@@ -159,6 +176,7 @@ ibus_m17n_engine_constructor (GType type, + g_object_ref_sink (m17n->table); +@@ -162,6 +179,7 @@ ibus_m17n_engine_constructor (GType type, IBusM17NEngine *m17n; MInputMethod *im; const gchar *engine_name; @@ -50,7 +51,7 @@ index 8dc5c46..1f602a1 100644 m17n = (IBusM17NEngine *) G_OBJECT_CLASS (parent_class)->constructor (type, n_construct_params, -@@ -166,6 +184,15 @@ ibus_m17n_engine_constructor (GType type, +@@ -169,6 +187,15 @@ ibus_m17n_engine_constructor (GType type, engine_name = ibus_engine_get_name ((IBusEngine *) m17n); g_assert (engine_name); @@ -66,7 +67,7 @@ index 8dc5c46..1f602a1 100644 if (im_table == NULL) { im_table = g_hash_table_new_full (g_str_hash, -@@ -178,12 +205,6 @@ ibus_m17n_engine_constructor (GType type, +@@ -181,12 +208,6 @@ ibus_m17n_engine_constructor (GType type, if (im == NULL) { gchar *lang; gchar *name; @@ -79,7 +80,7 @@ index 8dc5c46..1f602a1 100644 lang = strv[1]; name = strv[2]; -@@ -208,9 +229,9 @@ ibus_m17n_engine_constructor (GType type, +@@ -211,9 +232,9 @@ ibus_m17n_engine_constructor (GType type, g_hash_table_insert (im_table, g_strdup (engine_name), im); } @@ -90,15 +91,19 @@ index 8dc5c46..1f602a1 100644 if (im == NULL) { g_warning ("Can not find m17n keymap %s", engine_name); g_object_unref (m17n); -@@ -232,6 +253,7 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n) - m17n->prop_list = NULL; +@@ -240,6 +261,11 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n) + m17n->status_prop = NULL; } ++ if (m17n->show_iok_prop) { ++ g_object_unref (m17n->show_iok_prop); ++ m17n->show_iok_prop = NULL; ++ } + - if (m17n->status_prop) { - g_object_unref (m17n->status_prop); - m17n->status_prop = NULL; -@@ -384,6 +406,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine) + if (m17n->table) { + g_object_unref (m17n->table); + m17n->table = NULL; +@@ -386,6 +412,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine) IBusM17NEngine *m17n = (IBusM17NEngine *) engine; ibus_engine_register_properties (engine, m17n->prop_list); @@ -106,7 +111,7 @@ index 8dc5c46..1f602a1 100644 ibus_m17n_engine_process_key (m17n, msymbol ("input-focus-in")); parent_class->focus_in (engine); -@@ -469,6 +492,20 @@ ibus_m17n_engine_property_activate (IBusEngine *engine, +@@ -471,6 +498,20 @@ ibus_m17n_engine_property_activate (IBusEngine *engine, const gchar *prop_name, guint prop_state) { diff --git a/ibus-m17n.spec b/ibus-m17n.spec index 149c237..2c22511 100644 --- a/ibus-m17n.spec +++ b/ibus-m17n.spec @@ -1,7 +1,7 @@ -%define require_ibus_version 1.2.0 +%define require_ibus_version 1.2.99 Name: ibus-m17n -Version: 1.2.0.20091217 +Version: 1.2.99.20100202 Release: 1%{?dist} Summary: The M17N engine for IBus platform License: GPLv2+ @@ -52,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ibus/component/* %changelog +* Tue Feb 02 2010 Peng Huang - 1.2.99.20100202-1 +- Update to 1.2.99.20100202. +- Update iok patch. + * Thu Dec 17 2009 Peng Huang - 1.2.0.20091217-1 - Update to 1.2.0.20091217. - Update iok patch. diff --git a/sources b/sources index 5ddb2ca..9cd1e6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9bcccb93c3385bda01172f846b716048 ibus-m17n-1.2.0.20091217.tar.gz +e1d306b31fef0182d3f50f984f3737cf ibus-m17n-1.2.99.20100202.tar.gz