From 619736c843d7d2c48a97cbdb7c92dc40e21cbae9 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 14 May 2007 10:09:58 +0000 Subject: [PATCH] Fix check for modifier keys. (#438261, Theppitak Karoonboonyanan) 2007-05-14 Behdad Esfahbod * modules/input/gtkimcontextthai.c (gtk_im_context_thai_filter_keypress): Fix check for modifier keys. (#438261, Theppitak Karoonboonyanan) svn path=/branches/gtk-2-10/; revision=17841 --- ChangeLog | 6 ++++++ modules/input/gtkimcontextthai.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 036d9a776b..9a8c358506 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-05-14 Behdad Esfahbod + + * modules/input/gtkimcontextthai.c + (gtk_im_context_thai_filter_keypress): + Fix check for modifier keys. (#438261, Theppitak Karoonboonyanan) + 2007-05-14 Matthias Clasen Merge from trunk: diff --git a/modules/input/gtkimcontextthai.c b/modules/input/gtkimcontextthai.c index b1a0c5dc45..3cc67c8457 100644 --- a/modules/input/gtkimcontextthai.c +++ b/modules/input/gtkimcontextthai.c @@ -288,7 +288,8 @@ gtk_im_context_thai_filter_keypress (GtkIMContext *context, if (event->type != GDK_KEY_PRESS) return FALSE; - if (event->state & (GDK_MODIFIER_MASK & ~GDK_SHIFT_MASK) || + if (event->state & (GDK_MODIFIER_MASK + & ~(GDK_SHIFT_MASK | GDK_LOCK_MASK | GDK_MOD2_MASK)) || is_context_lost_key (event->keyval)) { #ifndef GTK_IM_CONTEXT_THAI_NO_FALLBACK