wayland: update to work with stable libxkbcommon

[~andy/gtk] / gdk / wayland / gdkdisplaymanager-wayland.c

diff --git a/gdk/wayland/gdkdisplaymanager-wayland.c b/gdk/wayland/gdkdisplaymanager-wayland.c
index dce25d58204e9862067a10f2564d357b9a1fa354..e04a1ea0127fd167ce02784c6cb61dc0e920c2b2 100644 (file)
--- a/gdk/wayland/gdkdisplaymanager-wayland.c
+++ b/gdk/wayland/gdkdisplaymanager-wayland.c
@@ -24,20 +24,10 @@
 #include "gdkdisplaymanagerprivate.h"
 #include "gdkdisplay-wayland.h"
 #include "gdkprivate-wayland.h"
-
+#include "gdkwayland.h"
 #include "gdkinternals.h"
 
-#include <X11/extensions/XKBcommon.h>
-
-typedef struct _GdkWaylandDisplayManager GdkWaylandDisplayManager;
-typedef struct _GdkWaylandDisplayManagerClass GdkWaylandDisplayManagerClass;
-
-#define GDK_TYPE_WAYLAND_DISPLAY_MANAGER              (gdk_wayland_display_manager_get_type())
-#define GDK_WAYLAND_DISPLAY_MANAGER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManager))
-#define GDK_WAYLAND_DISPLAY_MANAGER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManagerClass))
-#define GDK_IS_WAYLAND_DISPLAY_MANAGER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WAYLAND_DISPLAY_MANAGER))
-#define GDK_IS_WAYLAND_DISPLAY_MANAGER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_WAYLAND_DISPLAY_MANAGER))
-#define GDK_WAYLAND_DISPLAY_MANAGER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_WAYLAND_DISPLAY_MANAGER, GdkWaylandDisplayManagerClass))
+#include <xkbcommon/xkbcommon.h>
 
 struct _GdkWaylandDisplayManager
 {
@@ -146,7 +136,7 @@ gdk_wayland_display_manager_lookup_keyval (GdkDisplayManager *manager,
 {
   g_return_val_if_fail (keyval_name != NULL, 0);
 
-  return xkb_string_to_keysym(keyval_name);
+  return xkb_keysym_from_name (keyval_name, 0);
 }
 
 static gchar *
@@ -167,7 +157,7 @@ gdk_wayland_display_manager_get_keyval_name (GdkDisplayManager *manager,
       return "KP_Page_Down";
     }
 
-  xkb_keysym_to_string(keyval, buf, sizeof buf);
+  xkb_keysym_get_name(keyval, buf, sizeof (buf));
 
   return buf;
 }