Don't commit modifier-adorned characters. (#331369, #335796, Lin Ma and

2007-03-09  Matthias Clasen <mclasen@redhat.com>

        * modules/input/gtkimcontextxim.c
        (gtk_im_context_xim_filter_keypress): Don't commit
        modifier-adorned characters.  (#331369, #335796, Lin Ma
        and others)

svn path=/trunk/; revision=17446

diff --git a/ChangeLog b/ChangeLog
index 65f5668a2c1e50364ba2eb176a3ba3af765a0bd7..52d957a6062d9b83487dfb573efde439a64b13d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-09  Matthias Clasen <mclasen@redhat.com>
+
+       * modules/input/gtkimcontextxim.c 
+       (gtk_im_context_xim_filter_keypress): Don't commit
+       modifier-adorned characters.  (#331369, #335796, Lin Ma
+       and others)
+
 2007-03-09  Matthias Clasen <mclasen@redhat.com>
 
        * Everywhere: Remove unnecessary NULL checks before

diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index 00d2bfebd41bad9823d9a075b1a989ab17bec8fc..addcabf140ec8110a5ffb393ecfe368081720994 100644 (file)
--- a/modules/input/gtkimcontextxim.c
+++ b/modules/input/gtkimcontextxim.c
@@ -728,6 +728,10 @@ gtk_im_context_xim_filter_keypress (GtkIMContext *context,
   if (XFilterEvent ((XEvent *)&xevent, GDK_DRAWABLE_XID (context_xim->client_window)))
     return TRUE;
   
+  if (event->state &
+      (gtk_accelerator_get_default_mod_mask () & ~(GDK_SHIFT_MASK | GDK_CONTROL_MASK))) 
+    return FALSE;
+
  again:
   if (ic)
     num_bytes = XmbLookupString (ic, &xevent, buffer, buffer_size, &keysym, &status);