summaryrefslogtreecommitdiff
path: root/src/gs-watcher-x11.c
diff options
context:
space:
mode:
authorinfirit <[email protected]>2015-07-09 10:39:04 +0200
committerinfirit <[email protected]>2015-07-09 11:28:41 +0200
commit1b8f66d0f995b2f9ccf56c9ab7a27c2f68442c50 (patch)
treed191f95dc10adac55375ed5f15425fda420f3abf /src/gs-watcher-x11.c
parentc1d1e089a69c5e90e8b0cf4b96335899f209e7f0 (diff)
downloadmate-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-watcher-x11.c')
-rw-r--r--src/gs-watcher-x11.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/gs-watcher-x11.c b/src/gs-watcher-x11.c
index 5f699f1..2871512 100644
--- a/src/gs-watcher-x11.c
+++ b/src/gs-watcher-x11.c
@@ -592,11 +592,7 @@ disable_builtin_screensaver (GSWatcher *watcher,
int desired_server_timeout, desired_server_interval;
int desired_prefer_blank, desired_allow_exp;
-#if GTK_CHECK_VERSION (3, 0, 0)
XGetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-#else
- XGetScreenSaver (GDK_DISPLAY (),
-#endif
&current_server_timeout,
&current_server_interval,
&current_prefer_blank,
@@ -635,31 +631,19 @@ disable_builtin_screensaver (GSWatcher *watcher,
(desired_prefer_blank ? "blank" : "noblank"),
(desired_allow_exp ? "expose" : "noexpose"));
-#if GTK_CHECK_VERSION (3, 0, 0)
XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-#else
- XSetScreenSaver (GDK_DISPLAY (),
-#endif
desired_server_timeout,
desired_server_interval,
desired_prefer_blank,
desired_allow_exp);
-#if GTK_CHECK_VERSION (3, 0, 0)
XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-#else
- XSync (GDK_DISPLAY (), FALSE);
-#endif
}
if (unblank_screen)
{
/* Turn off the server builtin saver if it is now running. */
-#if GTK_CHECK_VERSION (3, 0, 0)
XForceScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), ScreenSaverReset);
-#else
- XForceScreenSaver (GDK_DISPLAY (), ScreenSaverReset);
-#endif
}
}