rpms/scim-bridge/devel scim-bridge-dont-fallback-some-keyevent.patch, NONE, 1.1 scim-bridge.spec, 1.45, 1.46

[Huang Peng (phuang)]

Author: phuang

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

Modified Files:
	scim-bridge.spec 
Added Files:
	scim-bridge-dont-fallback-some-keyevent.patch 
Log Message:
Do not fall back for some key events to fix a bug (#209626)


scim-bridge-dont-fallback-some-keyevent.patch:

--- NEW FILE scim-bridge-dont-fallback-some-keyevent.patch ---
--- scim-bridge-0.4.12/client-gtk/scim-bridge-client-imcontext-gtk.c.orig	2007-06-06 15:25:14.000000000 +0800
+++ scim-bridge-0.4.12/client-gtk/scim-bridge-client-imcontext-gtk.c	2007-06-06 15:39:12.000000000 +0800
@@ -28,6 +28,8 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkimcontext.h>
 
+#include <gdk/gdkkeysyms.h>
+
 #include "scim-bridge-attribute.h"
 #include "scim-bridge-client.h"
 #include "scim-bridge-client-imcontext-gtk.h"
@@ -614,6 +616,16 @@
     root_klass->finalize (object);
 }
 
+gboolean scim_bridge_fallback_im_context_filter (GdkEventKey *event)
+{
+    /* filter CTRL + U */
+    if ((event->state & GDK_CONTROL_MASK) &&
+    	(event->state & GDK_SHIFT_MASK) &&
+    	((event->keyval == GDK_U) || (event->keyval == GDK_u))) {
+        return FALSE;
+    }
+    return gtk_im_context_filter_keypress (fallback_imcontext, event);
+}
 
 /* Class functions */
 gboolean scim_bridge_client_imcontext_filter_key_event (GtkIMContext *context, GdkEventKey *event)
@@ -639,7 +651,7 @@
 
                 if (set_cursor_location (imcontext, new_window_x, new_window_y, imcontext->cursor_x, imcontext->cursor_y)) {
                     scim_bridge_perrorln ("An IOException occurred at scim_bridge_client_imcontext_filter_key_event ()");
-                    return gtk_im_context_filter_keypress (fallback_imcontext, event);
+		    return scim_bridge_fallback_im_context_filter (event);
                 }
             }
         }
@@ -651,8 +663,8 @@
             return TRUE;
         }
     }
-
-    return gtk_im_context_filter_keypress (fallback_imcontext, event);
+    
+    return scim_bridge_fallback_im_context_filter (event);
 }
 
 


Index: scim-bridge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/scim-bridge/devel/scim-bridge.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- scim-bridge.spec	4 Jun 2007 06:00:10 -0000	1.45
+++ scim-bridge.spec	6 Jun 2007 07:52:52 -0000	1.46
@@ -5,7 +5,7 @@
 
 Name:           scim-bridge
 Version:        0.4.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        SCIM Bridge Gtk IM module
 
 Group:          System Environment/Libraries
@@ -22,6 +22,8 @@
 %endif
 Requires:       scim >= 1.4.6
 
+Patch1:		scim-bridge-dont-fallback-some-keyevent.patch
+
 %description
 SCIM Bridge is a C implementation of a Gtk IM module for SCIM.
 
@@ -54,6 +56,8 @@
 
 %prep
 %setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}}
+%patch1 -p1 -b .1-fallback
+
 %if %{snapshot}
 mkdir m4
 ./bootstrap
@@ -116,6 +120,9 @@
 
 
 %changelog
+* Wed Jun  6 2007 Huang Peng <phuang at redhat.com> - 0.4.12-3
+- Do not fall back for some key events to fix a bug (#209626)
+
 * Mon Jun  4 2007 Jens Petersen <petersen at redhat.com> - 0.4.12-2
 - update scim requires and buildrequires to 1.4.6