[eog] Update GDK keysym names to be compatible with GTK+-2.90.7
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog] Update GDK keysym names to be compatible with GTK+-2.90.7
- Date: Fri, 10 Sep 2010 19:22:36 +0000 (UTC)
commit 29d46b3c3125c27544c888d03591571679dfd0a7
Author: Felix Riemann <friemann gnome org>
Date: Fri Sep 10 20:45:47 2010 +0200
Update GDK keysym names to be compatible with GTK+-2.90.7
configure.ac | 2 +-
src/eog-print-preview.c | 8 ++++----
src/eog-scroll-view.c | 24 ++++++++++++------------
src/eog-sidebar.c | 8 ++++----
src/eog-window.c | 30 +++++++++++++++---------------
5 files changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6e19d10..86bce76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,7 +83,7 @@ GNOME_DOC_INIT
# GNOME Libs
# **********
-GTK_REQUIRED=2.90.6
+GTK_REQUIRED=2.90.7
GLIB_REQUIRED=2.25.9
GNOME_DESKTOP_REQUIRED=2.90.4
GDKPIXBUF_REQUIRED=2.4.0
diff --git a/src/eog-print-preview.c b/src/eog-print-preview.c
index 30de4cf..0d49fdd 100644
--- a/src/eog-print-preview.c
+++ b/src/eog-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/eog-scroll-view.c b/src/eog-scroll-view.c
index 04cf2f5..557de6b 100644
--- a/src/eog-scroll-view.c
+++ b/src/eog-scroll-view.c
@@ -1426,13 +1426,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;
@@ -1443,13 +1443,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;
@@ -1460,32 +1460,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/eog-sidebar.c b/src/eog-sidebar.c
index deba8fc..d8b318c 100644
--- a/src/eog-sidebar.c
+++ b/src/eog-sidebar.c
@@ -288,10 +288,10 @@ eog_sidebar_select_button_key_press_cb (GtkWidget *widget,
{
EogSidebar *eog_sidebar = EOG_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 (eog_sidebar->priv->menu),
diff --git a/src/eog-window.c b/src/eog-window.c
index 1e79ba1..f2a3284 100644
--- a/src/eog-window.c
+++ b/src/eog-window.c
@@ -4465,12 +4465,12 @@ eog_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) {
@@ -4486,8 +4486,8 @@ eog_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 (EOG_WINDOW (widget)->priv->mode == EOG_WINDOW_MODE_FULLSCREEN || EOG_WINDOW (widget)->priv->mode == EOG_WINDOW_MODE_SLIDESHOW) {
gboolean slideshow;
@@ -4495,9 +4495,9 @@ eog_window_key_press (GtkWidget *widget, GdkEventKey *event)
eog_window_run_fullscreen (EOG_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 (EOG_WINDOW (widget)->priv->mode == EOG_WINDOW_MODE_FULLSCREEN) {
eog_window_stop_fullscreen (EOG_WINDOW (widget), FALSE);
} else if (EOG_WINDOW (widget)->priv->mode == EOG_WINDOW_MODE_SLIDESHOW) {
@@ -4507,7 +4507,7 @@ eog_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 */
@@ -4518,7 +4518,7 @@ eog_window_key_press (GtkWidget *widget, GdkEventKey *event)
result = TRUE;
break;
} /* else fall-trough is intended */
- case GDK_Up:
+ case GDK_KEY_Up:
if (eog_scroll_view_scrollbars_visible (EOG_SCROLL_VIEW (EOG_WINDOW (widget)->priv->view))) {
/* break to let scrollview handle the key */
break;
@@ -4526,7 +4526,7 @@ eog_window_key_press (GtkWidget *widget, GdkEventKey *event)
if (gtk_container_get_focus_child (tbcontainer) != NULL)
break;
if (!gtk_widget_get_visible (EOG_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 */
eog_window_cmd_go_next (NULL,
@@ -4538,7 +4538,7 @@ eog_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 */
@@ -4549,7 +4549,7 @@ eog_window_key_press (GtkWidget *widget, GdkEventKey *event)
result = TRUE;
break;
} /* else fall-trough is intended */
- case GDK_Down:
+ case GDK_KEY_Down:
if (eog_scroll_view_scrollbars_visible (EOG_SCROLL_VIEW (EOG_WINDOW (widget)->priv->view))) {
/* break to let scrollview handle the key */
break;
@@ -4557,7 +4557,7 @@ eog_window_key_press (GtkWidget *widget, GdkEventKey *event)
if (gtk_container_get_focus_child (tbcontainer) != NULL)
break;
if (!gtk_widget_get_visible (EOG_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 */
eog_window_cmd_go_prev (NULL,
@@ -4569,7 +4569,7 @@ eog_window_key_press (GtkWidget *widget, GdkEventKey *event)
result = TRUE;
break;
}
- case GDK_Page_Up:
+ case GDK_KEY_Page_Up:
if (!eog_scroll_view_scrollbars_visible (EOG_SCROLL_VIEW (EOG_WINDOW (widget)->priv->view))) {
if (!gtk_widget_get_visible (EOG_WINDOW (widget)->priv->nav)) {
/* If the iconview is not visible skip to the
@@ -4582,7 +4582,7 @@ eog_window_key_press (GtkWidget *widget, GdkEventKey *event)
handle_selection = TRUE;
}
break;
- case GDK_Page_Down:
+ case GDK_KEY_Page_Down:
if (!eog_scroll_view_scrollbars_visible (EOG_SCROLL_VIEW (EOG_WINDOW (widget)->priv->view))) {
if (!gtk_widget_get_visible (EOG_WINDOW (widget)->priv->nav)) {
/* If the iconview is not visible skip to the
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]