[gtk+/xi2] GdkDisplayX11: Move Xkb events handling here.

[Carlos Garnacho <carlosg src gnome org>]

commit 2ce58a27682e1cf642cf9e8f8cadeac6ebe34575
Author: Carlos Garnacho <carlos lanedo com>
Date:   Wed Nov 4 02:05:20 2009 +0100

    GdkDisplayX11: Move Xkb events handling here.
    
    It previously lived in GdkDeviceManagerCore, but other implementations also
    need it.

 gdk/x11/gdkdevicemanager-core.c |   21 ---------------------
 gdk/x11/gdkdisplay-x11.c        |   21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/gdk/x11/gdkdevicemanager-core.c b/gdk/x11/gdkdevicemanager-core.c
index c1f80ab..b59a5d1 100644
--- a/gdk/x11/gdkdevicemanager-core.c
+++ b/gdk/x11/gdkdevicemanager-core.c
@@ -847,27 +847,6 @@ gdk_device_manager_core_translate_event (GdkEventTranslator *translator,
       break;
 
     default:
-#ifdef HAVE_XKB
-      if (xevent->type == display_x11->xkb_event_type)
-	{
-	  XkbEvent *xkb_event = (XkbEvent *)xevent;
-
-	  switch (xkb_event->any.xkb_type)
-	    {
-	    case XkbNewKeyboardNotify:
-	    case XkbMapNotify:
-	      _gdk_keymap_keys_changed (display);
-
-	      return_val = FALSE;
-	      break;
-
-	    case XkbStateNotify:
-	      _gdk_keymap_state_changed (display, xevent);
-	      break;
-	    }
-	}
-      else
-#endif
         return_val = FALSE;
     }
 
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index b2d10d9..e0c36ad 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -966,6 +966,27 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator,
 	}
       else
 #endif
+#ifdef HAVE_XKB
+      if (xevent->type == display_x11->xkb_event_type)
+	{
+	  XkbEvent *xkb_event = (XkbEvent *) xevent;
+
+	  switch (xkb_event->any.xkb_type)
+	    {
+	    case XkbNewKeyboardNotify:
+	    case XkbMapNotify:
+	      _gdk_keymap_keys_changed (display);
+
+	      return_val = FALSE;
+	      break;
+
+	    case XkbStateNotify:
+	      _gdk_keymap_state_changed (display, xevent);
+	      break;
+	    }
+	}
+      else
+#endif
         return_val = FALSE;
     }