From 8a65154201e36dba60c53bc95f340c89aa3d000c Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sat, 1 Oct 2005 07:38:05 +0000 Subject: Reset the IM context before activating the entry. 2005-10-01 Christian Persch * lib/widgets/ephy-location-entry.c: (entry_key_press_cb): Reset the IM context before activating the entry. * lib/widgets/ephy-node-view.c: (ephy_node_view_key_press_cb): * src/ephy-find-toolbar.c: (tab_search_key_press_cb): Add GDK_ISO_Enter to recognised keyvals. --- lib/widgets/ephy-location-entry.c | 12 ++++++++---- lib/widgets/ephy-node-view.c | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c index 483361704..9a670df2e 100644 --- a/lib/widgets/ephy-location-entry.c +++ b/lib/widgets/ephy-location-entry.c @@ -297,16 +297,20 @@ entry_key_press_cb (GtkEntry *entry, GdkEventKey *event, EphyLocationEntry *lentry) { - guint mask = gtk_accelerator_get_default_mod_mask (); + guint state = event->state & gtk_accelerator_get_default_mod_mask (); - if ((event->keyval == GDK_Return || event->keyval == GDK_ISO_Enter) && - (event->state & mask) == GDK_CONTROL_MASK) + if ((event->keyval == GDK_Return || + event->keyval == GDK_KP_Enter || + event->keyval == GDK_ISO_Enter) && + state == GDK_CONTROL_MASK) { + gtk_im_context_reset (entry->im_context); + g_signal_emit_by_name (entry, "activate"); return TRUE; } - else if (event->keyval == GDK_Escape && (event->state & mask) == 0) + else if (event->keyval == GDK_Escape && state == 0) { ephy_location_entry_reset (lentry); /* don't return TRUE since we want to cancel the autocompletion popup too */ diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c index 010195e48..6d48b1ddf 100644 --- a/lib/widgets/ephy-node-view.c +++ b/lib/widgets/ephy-node-view.c @@ -570,7 +570,8 @@ ephy_node_view_key_press_cb (GtkTreeView *treeview, if (event->keyval == GDK_space || event->keyval == GDK_Return || - event->keyval == GDK_KP_Enter) + event->keyval == GDK_KP_Enter || + event->keyval == GDK_ISO_Enter) { if (view->priv->toggle_column >= 0) { -- cgit