diff options
Diffstat (limited to 'src/sugar3/sugar-key-grabber.c')
| -rw-r--r-- | src/sugar3/sugar-key-grabber.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sugar3/sugar-key-grabber.c b/src/sugar3/sugar-key-grabber.c index 8a00a80..28da2cc 100644 --- a/src/sugar3/sugar-key-grabber.c +++ b/src/sugar3/sugar-key-grabber.c @@ -18,9 +18,9 @@ */ #include <X11/X.h> -#include <gdk/gdkscreen.h> -#include <gdk/gdkx.h> +#include <X11/Xlib.h> #include <gdk/gdk.h> +#include <gdk/gdkx.h> #include "sugar-key-grabber.h" #include "eggaccelerators.h" @@ -161,10 +161,10 @@ static void grab_key_real (Key *key, GdkWindow *root, gboolean grab, int result) { if (grab) - XGrabKey (GDK_DISPLAY(), key->keycode, (result | key->state), + XGrabKey (GDK_DISPLAY_XDISPLAY(gdk_display_get_default ()), key->keycode, (result | key->state), GDK_WINDOW_XID (root), True, GrabModeAsync, GrabModeAsync); else - XUngrabKey(GDK_DISPLAY(), key->keycode, (result | key->state), + XUngrabKey(GDK_DISPLAY_XDISPLAY(gdk_display_get_default ()), key->keycode, (result | key->state), GDK_WINDOW_XID (root)); } @@ -255,7 +255,7 @@ sugar_key_grabber_is_modifier(SugarKeyGrabber *grabber, guint keycode, guint mas gint start, end, i, mod_index; gboolean is_modifier = FALSE; - xdisplay = gdk_x11_drawable_get_xdisplay(GDK_DRAWABLE (grabber->root)); + xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default ()); modmap = XGetModifierMapping(xdisplay); |