4 files changed, 35 insertions, 35 deletions
diff --git a/src/eom-print-preview.c b/src/eom-print-preview.c
index 7fcd3df..8b6f154 100644
--- a/src/eom-print-preview.c
+++ b/src/eom-print-preview.c
@@ -868,19 +868,19 @@ key_press_event_cb (GtkWidget *widget,
 delta = 0;
 
 switch (event->keyval) {
- case GDK_Left:
+ case GDK_KEY_Left:
 property = "image-x-align";
 delta = -0.01;
 break;
- case GDK_Right:
+ case GDK_KEY_Right:
 property = "image-x-align";
 delta = 0.01;
 break;
- case GDK_Up:
+ case GDK_KEY_Up:
 property = "image-y-align";
 delta = -0.01;
 break;
- case GDK_Down:
+ case GDK_KEY_Down:
 property = "image-y-align";
 delta = 0.01;
 break;
diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c
index f37561c..9a389ae 100644
--- a/src/eom-scroll-view.c
+++ b/src/eom-scroll-view.c
@@ -1339,13 +1339,13 @@ display_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer data)
 }
 
 switch (event->keyval) {
- case GDK_Up:
+ case GDK_KEY_Up:
 do_scroll = TRUE;
 xofs = 0;
 yofs = -SCROLL_STEP_SIZE;
 break;
 
- case GDK_Page_Up:
+ case GDK_KEY_Page_Up:
 do_scroll = TRUE;
 if (event->state & GDK_CONTROL_MASK) {
 xofs = -(allocation.width * 3) / 4;
@@ -1356,13 +1356,13 @@ display_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer data)
 }
 break;
 
- case GDK_Down:
+ case GDK_KEY_Down:
 do_scroll = TRUE;
 xofs = 0;
 yofs = SCROLL_STEP_SIZE;
 break;
 
- case GDK_Page_Down:
+ case GDK_KEY_Page_Down:
 do_scroll = TRUE;
 if (event->state & GDK_CONTROL_MASK) {
 xofs = (allocation.width * 3) / 4;
@@ -1373,32 +1373,32 @@ display_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer data)
 }
 break;
 
- case GDK_Left:
+ case GDK_KEY_Left:
 do_scroll = TRUE;
 xofs = -SCROLL_STEP_SIZE;
 yofs = 0;
 break;
 
- case GDK_Right:
+ case GDK_KEY_Right:
 do_scroll = TRUE;
 xofs = SCROLL_STEP_SIZE;
 yofs = 0;
 break;
 
- case GDK_plus:
- case GDK_equal:
- case GDK_KP_Add:
+ case GDK_KEY_plus:
+ case GDK_KEY_equal:
+ case GDK_KEY_KP_Add:
 do_zoom = TRUE;
 zoom = priv->zoom * priv->zoom_multiplier;
 break;
 
- case GDK_minus:
- case GDK_KP_Subtract:
+ case GDK_KEY_minus:
+ case GDK_KEY_KP_Subtract:
 do_zoom = TRUE;
 zoom = priv->zoom / priv->zoom_multiplier;
 break;
 
- case GDK_1:
+ case GDK_KEY_1:
 do_zoom = TRUE;
 zoom = 1.0;
 break;
diff --git a/src/eom-sidebar.c b/src/eom-sidebar.c
index b61b07b..8d8b8b0 100644
--- a/src/eom-sidebar.c
+++ b/src/eom-sidebar.c
@@ -288,10 +288,10 @@ eom_sidebar_select_button_key_press_cb (GtkWidget *widget,
 {
 EomSidebar *eom_sidebar = EOM_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 (eom_sidebar->priv->menu),
diff --git a/src/eom-window.c b/src/eom-window.c
index aa1ae6f..1c67eff 100644
--- a/src/eom-window.c
+++ b/src/eom-window.c
@@ -4849,12 +4849,12 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event)
 gboolean handle_selection = FALSE;
 
 switch (event->keyval) {
- case GDK_space:
+ case GDK_KEY_space:
 if (event->state & GDK_CONTROL_MASK) {
 handle_selection = TRUE;
 break;
 }
- case GDK_Return:
+ case GDK_KEY_Return:
 if (gtk_container_get_focus_child (tbcontainer) == NULL) {
 /* Image properties dialog case */
 if (event->state & GDK_MOD1_MASK) {
@@ -4870,8 +4870,8 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event)
 result = TRUE;
 }
 break;
- case GDK_p:
- case GDK_P:
+ case GDK_KEY_p:
+ case GDK_KEY_P:
 if (EOM_WINDOW (widget)->priv->mode == EOM_WINDOW_MODE_FULLSCREEN || EOM_WINDOW (widget)->priv->mode == EOM_WINDOW_MODE_SLIDESHOW) {
 gboolean slideshow;
 
@@ -4879,9 +4879,9 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event)
 eom_window_run_fullscreen (EOM_WINDOW (widget), !slideshow);
 }
 break;
- case GDK_Q:
- case GDK_q:
- case GDK_Escape:
+ case GDK_KEY_Q:
+ case GDK_KEY_q:
+ case GDK_KEY_Escape:
 if (EOM_WINDOW (widget)->priv->mode == EOM_WINDOW_MODE_FULLSCREEN) {
 eom_window_stop_fullscreen (EOM_WINDOW (widget), FALSE);
 } else if (EOM_WINDOW (widget)->priv->mode == EOM_WINDOW_MODE_SLIDESHOW) {
@@ -4891,7 +4891,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event)
 return TRUE;
 }
 break;
