From d5a1933dc0b9910c2c37332fc3071701b86fe01b Mon Sep 17 00:00:00 2001 From: Simos Xenitellis Date: Wed, 8 Oct 2008 23:09:57 +0000 Subject: [PATCH] =?UTF-8?q?Fixed=20Bug=20554192=20=E2=80=93=20deadkey-only?= =?UTF-8?q?=20compose=20sequences=20now=20working?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/branches/gtk-2-14/; revision=21614 --- ChangeLog | 9 +++++++++ gtk/gtkimcontextsimple.c | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e17536807f..918479bb95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-10-09 Simos Xenitellis + + Bug 554192 – double press on the "circumflex" dead key + (standard french 105 keyboard) no longer produces the "^" character + + * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): + Changed the order, put check_compact_table() first, then + check_algorithmically(). + 2008-10-08 Christian Persch Bug 554702 – gtkfilesystem leaks GError diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index a9eeb944ba..967d30c48f 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -933,12 +933,12 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context, return TRUE; tmp_list = tmp_list->next; } - - if (check_algorithmically (context_simple, n_compose)) - return TRUE; if (check_compact_table (context_simple, >k_compose_table_compact, n_compose)) return TRUE; + + if (check_algorithmically (context_simple, n_compose)) + return TRUE; } /* The current compose_buffer doesn't match anything */