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
This commit is contained in:
Matthias Clasen 2007-03-09 23:36:55 +00:00 committed by Matthias Clasen
parent 82ce59cd0f
commit 455bc10de5
2 changed files with 11 additions and 0 deletions

View File

@ -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

View File

@ -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);