rpms/ibus/devel ibus-HEAD.patch,1.21,1.22 ibus.spec,1.80,1.81

[Huang Peng]

Author: phuang

Update of /cvs/pkgs/rpms/ibus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15156

Modified Files:
	ibus-HEAD.patch ibus.spec 
Log Message:
Update ibus-HEAD.patch to fix numlock problem

ibus-HEAD.patch:
 bus/ibusimpl.c              |    1 -
 client/gtk2/ibusimcontext.c |   14 +++++++++++---
 src/ibuskeymap.c            |   10 ++++------
 3 files changed, 15 insertions(+), 10 deletions(-)

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus-HEAD.patch,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ibus-HEAD.patch	7 Aug 2009 06:47:16 -0000	1.21
+++ ibus-HEAD.patch	10 Aug 2009 02:19:01 -0000	1.22
@@ -1,3 +1,15 @@
+diff --git a/bus/ibusimpl.c b/bus/ibusimpl.c
+index 120277f..e841c28 100644
+--- a/bus/ibusimpl.c
++++ b/bus/ibusimpl.c
+@@ -1179,7 +1179,6 @@ bus_ibus_impl_ibus_message (BusIBusImpl     *ibus,
+     ibus_message_set_destination (message, DBUS_SERVICE_DBUS);
+ 
+     if (ibus_message_get_type (message) == DBUS_MESSAGE_TYPE_METHOD_CALL) {
+-        g_debug ("Member = %s", ibus_message_get_member (message));
+         for (i = 0; handlers[i].interface != NULL; i++) {
+             if (ibus_message_is_method_call (message,
+                                              handlers[i].interface,
 diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
 index 68a77d8..d914eae 100644
 --- a/client/gtk2/ibusimcontext.c
@@ -28,3 +40,32 @@ index 68a77d8..d914eae 100644
      }
  }
  
+diff --git a/src/ibuskeymap.c b/src/ibuskeymap.c
+index 9f59c73..b248e18 100644
+--- a/src/ibuskeymap.c
++++ b/src/ibuskeymap.c
+@@ -78,11 +78,8 @@ ibus_keymap_init (IBusKeymap *keymap)
+     gint i, j;
+ 
+     keymap->name = NULL;
+-
+-    for (i = 0; i < 256; i++) {
+-        for (j = 0; j < 5; j++) {
+-            keymap->keymap[i][j] = IBUS_VoidSymbol;
+-        }
++    for (i = 0; i < sizeof (keymap->keymap) / sizeof (guint); i++) {
++        ((guint *)keymap->keymap)[i] = IBUS_VoidSymbol;
+     }
+ }
+ 
+@@ -306,8 +303,9 @@ ibus_keymap_lookup_keysym (IBusKeymap *keymap,
+ 
+     if (keycode < 256) {
+         /* numlock */
+-        if (state & IBUS_MOD2_MASK && keymap->keymap[keycode][6] != IBUS_VoidSymbol)
++        if ((state & IBUS_MOD2_MASK) && (keymap->keymap[keycode][6] != IBUS_VoidSymbol)) {
+             return keymap->keymap[keycode][6];
++        }
+ 
+         state &= IBUS_SHIFT_MASK | IBUS_LOCK_MASK | IBUS_MOD5_MASK;
+ 


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/devel/ibus.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- ibus.spec	7 Aug 2009 06:47:16 -0000	1.80
+++ ibus.spec	10 Aug 2009 02:19:01 -0000	1.81
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.2.0.20090807
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -228,6 +228,10 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Aug 10 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090807-3
+- Update ibus-HEAD.patch
+- Fix Numlock problem.
+
 * Fri Aug 07 2009 Peng Huang <shawn.p.huang at gmail.com> - 1.2.0.20090807-2
 - Update ibus-HEAD.patch
 - Fix bug 516154.