diff options
| author | infirit <[email protected]> | 2015-07-09 10:39:04 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-07-09 11:28:41 +0200 |
| commit | 1b8f66d0f995b2f9ccf56c9ab7a27c2f68442c50 (patch) | |
| tree | d191f95dc10adac55375ed5f15425fda420f3abf /src/gs-grab-x11.c | |
| parent | c1d1e089a69c5e90e8b0cf4b96335899f209e7f0 (diff) | |
| download | mate-screensaver-1b8f66d0f995b2f9ccf56c9ab7a27c2f68442c50.tar.bz2 mate-screensaver-1b8f66d0f995b2f9ccf56c9ab7a27c2f68442c50.tar.xz | |
Always use GDK_DISPLAY_XDISPLAY instead of GDK_DISPLAY
Has been in Gtk since 2.22
Diffstat (limited to 'src/gs-grab-x11.c')
| -rw-r--r-- | src/gs-grab-x11.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/gs-grab-x11.c b/src/gs-grab-x11.c index 61a376c..003df3b 100644 --- a/src/gs-grab-x11.c +++ b/src/gs-grab-x11.c @@ -128,11 +128,7 @@ xorg_lock_smasher_set_active (GSGrab *grab, { int status, event, error; -#if GTK_CHECK_VERSION (3, 0, 0) if (!XF86MiscQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &event, &error)) -#else - if (!XF86MiscQueryExtension (GDK_DISPLAY (), &event, &error)) -#endif { gs_debug ("No XFree86-Misc extension present"); return; @@ -149,11 +145,7 @@ xorg_lock_smasher_set_active (GSGrab *grab, gdk_error_trap_push (); -#if GTK_CHECK_VERSION (3, 0, 0) status = XF86MiscSetGrabKeysState (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), active); -#else - status = XF86MiscSetGrabKeysState (GDK_DISPLAY (), active); -#endif gdk_display_sync (gdk_display_get_default ()); gdk_error_trap_pop (); @@ -452,13 +444,8 @@ gs_grab_nuke_focus (void) gdk_error_trap_push (); -#if GTK_CHECK_VERSION (3, 0, 0) XGetInputFocus (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &focus, &rev); XSetInputFocus (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), None, RevertToNone, CurrentTime); -#else - XGetInputFocus (GDK_DISPLAY (), &focus, &rev); - XSetInputFocus (GDK_DISPLAY (), None, RevertToNone, CurrentTime); -#endif gdk_display_sync (gdk_display_get_default ()); gdk_error_trap_pop (); |