rpms/ibus
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update ibus-HEAD.patch to fix numlock problem

Browse Source
This commit is contained in:
Peng Huang 2009-08-10 02:19:01 +00:00
parent 0f8a6e118c
commit 4474c8ecd5
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ibus-HEAD.patch
View File

@ -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 diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
index 68a77d8..d914eae 100644 index 68a77d8..d914eae 100644
--- a/client/gtk2/ibusimcontext.c --- 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;

6
ibus.spec
View File

@ -8,7 +8,7 @@
Name: ibus Name: ibus
Version: 1.2.0.20090807 Version: 1.2.0.20090807
Release: 2%{?dist} Release: 3%{?dist}
Summary: Intelligent Input Bus for Linux OS Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
@ -228,6 +228,10 @@ fi
%{_datadir}/gtk-doc/html/* %{_datadir}/gtk-doc/html/*
%changelog %changelog
* Mon Aug 10 2009 Peng Huang <shawn.p.huang@gmail.com> - 1.2.0.20090807-3
- Update ibus-HEAD.patch
- Fix Numlock problem.
* Fri Aug 07 2009 Peng Huang <shawn.p.huang@gmail.com> - 1.2.0.20090807-2 * Fri Aug 07 2009 Peng Huang <shawn.p.huang@gmail.com> - 1.2.0.20090807-2
- Update ibus-HEAD.patch - Update ibus-HEAD.patch
- Fix bug 516154. - Fix bug 516154.