rpms/ibus-m17n/devel .cvsignore, 1.12, 1.13 ibus-m17n-iok.patch, 1.2, 1.3 ibus-m17n.spec, 1.20, 1.21 sources, 1.12, 1.13
Huang Peng
phuang at fedoraproject.org
Thu Dec 17 00:04:59 UTC 2009
Author: phuang
Update of /cvs/pkgs/rpms/ibus-m17n/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17265
Modified Files:
.cvsignore ibus-m17n-iok.patch ibus-m17n.spec sources
Log Message:
Update 1.2.0.20091217
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore 20 Nov 2009 05:57:02 -0000 1.12
+++ .cvsignore 17 Dec 2009 00:04:59 -0000 1.13
@@ -1 +1 @@
-ibus-m17n-1.2.0.20091120.tar.gz
+ibus-m17n-1.2.0.20091217.tar.gz
ibus-m17n-iok.patch:
engine.c | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 44 insertions(+), 7 deletions(-)
Index: ibus-m17n-iok.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/devel/ibus-m17n-iok.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ibus-m17n-iok.patch 20 Nov 2009 05:57:02 -0000 1.2
+++ ibus-m17n-iok.patch 17 Dec 2009 00:04:59 -0000 1.3
@@ -1,5 +1,5 @@
diff --git a/src/engine.c b/src/engine.c
-index d6ac852..6427a55 100644
+index 8dc5c46..1f602a1 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -17,6 +17,8 @@ struct _IBusM17NEngine {
@@ -50,42 +50,36 @@ index d6ac852..6427a55 100644
m17n = (IBusM17NEngine *) G_OBJECT_CLASS (parent_class)->constructor (type,
n_construct_params,
-@@ -166,6 +184,14 @@ ibus_m17n_engine_constructor (GType type,
+@@ -166,6 +184,15 @@ ibus_m17n_engine_constructor (GType type,
engine_name = ibus_engine_get_name ((IBusEngine *) m17n);
g_assert (engine_name);
+ m17n->keymap_name = g_strdup (engine_name);
+
-+ strv = g_strsplit (engine_name, ":", 2);
-+ g_assert (g_strv_length (strv) == 2);
++ strv = g_strsplit (engine_name, ":", 3);
++ g_assert (g_strv_length (strv) == 3);
++ g_assert (g_strcmp0 (strv[0], "m17n") == 0);
+
+ /* show iok icon for inscript */
-+ if(strcmp (strv[1], "inscript") == 0 || strcmp (strv[1] , "inscript2") == 0)
-+ ibus_property_set_visible (m17n->show_iok_prop,TRUE);
++ if(strcmp (strv[2], "inscript") == 0 || strcmp (strv[2] , "inscript2") == 0)
++ ibus_property_set_visible (m17n->show_iok_prop, TRUE);
if (im_table == NULL) {
im_table = g_hash_table_new_full (g_str_hash,
-@@ -176,18 +202,7 @@ ibus_m17n_engine_constructor (GType type,
-
- im = (MInputMethod *) g_hash_table_lookup (im_table, engine_name);
+@@ -178,12 +205,6 @@ ibus_m17n_engine_constructor (GType type,
if (im == NULL) {
-- gchar *lang;
-- gchar *name;
+ gchar *lang;
+ gchar *name;
- gchar **strv;
-
-- strv = g_strsplit (engine_name, ":", 2);
--
-- g_assert (g_strv_length (strv) == 2);
+- strv = g_strsplit (engine_name, ":", 3);
-
-- lang = strv[0];
-- name = strv[1];
--
-- im = minput_open_im (msymbol (lang), msymbol (name), NULL);
-+ im = minput_open_im (msymbol (strv[0]), msymbol (strv[1]), NULL);
- if (im != NULL) {
- mplist_put (im->driver.callback_list, Minput_preedit_start, ibus_m17n_engine_callback);
- mplist_put (im->driver.callback_list, Minput_preedit_draw, ibus_m17n_engine_callback);
-@@ -207,9 +222,9 @@ ibus_m17n_engine_constructor (GType type,
+- g_assert (g_strv_length (strv) == 3);
+- g_assert (g_strcmp0 (strv[0], "m17n") == 0);
+
+ lang = strv[1];
+ name = strv[2];
+@@ -208,9 +229,9 @@ ibus_m17n_engine_constructor (GType type,
g_hash_table_insert (im_table, g_strdup (engine_name), im);
}
@@ -96,7 +90,7 @@ index d6ac852..6427a55 100644
if (im == NULL) {
g_warning ("Can not find m17n keymap %s", engine_name);
g_object_unref (m17n);
-@@ -231,6 +246,7 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n)
+@@ -232,6 +253,7 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n)
m17n->prop_list = NULL;
}
@@ -104,7 +98,7 @@ index d6ac852..6427a55 100644
if (m17n->status_prop) {
g_object_unref (m17n->status_prop);
m17n->status_prop = NULL;
-@@ -383,6 +399,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine)
+@@ -384,6 +406,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine)
IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
ibus_engine_register_properties (engine, m17n->prop_list);
@@ -112,7 +106,7 @@ index d6ac852..6427a55 100644
ibus_m17n_engine_process_key (m17n, msymbol ("input-focus-in"));
parent_class->focus_in (engine);
-@@ -468,6 +485,19 @@ ibus_m17n_engine_property_activate (IBusEngine *engine,
+@@ -469,6 +492,20 @@ ibus_m17n_engine_property_activate (IBusEngine *engine,
const gchar *prop_name,
guint prop_state)
{
@@ -121,10 +115,11 @@ index d6ac852..6427a55 100644
+
+ IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
+
-+ strv = g_strsplit (m17n->keymap_name, ":", 2);
-+ g_assert (g_strv_length (strv) == 2);
++ strv = g_strsplit (m17n->keymap_name, ":", 3);
++ g_assert (g_strv_length (strv) == 3);
++ g_assert (g_strcmp0 (strv[0], "m17n") == 0);
+
-+ sprintf (cmd, "/usr/bin/iok -n %s", strv[0]);
++ sprintf (cmd, "/usr/bin/iok -n %s", strv[1]);
+ g_debug ("keymap name = %s,prop_name=%s, prop_state=%d", m17n->keymap_name, prop_name, prop_state);
+ g_strfreev (strv);
+
Index: ibus-m17n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/devel/ibus-m17n.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ibus-m17n.spec 25 Nov 2009 05:40:26 -0000 1.20
+++ ibus-m17n.spec 17 Dec 2009 00:04:59 -0000 1.21
@@ -1,7 +1,7 @@
%define require_ibus_version 1.2.0
Name: ibus-m17n
-Version: 1.2.0.20091120
+Version: 1.2.0.20091217
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
+* Thu Dec 17 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091217-1
+- Update to 1.2.0.20091217.
+- Update iok patch.
+
* Fri Nov 20 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20091120-1
- Update to 1.2.0.20091120.
- Fix bug 530976
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources 20 Nov 2009 05:57:02 -0000 1.12
+++ sources 17 Dec 2009 00:04:59 -0000 1.13
@@ -1 +1 @@
-49314ce44f3e8a1d2714ca6fdae79cb8 ibus-m17n-1.2.0.20091120.tar.gz
+9bcccb93c3385bda01172f846b716048 ibus-m17n-1.2.0.20091217.tar.gz
More information about the fedora-extras-commits
mailing list