[Xfce4-commits] [apps/xfce4-screensaver] 187/425: Don't use gdkkeysyms-compat for Gtk+2

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit a3c426e1e81dc56f4fdd56f8c736125798fec26b
Author: infirit <infirit at gmail.com>
Date:   Thu Jul 9 10:47:04 2015 +0200

    Don't use gdkkeysyms-compat for Gtk+2
---
 src/gs-lock-plug.c  |  3 +--
 src/gs-window-x11.c | 15 +++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index 68c0f0b..9292cbf 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -39,7 +39,6 @@
 #include <gio/gio.h>
 
 #if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
 #include <gtk/gtkx.h>
 #define MATE_DESKTOP_USE_UNSTABLE_API
 #include <libmate-desktop/mate-desktop-utils.h>
@@ -1432,7 +1431,7 @@ gs_lock_plug_class_init (GSLockPlugClass *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);
 }
 
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index f9369e8..6756780 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -32,7 +32,6 @@
 #include <gdk/gdkkeysyms.h>
 #if GTK_CHECK_VERSION (3, 0, 0)
 #include <gtk/gtkx.h>
-#include <gdk/gdkkeysyms-compat.h>
 #define GTK_WIDGET_IS_SENSITIVE gtk_widget_get_sensitive
 #define GTK_WIDGET_VISIBLE gtk_widget_get_visible
 #define GTK_WIDGET_REALIZED gtk_widget_get_realized
@@ -2374,10 +2373,10 @@ queue_key_event (GSWindow    *window,
 {
 	/* Eat the first return, enter, escape, or space */
 	if (window->priv->key_events == NULL
-	        && (event->keyval == GDK_Return
-	            || event->keyval == GDK_KP_Enter
-	            || event->keyval == GDK_Escape
-	            || event->keyval == GDK_space))
+	        && (event->keyval == GDK_KEY_Return
+	            || event->keyval == GDK_KEY_KP_Enter
+	            || event->keyval == GDK_KEY_Escape
+	            || event->keyval == GDK_KEY_space))
 	{
 		return;
 	}
@@ -2386,9 +2385,9 @@ queue_key_event (GSWindow    *window,
 	   something is wrong */
 	/* Don't queue keys that may cause focus navigation in the dialog */
 	if (g_list_length (window->priv->key_events) < MAX_QUEUED_EVENTS
-	        && event->keyval != GDK_Tab
-	        && event->keyval != GDK_Up
-	        && event->keyval != GDK_Down)
+	        && event->keyval != GDK_KEY_Tab
+	        && event->keyval != GDK_KEY_Up
+	        && event->keyval != GDK_KEY_Down)
 	{
 		window->priv->key_events = g_list_prepend (window->priv->key_events,
 		                           gdk_event_copy ((GdkEvent *)event));

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.