From e46901eb21ddd73117ab28e0260c651698e7255b Mon Sep 17 00:00:00 2001 From: Xan Lopez Date: Sat, 11 Sep 2010 22:23:56 +0900 Subject: Update for latest GTK+ 3.x release. --- lib/widgets/ephy-location-entry.c | 10 +++++----- lib/widgets/ephy-node-view.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/widgets') diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c index a2bdc44be..f1028b54e 100644 --- a/lib/widgets/ephy-location-entry.c +++ b/lib/widgets/ephy-location-entry.c @@ -476,7 +476,7 @@ entry_key_press_cb (GtkEntry *entry, { guint state = event->state & gtk_accelerator_get_default_mod_mask (); - if (event->keyval == GDK_Escape && state == 0) + if (event->keyval == GDK_KEY_Escape && state == 0) { ephy_location_entry_reset_internal (lentry, TRUE); /* don't return TRUE since we want to cancel the autocompletion popup too */ @@ -494,9 +494,9 @@ entry_key_press_after_cb (GtkEntry *entry, guint state = event->state & gtk_accelerator_get_default_mod_mask (); - if ((event->keyval == GDK_Return || - event->keyval == GDK_KP_Enter || - event->keyval == GDK_ISO_Enter) && + if ((event->keyval == GDK_KEY_Return || + event->keyval == GDK_KEY_KP_Enter || + event->keyval == GDK_KEY_ISO_Enter) && (state == GDK_CONTROL_MASK || state == (GDK_CONTROL_MASK | GDK_SHIFT_MASK))) { @@ -508,7 +508,7 @@ entry_key_press_after_cb (GtkEntry *entry, return TRUE; } - if ((event->keyval == GDK_Down || event->keyval == GDK_KP_Down) + if ((event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down) && state == 0) { /* If we are focusing the entry, with the cursor at the end of it diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c index 1e7fd5c86..91ef650ed 100644 --- a/lib/widgets/ephy-node-view.c +++ b/lib/widgets/ephy-node-view.c @@ -611,10 +611,10 @@ ephy_node_view_key_press_cb (GtkTreeView *treeview, { gboolean handled = FALSE; - if (event->keyval == GDK_space || - event->keyval == GDK_Return || - event->keyval == GDK_KP_Enter || - event->keyval == GDK_ISO_Enter) + if (event->keyval == GDK_KEY_space || + event->keyval == GDK_KEY_Return || + event->keyval == GDK_KEY_KP_Enter || + event->keyval == GDK_KEY_ISO_Enter) { if (view->priv->toggle_column >= 0) { -- cgit