summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimos Xenitellis <simos@src.gnome.org>2008-10-08 23:09:57 +0000
committerSimos Xenitellis <simos@src.gnome.org>2008-10-08 23:09:57 +0000
commitd5a1933dc0b9910c2c37332fc3071701b86fe01b (patch)
tree6b5ce4d52ddb425b6cdf7fdfc4430d532efc6e2d
parenta81b85df5bfa4886138406ab91b8fcfbb43a595a (diff)
downloadgdk-pixbuf-d5a1933dc0b9910c2c37332fc3071701b86fe01b.tar.gz
Fixed Bug 554192 – deadkey-only compose sequences now working
svn path=/branches/gtk-2-14/; revision=21614
-rw-r--r--ChangeLog9
-rw-r--r--gtk/gtkimcontextsimple.c6
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e17536807..918479bb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-09 Simos Xenitellis <simos@gnome.org>
+
+ 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 <chpe@gnome.org>
Bug 554702 – gtkfilesystem leaks GError
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index a9eeb944b..967d30c48 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, &gtk_compose_table_compact, n_compose))
return TRUE;
+
+ if (check_algorithmically (context_simple, n_compose))
+ return TRUE;
}
/* The current compose_buffer doesn't match anything */