- case GDK_Left:
+ case GDK_KEY_Left:
 if (event->state & GDK_MOD1_MASK) {
 /* Alt+Left moves to previous image */
 if (is_rtl) { /* move to next in RTL mode */
@@ -4902,7 +4902,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event)
 result = TRUE;
 break;
 } /* else fall-trough is intended */
- case GDK_Up:
+ case GDK_KEY_Up:
 if (eom_scroll_view_scrollbars_visible (EOM_SCROLL_VIEW (EOM_WINDOW (widget)->priv->view))) {
 /* break to let scrollview handle the key */
 break;
@@ -4910,7 +4910,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event)
 if (gtk_container_get_focus_child (tbcontainer) != NULL)
 break;
 if (!gtk_widget_get_visible (EOM_WINDOW (widget)->priv->nav)) {
- if (is_rtl && event->keyval == GDK_Left) {
+ if (is_rtl && event->keyval == GDK_KEY_Left) {
 /* handle RTL fall-through,
 * need to behave like GDK_Down then */
 eom_window_cmd_go_next (NULL,
@@ -4922,7 +4922,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event)
 result = TRUE;
 break;
 }
- case GDK_Right:
+ case GDK_KEY_Right:
 if (event->state & GDK_MOD1_MASK) {
 /* Alt+Right moves to next image */
 if (is_rtl) { /* move to previous in RTL mode */
@@ -4933,7 +4933,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event)
 result = TRUE;
 break;
 } /* else fall-trough is intended */
- case GDK_Down:
+ case GDK_KEY_Down:
 if (eom_scroll_view_scrollbars_visible (EOM_SCROLL_VIEW (EOM_WINDOW (widget)->priv->view))) {
 /* break to let scrollview handle the key */
 break;
@@ -4941,7 +4941,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event)
 if (gtk_container_get_focus_child (tbcontainer) != NULL)
 break;
 if (!gtk_widget_get_visible (EOM_WINDOW (widget)->priv->nav)) {
- if (is_rtl && event->keyval == GDK_Right) {
+ if (is_rtl && event->keyval == GDK_KEY_Right) {
 /* handle RTL fall-through,
 * need to behave like GDK_Up then */
 eom_window_cmd_go_prev (NULL,
@@ -4953,7 +4953,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event)
 result = TRUE;
 break;
 }
- case GDK_Page_Up:
+ case GDK_KEY_Page_Up:
 if (!eom_scroll_view_scrollbars_visible (EOM_SCROLL_VIEW (EOM_WINDOW (widget)->priv->view))) {
 if (!gtk_widget_get_visible (EOM_WINDOW (widget)->priv->nav)) {
 /* If the iconview is not visible skip to the
@@ -4966,7 +4966,7 @@ eom_window_key_press (GtkWidget *widget, GdkEventKey *event)
 handle_selection = TRUE;
 }
 break;
- case GDK_Page_Down:
+ case GDK_KEY_Page_Down:
 if (!eom_scroll_view_scrollbars_visible (EOM_SCROLL_VIEW (EOM_WINDOW (widget)->priv->view))) {
 if (!gtk_widget_get_visible (EOM_WINDOW (widget)->priv->nav)) {
 /* If the iconview is not visible skip to the