aboutsummaryrefslogtreecommitdiffstats
path: root/lib/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'lib/widgets')
-rw-r--r--lib/widgets/ephy-location-entry.c12
-rw-r--r--lib/widgets/ephy-node-view.c3
2 files changed, 10 insertions, 5 deletions
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)
{