fix build

(bzr r1858.1.1)

2 files changed, 3 insertions, 2 deletions

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 168049cbb..05228efce 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -363,7 +363,7 @@ void UnityScreen::initAltTabNextWindow()
 {
 KeyboardUtil key_util (screen->dpy());
 guint above_tab_keycode = key_util.GetKeycodeAboveKeySymbol (XStringToKeysym("Tab"));
- KeySym above_tab_keysym = XKeycodeToKeysym (screen->dpy(), above_tab_keycode, 0);
+ KeySym above_tab_keysym = XkbKeycodeToKeysym (screen->dpy(), above_tab_keycode, 0, 0);
 
 if (above_tab_keysym != NoSymbol)
 {
diff --git a/services/panel-service.c b/services/panel-service.c
index faab66bf9..da0927954 100644
--- a/services/panel-service.c
+++ b/services/panel-service.c
@@ -31,6 +31,7 @@
 #include <gdk/gdkx.h>
 
 #include <X11/extensions/XInput2.h>
+#include <X11/XKBlib.h>
 
 #include "panel-marshal.h"
 
@@ -249,7 +250,7 @@ event_filter (GdkXEvent *ev, GdkEvent *gev, PanelService *self)
 
 if (event->evtype == XI_KeyRelease)
 {
- if (XKeycodeToKeysym(event->display, event->detail, 0) == GDK_KEY_F10)
+ if (XkbKeycodeToKeysym(event->display, event->detail, 0, 0) == GDK_KEY_F10)
 {
 if (GTK_MENU (priv->last_menu))
 gtk_menu_popdown (GTK_MENU (priv->last_menu));