[gnome-settings-daemon] Prefix key constants with _KEY

[Federico Mena Quintero <federico src gnome org>]

commit af10266c9e361ddf9d913fbbc531b4eeaf722b39
Author: Kalev Lember <kalev smartlink ee>
Date:   Fri Sep 10 18:45:59 2010 +0300

    Prefix key constants with _KEY
    
    In GTK+ 3 key constants have gained _KEY prefix.

 plugins/common/eggaccelerators.c   |   18 +++++++++---------
 plugins/common/gsd-keygrab.c       |    2 +-
 plugins/mouse/gsd-locate-pointer.c |    4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/plugins/common/eggaccelerators.c b/plugins/common/eggaccelerators.c
index e3b8ae3..51689bf 100644
--- a/plugins/common/eggaccelerators.c
+++ b/plugins/common/eggaccelerators.c
@@ -582,20 +582,20 @@ reload_modmap (GdkKeymap *keymap,
       mask = 0;
       for (j = 0; j < n_entries; ++j)
         {
-          if (keyvals[j] == GDK_Num_Lock)
+          if (keyvals[j] == GDK_KEY_Num_Lock)
             mask |= EGG_VIRTUAL_NUM_LOCK_MASK;
-          else if (keyvals[j] == GDK_Scroll_Lock)
+          else if (keyvals[j] == GDK_KEY_Scroll_Lock)
             mask |= EGG_VIRTUAL_SCROLL_LOCK_MASK;
-          else if (keyvals[j] == GDK_Meta_L ||
-                   keyvals[j] == GDK_Meta_R)
+          else if (keyvals[j] == GDK_KEY_Meta_L ||
+                   keyvals[j] == GDK_KEY_Meta_R)
             mask |= EGG_VIRTUAL_META_MASK;
-          else if (keyvals[j] == GDK_Hyper_L ||
-                   keyvals[j] == GDK_Hyper_R)
+          else if (keyvals[j] == GDK_KEY_Hyper_L ||
+                   keyvals[j] == GDK_KEY_Hyper_R)
             mask |= EGG_VIRTUAL_HYPER_MASK;
-          else if (keyvals[j] == GDK_Super_L ||
-                   keyvals[j] == GDK_Super_R)
+          else if (keyvals[j] == GDK_KEY_Super_L ||
+                   keyvals[j] == GDK_KEY_Super_R)
             mask |= EGG_VIRTUAL_SUPER_MASK;
-          else if (keyvals[j] == GDK_Mode_switch)
+          else if (keyvals[j] == GDK_KEY_Mode_switch)
             mask |= EGG_VIRTUAL_MODE_SWITCH_MASK;
         }
 
diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
index c26d3d0..f00fdf3 100644
--- a/plugins/common/gsd-keygrab.c
+++ b/plugins/common/gsd-keygrab.c
@@ -219,7 +219,7 @@ match_key (Key *key, XEvent *event)
 		group = XkbGroupForCoreState (event->xkey.state);
 	else
 #endif
-		group = (event->xkey.state & GDK_Mode_switch) ? 1 : 0;
+		group = (event->xkey.state & GDK_KEY_Mode_switch) ? 1 : 0;
 
 	/* Check if we find a keysym that matches our current state */
 	if (gdk_keymap_translate_keyboard_state (NULL, event->xkey.keycode,
diff --git a/plugins/mouse/gsd-locate-pointer.c b/plugins/mouse/gsd-locate-pointer.c
index c4ecbc2..cffce3f 100644
--- a/plugins/mouse/gsd-locate-pointer.c
+++ b/plugins/mouse/gsd-locate-pointer.c
@@ -374,7 +374,7 @@ filter (GdkXEvent *xevent,
                                            group,
                                            &keyval,
                                            NULL, NULL, NULL);
-      if (keyval == GDK_Control_L || keyval == GDK_Control_R)
+      if (keyval == GDK_KEY_Control_L || keyval == GDK_KEY_Control_R)
         {
           if (xev->type == KeyPress)
             {
@@ -411,7 +411,7 @@ set_locate_pointer (void)
   int n_screens;
   int n_keys;
   gboolean has_entries;
-  static const guint keyvals[] = { GDK_Control_L, GDK_Control_R };
+  static const guint keyvals[] = { GDK_KEY_Control_L, GDK_KEY_Control_R };
   unsigned j;
 
   display = gdk_display_get_default ();