rpms/scim-bridge/devel scim-bridge-0.4.15-fix-gdm.patch, NONE, 1.1 scim-bridge.spec, 1.56, 1.57

Huang Peng (phuang) fedora-extras-commits at redhat.com
Tue Mar 4 05:05:26 UTC 2008


Author: phuang

Update of /cvs/pkgs/rpms/scim-bridge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18961

Modified Files:
	scim-bridge.spec 
Added Files:
	scim-bridge-0.4.15-fix-gdm.patch 
Log Message:
- Update to 0.4.15.
- Let scim-bridge gtkim context can work with gtkplug widget #251787.


scim-bridge-0.4.15-fix-gdm.patch:

--- NEW FILE scim-bridge-0.4.15-fix-gdm.patch ---
diff -up scim-bridge-0.4.15/client-gtk/scim-bridge-client-imcontext-gtk.c.fix-gdm scim-bridge-0.4.15/client-gtk/scim-bridge-client-imcontext-gtk.c
--- scim-bridge-0.4.15/client-gtk/scim-bridge-client-imcontext-gtk.c.fix-gdm	2007-06-23 20:58:40.000000000 +0800
+++ scim-bridge-0.4.15/client-gtk/scim-bridge-client-imcontext-gtk.c	2008-03-04 13:00:49.000000000 +0800
@@ -37,6 +37,8 @@
 #include "scim-bridge-output.h"
 #include "scim-bridge-string.h"
 
+#define SEND_EVENT_MASK 0x02
+
 /* Typedef */
 struct _ScimBridgeClientIMContext
 {
@@ -202,7 +204,7 @@ static gboolean key_snooper (GtkWidget *
 {
     scim_bridge_pdebugln (7, "key_snooper ()");
 
-    if (!event->send_event && scim_bridge_client_is_messenger_opened () && focused_imcontext != NULL) {
+    if (!(event->send_event & SEND_EVENT_MASK)  && scim_bridge_client_is_messenger_opened () && focused_imcontext != NULL) {
         if (focused_imcontext->client_window != NULL) {
             int new_window_x;
             int new_window_y;
@@ -558,7 +560,7 @@ void scim_bridge_client_imcontext_forwar
 { 
     GdkEventKey gdk_event;
     scim_bridge_key_event_bridge_to_gdk (&gdk_event, imcontext->client_window, key_event);
-    gdk_event.send_event = TRUE;
+    gdk_event.send_event |= SEND_EVENT_MASK;
     if (imcontext == focused_imcontext && focused_widget != NULL) {
         const char *signal_name = NULL;
         if (scim_bridge_key_event_is_pressed (key_event)) {
@@ -764,7 +766,7 @@ gboolean scim_bridge_client_imcontext_fi
 
     ScimBridgeClientIMContext *imcontext = SCIM_BRIDGE_CLIENT_IMCONTEXT (context);
     
-    if (!event->send_event && scim_bridge_client_is_messenger_opened () && imcontext != NULL && !key_snooper_used) {
+    if (!(event->send_event & SEND_EVENT_MASK) && scim_bridge_client_is_messenger_opened () && imcontext != NULL && !key_snooper_used) {
 
         if (imcontext->client_window != NULL) {
             int new_window_x;


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- scim-bridge.spec	19 Feb 2008 19:24:52 -0000	1.56
+++ scim-bridge.spec	4 Mar 2008 05:04:51 -0000	1.57
@@ -4,8 +4,8 @@
 %define build_qt 1
 
 Name:           scim-bridge
-Version:        0.4.14
-Release:        2%{?dist}
+Version:        0.4.15
+Release:        1%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
 Group:          System Environment/Libraries
@@ -23,6 +23,8 @@
 %endif
 Requires:       scim >= 1.4.6
 
+Patch0:         scim-bridge-0.4.15-fix-gdm.patch
+
 
 %description
 SCIM Bridge is a C implementation of a Gtk IM module for SCIM.
@@ -68,6 +70,7 @@
 
 %prep
 %setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}}
+%patch0 -p1 -b .0-fix-gdm
 
 %if %{snapshot}
 mkdir m4
@@ -138,6 +141,10 @@
 
 
 %changelog
+* Tue Mar 04 2008 Huang Peng <phuang at redhat.com> - 0.4.15-1
+- Update to 0.4.15.
+- Let scim-bridge gtkim context can work with gtkplug widget #251787.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.4.14-2
 - Autorebuild for GCC 4.3
 




More information about the fedora-extras-commits mailing list