From 95a0a433c6ad95b42124e0874bb613ff6bb765ca Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Fri, 22 Oct 2010 11:53:12 +0200 Subject: [PATCH 1/3] Replace deprecated GDK_Escape with GDK_KEY_Escape --- src/dh-assistant.c | 2 +- src/eggfindbar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dh-assistant.c b/src/dh-assistant.c index bd19d88..05f8103 100644 --- a/src/dh-assistant.c +++ b/src/dh-assistant.c @@ -46,7 +46,7 @@ assistant_key_press_event_cb (GtkWidget *widget, GdkEventKey *event, DhAssistant *assistant) { - if (event->keyval == GDK_Escape) { + if (event->keyval == GDK_KEY_Escape) { gtk_widget_destroy (GTK_WIDGET (assistant)); return TRUE; } diff --git a/src/eggfindbar.c b/src/eggfindbar.c index f6e1dba..e6daf14 100644 --- a/src/eggfindbar.c +++ b/src/eggfindbar.c @@ -181,7 +181,7 @@ egg_find_bar_class_init (EggFindBarClass *klass) binding_set = gtk_binding_set_by_class (klass); - gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, "close", 0); gtk_binding_entry_add_signal (binding_set, GDK_Up, 0, -- 1.7.3.2 From 0ee886323821f82afc10beded85bbccb51f61b97 Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Fri, 22 Oct 2010 11:58:22 +0200 Subject: [PATCH 2/3] Replace deprecated GDK_* with GDK_KEY_* --- src/dh-search.c | 6 +++--- src/dh-window.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dh-search.c b/src/dh-search.c index 4afd8c4..46b2e9f 100644 --- a/src/dh-search.c +++ b/src/dh-search.c @@ -221,7 +221,7 @@ search_entry_key_press_event_cb (GtkEntry *entry, { DhSearchPriv *priv = GET_PRIVATE (search); - if (event->keyval == GDK_Tab) { + if (event->keyval == GDK_KEY_Tab) { if (event->state & GDK_CONTROL_MASK) { gtk_widget_grab_focus (priv->hitlist); } else { @@ -231,8 +231,8 @@ search_entry_key_press_event_cb (GtkEntry *entry, return TRUE; } - if (event->keyval == GDK_Return || - event->keyval == GDK_KP_Enter) { + if (event->keyval == GDK_KEY_Return || + event->keyval == GDK_KEY_KP_Enter) { GtkTreeIter iter; DhLink *link; gchar *name; diff --git a/src/dh-window.c b/src/dh-window.c index 2fcec5f..1eacdb9 100644 --- a/src/dh-window.c +++ b/src/dh-window.c @@ -83,8 +83,8 @@ enum { static gint signals[LAST_SIGNAL] = { 0 }; static guint tab_accel_keys[] = { - GDK_1, GDK_2, GDK_3, GDK_4, GDK_5, - GDK_6, GDK_7, GDK_8, GDK_9, GDK_0 + GDK_KEY_1, GDK_KEY_2, GDK_KEY_3, GDK_KEY_4, GDK_KEY_5, + GDK_KEY_6, GDK_KEY_7, GDK_KEY_8, GDK_KEY_9, GDK_KEY_0 }; static const -- 1.7.3.2 From 9cf3860591b22d66d3dbafc750fe8b01da58013b Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Fri, 22 Oct 2010 12:00:09 +0200 Subject: [PATCH 3/3] Replace deprecated GDK_* with GDK_KEY_* --- src/eggfindbar.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/eggfindbar.c b/src/eggfindbar.c index e6daf14..c6d6184 100644 --- a/src/eggfindbar.c +++ b/src/eggfindbar.c @@ -184,22 +184,22 @@ egg_find_bar_class_init (EggFindBarClass *klass) gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, "close", 0); - gtk_binding_entry_add_signal (binding_set, GDK_Up, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, 0, "scroll", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_BACKWARD); - gtk_binding_entry_add_signal (binding_set, GDK_Down, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, 0, "scroll", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_FORWARD); - gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, 0, "scroll", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); - gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Up, 0, "scroll", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); - gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, 0, "scroll", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); - gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Down, 0, "scroll", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); } -- 1.7.3.2