[totem-scrsaver] Don't use GDK_DISPLAY

Fixes the build with gtk master.

diff --git a/cut-n-paste/totem-screensaver/totem-scrsaver.c b/cut-n-paste/totem-screensaver/totem-scrsaver.c
index c8dcc09edf1a3b3cc1ec92356931fbad6643b933..36d314ef20b615ab29ef2afc4bd44300fa7669e7 100644 (file)
--- a/cut-n-paste/totem-screensaver/totem-scrsaver.c
+++ b/cut-n-paste/totem-screensaver/totem-scrsaver.c
@@ -279,6 +279,7 @@ screensaver_finalize_dbus (TotemScrsaver *scr)
 static void
 screensaver_enable_x11 (TotemScrsaver *scr)
 {
+        Display *xdisplay;
 
 #ifdef HAVE_XTEST
        if (scr->priv->have_xtest != FALSE)
@@ -288,13 +289,14 @@ screensaver_enable_x11 (TotemScrsaver *scr)
        }
 #endif /* HAVE_XTEST */
 
-       XLockDisplay (GDK_DISPLAY());
-       XSetScreenSaver (GDK_DISPLAY(),
+        xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+       XLockDisplay (xdisplay);
+       XSetScreenSaver (xdisplay,
                        scr->priv->timeout,
                        scr->priv->interval,
                        scr->priv->prefer_blanking,
                        scr->priv->allow_exposures);
-       XUnlockDisplay (GDK_DISPLAY());
+       XUnlockDisplay (xdisplay);
 }
 
 #ifdef HAVE_XTEST
@@ -303,12 +305,15 @@ fake_event (TotemScrsaver *scr)
 {
        if (scr->priv->disabled)
        {
-               XLockDisplay (GDK_DISPLAY());
-               XTestFakeKeyEvent (GDK_DISPLAY(), *scr->priv->keycode,
+                Display *display;
+
+                xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+               XLockDisplay (xdisplay);
+               XTestFakeKeyEvent (xdisplay, *scr->priv->keycode,
                                True, CurrentTime);
-               XTestFakeKeyEvent (GDK_DISPLAY(), *scr->priv->keycode,
+               XTestFakeKeyEvent (xdisplay, *scr->priv->keycode,
                                False, CurrentTime);
-               XUnlockDisplay (GDK_DISPLAY());
+               XUnlockDisplay (xdisplay);
                /* Swap the keycode */
                if (scr->priv->keycode == &scr->priv->keycode1)
                        scr->priv->keycode = &scr->priv->keycode2;
@@ -323,16 +328,19 @@ fake_event (TotemScrsaver *scr)
 static void
 screensaver_disable_x11 (TotemScrsaver *scr)
 {
+        Display *xdisplay;
+
+        xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 
 #ifdef HAVE_XTEST
        if (scr->priv->have_xtest != FALSE)
        {
-               XLockDisplay (GDK_DISPLAY());
-               XGetScreenSaver(GDK_DISPLAY(), &scr->priv->timeout,
+               XLockDisplay (xdisplay);
+               XGetScreenSaver(xdisplay, &scr->priv->timeout,
                                &scr->priv->interval,
                                &scr->priv->prefer_blanking,
                                &scr->priv->allow_exposures);
-               XUnlockDisplay (GDK_DISPLAY());
+               XUnlockDisplay (xdisplay);
 
                if (scr->priv->timeout != 0) {
                        g_timeout_add_seconds (scr->priv->timeout / 2,
@@ -346,14 +354,14 @@ screensaver_disable_x11 (TotemScrsaver *scr)
        }
 #endif /* HAVE_XTEST */
 
-       XLockDisplay (GDK_DISPLAY());
-       XGetScreenSaver(GDK_DISPLAY(), &scr->priv->timeout,
+       XLockDisplay (xdisplay);
+       XGetScreenSaver(xdisplay, &scr->priv->timeout,
                        &scr->priv->interval,
                        &scr->priv->prefer_blanking,
                        &scr->priv->allow_exposures);
-       XSetScreenSaver(GDK_DISPLAY(), 0, 0,
+       XSetScreenSaver(xdisplay, 0, 0,
                        DontPreferBlanking, DontAllowExposures);
-       XUnlockDisplay (GDK_DISPLAY());
+       XUnlockDisplay (xdisplay);
 }
 
 static void
@@ -361,25 +369,28 @@ screensaver_init_x11 (TotemScrsaver *scr)
 {
 #ifdef HAVE_XTEST
        int a, b, c, d;
+        Display *display;
+
+        xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 
-       XLockDisplay (GDK_DISPLAY());
-       scr->priv->have_xtest = (XTestQueryExtension (GDK_DISPLAY(), &a, &b, &c, &d) == True);
+       XLockDisplay (xdisplay);
+       scr->priv->have_xtest = (XTestQueryExtension (xdisplay, &a, &b, &c, &d) == True);
        if (scr->priv->have_xtest != FALSE)
        {
-               scr->priv->keycode1 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_L);
+               scr->priv->keycode1 = XKeysymToKeycode (xdisplay, XK_Alt_L);
                if (scr->priv->keycode1 == 0) {
                        g_warning ("scr->priv->keycode1 not existant");
                }
-               scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_R);
+               scr->priv->keycode2 = XKeysymToKeycode (xdisplay, XK_Alt_R);
                if (scr->priv->keycode2 == 0) {
-                       scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_L);
+                       scr->priv->keycode2 = XKeysymToKeycode (xdisplay, XK_Alt_L);
                        if (scr->priv->keycode2 == 0) {
                                g_warning ("scr->priv->keycode2 not existant");
                        }
                }
                scr->priv->keycode = &scr->priv->keycode1;
        }
-       XUnlockDisplay (GDK_DISPLAY());
+       XUnlockDisplay (xdisplay);
 #endif /* HAVE_XTEST */
 }