rpms/ibus-m17n/F-12 ibus-m17n-iok.patch, 1.2, 1.3 ibus-m17n.spec, 1.20, 1.21

[Huang Peng]

Author: phuang

Update of /cvs/pkgs/rpms/ibus-m17n/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25602

Modified Files:
	ibus-m17n-iok.patch ibus-m17n.spec 
Log Message:
Update iok patch to fix bug 530493

ibus-m17n-iok.patch:
 engine.c |   56 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 13 deletions(-)

Index: ibus-m17n-iok.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-12/ibus-m17n-iok.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ibus-m17n-iok.patch	14 Oct 2009 07:44:39 -0000	1.2
+++ ibus-m17n-iok.patch	23 Oct 2009 14:14:32 -0000	1.3
@@ -1,5 +1,5 @@
 diff --git a/src/engine.c b/src/engine.c
-index d6ac852..0355fca 100644
+index d6ac852..6427a55 100644
 --- a/src/engine.c
 +++ b/src/engine.c
 @@ -17,6 +17,8 @@ struct _IBusM17NEngine {
@@ -42,24 +42,61 @@ index d6ac852..0355fca 100644
  
      m17n->table = ibus_lookup_table_new (9, 0, TRUE, TRUE);
      m17n->context = NULL;
-@@ -166,6 +183,7 @@ ibus_m17n_engine_constructor (GType                   type,
+@@ -159,6 +176,7 @@ ibus_m17n_engine_constructor (GType                   type,
+     IBusM17NEngine *m17n;
+     MInputMethod *im;
+     const gchar *engine_name;
++    gchar **strv;
+ 
+     m17n = (IBusM17NEngine *) G_OBJECT_CLASS (parent_class)->constructor (type,
+                                                        n_construct_params,
+@@ -166,6 +184,14 @@ 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);
++
++    /* 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 (im_table == NULL) {
          im_table = g_hash_table_new_full (g_str_hash,
-@@ -187,6 +205,8 @@ ibus_m17n_engine_constructor (GType                   type,
-         lang = strv[0];
-         name = strv[1];
- 
-+        if(strcmp(name,"inscript")==0)
-+            ibus_property_set_visible(m17n->show_iok_prop,TRUE);
-         im = minput_open_im (msymbol (lang), msymbol (name), NULL);
+@@ -176,18 +202,7 @@ ibus_m17n_engine_constructor (GType                   type,
+ 
+     im = (MInputMethod *) g_hash_table_lookup (im_table, engine_name);
+     if (im == NULL) {
+-        gchar *lang;
+-        gchar *name;
+-        gchar **strv;
+-
+-        strv = g_strsplit (engine_name, ":", 2);
+-
+-        g_assert (g_strv_length (strv) == 2);
+-
+-        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);
-@@ -231,6 +251,7 @@ ibus_m17n_engine_destroy (IBusM17NEngine *m17n)
+             mplist_put (im->driver.callback_list, Minput_preedit_draw, ibus_m17n_engine_callback);
+@@ -207,9 +222,9 @@ ibus_m17n_engine_constructor (GType                   type,
+             g_hash_table_insert (im_table, g_strdup (engine_name), im);
+         }
+ 
+-        g_strfreev (strv);
+     }
+ 
++    g_strfreev (strv);
+     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)
          m17n->prop_list = NULL;
      }
  
@@ -67,7 +104,7 @@ index d6ac852..0355fca 100644
      if (m17n->status_prop) {
          g_object_unref (m17n->status_prop);
          m17n->status_prop = NULL;
-@@ -383,6 +404,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine)
+@@ -383,6 +399,7 @@ ibus_m17n_engine_focus_in (IBusEngine *engine)
      IBusM17NEngine *m17n = (IBusM17NEngine *) engine;
  
      ibus_engine_register_properties (engine, m17n->prop_list);
@@ -75,7 +112,7 @@ index d6ac852..0355fca 100644
      ibus_m17n_engine_process_key (m17n, msymbol ("input-focus-in"));
  
      parent_class->focus_in (engine);
-@@ -468,6 +490,19 @@ ibus_m17n_engine_property_activate (IBusEngine  *engine,
+@@ -468,6 +485,19 @@ ibus_m17n_engine_property_activate (IBusEngine  *engine,
                                      const gchar *prop_name,
                                      guint        prop_state)
  {


Index: ibus-m17n.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus-m17n/F-12/ibus-m17n.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ibus-m17n.spec	14 Oct 2009 07:44:39 -0000	1.20
+++ ibus-m17n.spec	23 Oct 2009 14:14:32 -0000	1.21
@@ -2,7 +2,7 @@
 
 Name:       ibus-m17n
 Version:    1.2.0.20090617
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/*
 
 %changelog
+* Fri Oct 23 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090617-5
+- Update iok patch to fix bug 530493.
+
 * Wed Oct 14 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090617-4
 - Update iok patch to fix build error.