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 97cf88ff48c9e20f0adcd4f2733919f490d94a43..e04a1ea0127fd167ce02784c6cb61dc0e920c2b2 100644 (file)
--- a/gdk/wayland/gdkdisplaymanager-wayland.c
+++ b/gdk/wayland/gdkdisplaymanager-wayland.c
@@ -27,7 +27,7 @@
 #include "gdkwayland.h"
 #include "gdkinternals.h"
 
-#include <X11/extensions/XKBcommon.h>
+#include <xkbcommon/xkbcommon.h>
 
 struct _GdkWaylandDisplayManager
 {
@@ -136,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 *
@@ -157,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;
 }