rpms/scim/devel scim-1.4.7-fix-gdm.patch, NONE, 1.1 scim.spec, 1.108, 1.109
Huang Peng (phuang)
fedora-extras-commits at redhat.com
Tue Mar 4 04:39:32 UTC 2008
Author: phuang
Update of /cvs/pkgs/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6907
Modified Files:
scim.spec
Added Files:
scim-1.4.7-fix-gdm.patch
Log Message:
Let scim gtkim context work with gtk plug widget #251878.
scim-1.4.7-fix-gdm.patch:
--- NEW FILE scim-1.4.7-fix-gdm.patch ---
diff -up scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.cpp.fix-gdm scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.cpp
--- scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.cpp.fix-gdm 2008-03-04 11:53:56.000000000 +0800
+++ scim-1.4.7/extras/gtk2_immodule/gtkimcontextscim.cpp 2008-03-04 11:56:59.000000000 +0800
@@ -63,6 +63,8 @@
#include "scim_x11_utils.h"
#endif
+#define SEND_EVENT_MASK 0x02
+
using namespace scim;
#include "gtkimcontextscim.h"
@@ -1024,7 +1026,7 @@ gtk_scim_key_snooper (GtkWidget *grab
gboolean ret = FALSE;
- if (_focused_ic && _focused_ic->impl && (event->type == GDK_KEY_PRESS || event->type == GDK_KEY_RELEASE) && !event->send_event) {
+ if (_focused_ic && _focused_ic->impl && (event->type == GDK_KEY_PRESS || event->type == GDK_KEY_RELEASE) && !(event->send_event & SEND_EVENT_MASK)) {
_focused_widget = grab_widget;
KeyEvent key = keyevent_gdk_to_scim (_focused_ic, *event);
@@ -1054,7 +1056,7 @@ gtk_scim_key_snooper (GtkWidget *grab
} else {
SCIM_DEBUG_FRONTEND(3) << "Failed snooper: "
<< ((!_focused_ic || !_focused_ic->impl) ? "Invalid focused ic" :
- (event->send_event ? "send event is set" : "unknown"))
+ ((event->send_event & SEND_EVENT_MASK) ? "send event is set" : "unknown"))
<< "\n";
}
@@ -1639,7 +1641,7 @@ keyevent_scim_to_gdk (const GtkIMContext
gdkevent.type = (scimkey.is_key_release () ? GDK_KEY_RELEASE : GDK_KEY_PRESS);
gdkevent.window = ((ic && ic->impl) ? ic->impl->client_window : 0);
- gdkevent.send_event = TRUE;
+ gdkevent.send_event |= SEND_EVENT_MASK;
gdkevent.time = get_time ();
gdkevent.keyval = scimkey.code;
gdkevent.length = 0;
Index: scim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim/devel/scim.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- scim.spec 3 Mar 2008 10:21:33 -0000 1.108
+++ scim.spec 4 Mar 2008 04:38:54 -0000 1.109
@@ -3,7 +3,7 @@
Name: scim
Version: 1.4.7
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Smart Common Input Method platform
License: LGPLv2+
@@ -40,6 +40,7 @@
Patch19: scim-1.4.7-remove-locale.patch
Patch20: scim-1.4.7-fix-fallback.patch
Patch21: scim-1.4.7-fix-capslock.patch
+Patch22: scim-1.4.7-fix-gdm.patch
%description
SCIM is a user friendly and full featured input method user interface and
@@ -159,7 +160,8 @@
%patch18 -p1 -b .18-sinhala~
%patch19 -p1 -b .19-remove-locale~
%patch20 -p1 -b .20-fix-fallback
-%patch21 -p1 -b .20-fix-capslock
+%patch21 -p1 -b .21-fix-capslock
+%patch22 -p1 -b .22-fix-gdm
%if %{snapshot}
./bootstrap
@@ -297,6 +299,9 @@
%changelog
+* Tue Mar 4 2008 Huang Peng <phuang at redhat.com> - 1.4.7-15
+- Let scim gtkim context work with gtk plug widget #251878.
+
* Mon Mar 3 2008 Huang Peng <phuang at redhat.com> - 1.4.7-14
- Fix capslock problem #431222.
More information about the fedora-extras-commits
mailing list