[shell] Use changed gdk keysym names

diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c
index 9ddb2c02278a44c29fbca15449ebbae13f3d9f7d..f887a2503e3ff39e6b0cf10c9a24532d5bd30f1d 100644 (file)
--- a/shell/eggfindbar.c
+++ b/shell/eggfindbar.c
@@ -181,25 +181,25 @@ 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,
+  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);
 }

diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c
index 1a2c660430ff971e37cbf740075b98b0d0067a86..cf5f2a306c348819f4612cd58b34f8c845edcfb3 100644 (file)
--- a/shell/ev-sidebar.c
+++ b/shell/ev-sidebar.c
@@ -261,10 +261,10 @@ ev_sidebar_select_button_key_press_cb (GtkWidget   *widget,
 {
        EvSidebar *ev_sidebar = EV_SIDEBAR (user_data);
           
-       if (event->keyval == GDK_space ||
-           event->keyval == GDK_KP_Space ||
-           event->keyval == GDK_Return ||
-           event->keyval == GDK_KP_Enter) {
+       if (event->keyval == GDK_KEY_space ||
+           event->keyval == GDK_KEY_KP_Space ||
+           event->keyval == GDK_KEY_Return ||
+           event->keyval == GDK_KEY_KP_Enter) {
                gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
                gtk_menu_popup (GTK_MENU (ev_sidebar->priv->menu),
                                NULL, NULL, ev_sidebar_menu_position_under, widget,