From 175a8fab48e5658ac79ad66f1e82adf112315617 Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Tue, 1 Jul 2014 15:26:00 +0200
Subject: GDK_KEY_* was introduced in Gtk+ 2.22

---
 mate-dictionary/libgdict/gdict-defbox.c | 11 ++++-------
 mate-dictionary/src/gdict-applet.c      | 11 ++++-------
 mate-dictionary/src/gdict-sidebar.c     | 11 ++++-------
 3 files changed, 12 insertions(+), 21 deletions(-)

(limited to 'mate-dictionary')

diff --git a/mate-dictionary/libgdict/gdict-defbox.c b/mate-dictionary/libgdict/gdict-defbox.c
index fc7697a5..86d4427f 100644
--- a/mate-dictionary/libgdict/gdict-defbox.c
+++ b/mate-dictionary/libgdict/gdict-defbox.c
@@ -40,9 +40,6 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
 #include <glib/gi18n-lib.h>
 
 #include "gdict-defbox.h"
@@ -1891,19 +1888,19 @@ gdict_defbox_class_init (GdictDefboxClass *klass)
 
   binding_set = gtk_binding_set_by_class (klass);
   gtk_binding_entry_add_signal (binding_set,
-  			        GDK_f, GDK_CONTROL_MASK,
+  			        GDK_KEY_f, GDK_CONTROL_MASK,
   			        "show-find",
   			        0);
   gtk_binding_entry_add_signal (binding_set,
-  			        GDK_g, GDK_CONTROL_MASK,
+  			        GDK_KEY_g, GDK_CONTROL_MASK,
   			        "find-next",
   			        0);
   gtk_binding_entry_add_signal (binding_set,
-  				GDK_g, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+  				GDK_KEY_g, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
   				"find-previous",
   				0);
   gtk_binding_entry_add_signal (binding_set,
-  			        GDK_Escape, 0,
+  			        GDK_KEY_Escape, 0,
   			        "hide-find",
   			        0);
 
diff --git a/mate-dictionary/src/gdict-applet.c b/mate-dictionary/src/gdict-applet.c
index b29b8cd8..ff417997 100644
--- a/mate-dictionary/src/gdict-applet.c
+++ b/mate-dictionary/src/gdict-applet.c
@@ -29,9 +29,6 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "gdict-applet.h"
@@ -281,14 +278,14 @@ window_key_press_event_cb (GtkWidget   *widget,
 {
   GdictApplet *applet = GDICT_APPLET (user_data);
   
-  if (event->keyval == GDK_Escape)
+  if (event->keyval == GDK_KEY_Escape)
     {
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (applet->priv->toggle), FALSE);
       gtk_toggle_button_toggled (GTK_TOGGLE_BUTTON (applet->priv->toggle));
 
       return TRUE;
     }
-  else if ((event->keyval == GDK_l) &&
+  else if ((event->keyval == GDK_KEY_l) &&
 	   (event->state & GDK_CONTROL_MASK))
     {
       gtk_widget_grab_focus (applet->priv->entry);
@@ -452,7 +449,7 @@ gdict_applet_entry_key_press_cb (GtkWidget   *widget,
 {
   GdictAppletPrivate *priv = GDICT_APPLET (user_data)->priv;
   
-  if (event->keyval == GDK_Escape)
+  if (event->keyval == GDK_KEY_Escape)
     {
       if (priv->is_window_showing)
 	{
@@ -462,7 +459,7 @@ gdict_applet_entry_key_press_cb (GtkWidget   *widget,
 	  return TRUE;
 	}
     }
-  else if (event->keyval == GDK_Tab)
+  else if (event->keyval == GDK_KEY_Tab)
     {
       if (priv->is_window_showing)
 	gtk_widget_grab_focus (priv->defbox);
diff --git a/mate-dictionary/src/gdict-sidebar.c b/mate-dictionary/src/gdict-sidebar.c
index 8da6775e..87658a70 100644
--- a/mate-dictionary/src/gdict-sidebar.c
+++ b/mate-dictionary/src/gdict-sidebar.c
@@ -32,9 +32,6 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#if GTK_CHECK_VERSION (3, 0, 0)
-#include <gdk/gdkkeysyms-compat.h>
-#endif
 #include <glib/gi18n.h>
 
 #include "gdict-sidebar.h"
@@ -203,10 +200,10 @@ gdict_sidebar_select_key_press_cb (GtkWidget   *widget,
 {
   GdictSidebar *sidebar = GDICT_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 (sidebar->priv->menu),
-- 
cgit v1.2.1