GNOME.org
 

[gnome-screensaver] drop use of GDK_DISPLAY()

commit 30831201aecd22100c3ae14b455d727a8cca2cd5
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Sep 29 12:06:39 2010 -0400

    drop use of GDK_DISPLAY()
    
    This macro will no longer be available in gtk3.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=630593

 src/gs-fade.c        |   14 +++++++-------
 src/gs-grab-x11.c    |    8 ++++----
 src/gs-lock-plug.c   |    2 +-
 src/gs-watcher-x11.c |    8 ++++----
 src/gs-window-x11.c  |   12 ++++++------
 src/test-fade.c      |    4 ++--
 6 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/src/gs-fade.c b/src/gs-fade.c
index 57b3718..0215829 100644
--- a/src/gs-fade.c
+++ b/src/gs-fade.c
@@ -208,7 +208,7 @@ xf86_whack_gamma (int              screen,
                         g2.blue = XF86_MIN_GAMMA;
                 }
 
-                status = XF86VidModeSetGamma (GDK_DISPLAY (), screen, &g2);
+                status = XF86VidModeSetGamma (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), screen, &g2);
         } else {
 
 # ifdef HAVE_XF86VMODE_GAMMA_RAMP
@@ -225,7 +225,7 @@ xf86_whack_gamma (int              screen,
                         b[i] = gamma_info->b[i] * ratio;
                 }
 
-                status = XF86VidModeSetGammaRamp (GDK_DISPLAY (), screen, gamma_info->size, r, g, b);
+                status = XF86VidModeSetGammaRamp (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), screen, gamma_info->size, r, g, b);
 
                 g_free (r);
                 g_free (g);
@@ -298,7 +298,7 @@ gamma_fade_setup (GSFade *fade, int screen_idx)
         if (FADE_TYPE_GAMMA_RAMP == screen_priv->fade_type) {
                 /* have ramps */
 
-                res = XF86VidModeGetGammaRampSize (GDK_DISPLAY (), screen_idx, &screen_priv->info->size);
+                res = XF86VidModeGetGammaRampSize (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), screen_idx, &screen_priv->info->size);
                 if (!res || screen_priv->info->size <= 0) {
                         screen_priv->fade_type = FADE_TYPE_GAMMA_NUMBER;
                         goto test_number;
@@ -313,7 +313,7 @@ gamma_fade_setup (GSFade *fade, int screen_idx)
                         goto test_number;
                 }
 
-                res = XF86VidModeGetGammaRamp (GDK_DISPLAY (),
+                res = XF86VidModeGetGammaRamp (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
                                                screen_idx,
                                                screen_priv->info->size,
                                                screen_priv->info->r,
@@ -331,7 +331,7 @@ gamma_fade_setup (GSFade *fade, int screen_idx)
         if (FADE_TYPE_GAMMA_NUMBER == screen_priv->fade_type) {
                 /* only have gamma parameter, not ramps. */
 
-                res = XF86VidModeGetGamma (GDK_DISPLAY (), screen_idx, &screen_priv->vmg);
+                res = XF86VidModeGetGamma (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), screen_idx, &screen_priv->vmg);
                 if (! res) {
                         screen_priv->fade_type = FADE_TYPE_NONE;
                         goto test_none;
@@ -410,11 +410,11 @@ check_gamma_extension (GSFade *fade, int screen_idx)
         screen_priv = &fade->priv->screen_priv[screen_idx];
 
 #ifdef HAVE_XF86VMODE_GAMMA
-        res = XF86VidModeQueryExtension (GDK_DISPLAY (), &event, &error);
+        res = XF86VidModeQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &event, &error);
         if (! res)
                 goto fade_none;
 
-        res = safe_XF86VidModeQueryVersion (GDK_DISPLAY (), &major, &minor);
+        res = safe_XF86VidModeQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor);
         if (! res)
                 goto fade_none;
 
diff --git a/src/gs-grab-x11.c b/src/gs-grab-x11.c
index 2e03ddd..1ce940c 100644
--- a/src/gs-grab-x11.c
+++ b/src/gs-grab-x11.c
@@ -95,7 +95,7 @@ xorg_lock_smasher_set_active (GSGrab  *grab,
 {
         int status, event, error;
 
-	if (!XF86MiscQueryExtension (GDK_DISPLAY (), &event, &error)) {
+	if (!XF86MiscQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &event, &error)) {
 		gs_debug ("No XFree86-Misc extension present");
 		return;
 	}
@@ -108,7 +108,7 @@ xorg_lock_smasher_set_active (GSGrab  *grab,
 
         gdk_error_trap_push ();
 
-        status = XF86MiscSetGrabKeysState (GDK_DISPLAY (), active);
+        status = XF86MiscSetGrabKeysState (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), active);
 
         gdk_display_sync (gdk_display_get_default ());
         gdk_error_trap_pop ();
@@ -379,9 +379,9 @@ gs_grab_nuke_focus (void)
 
         gdk_error_trap_push ();
 
-        XGetInputFocus (GDK_DISPLAY (), &focus, &rev);
+        XGetInputFocus (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &focus, &rev);
 
-        XSetInputFocus (GDK_DISPLAY (), None, RevertToNone, CurrentTime);
+        XSetInputFocus (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), None, RevertToNone, CurrentTime);
 
         gdk_display_sync (gdk_display_get_default ());
         gdk_error_trap_pop ();
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index c7dd28c..8365bb2 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -1585,7 +1585,7 @@ gs_lock_plug_init (GSLockPlug *plug)
         if (plug->priv->auth_prompt_kbd_layout_indicator != NULL) {
                 XklEngine *engine;
 
-                engine = xkl_engine_get_instance (GDK_DISPLAY ());
+                engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
                 if (xkl_engine_get_num_groups (engine) > 1) {
                         GtkWidget *layout_indicator;
 
diff --git a/src/gs-watcher-x11.c b/src/gs-watcher-x11.c
index ec63552..f3d611d 100644
--- a/src/gs-watcher-x11.c
+++ b/src/gs-watcher-x11.c
@@ -535,7 +535,7 @@ disable_builtin_screensaver (GSWatcher *watcher,
         int desired_server_timeout, desired_server_interval;
         int desired_prefer_blank,   desired_allow_exp;
 
-        XGetScreenSaver (GDK_DISPLAY (),
+        XGetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
                          &current_server_timeout,
                          &current_server_interval,
                          &current_prefer_blank,
@@ -573,18 +573,18 @@ disable_builtin_screensaver (GSWatcher *watcher,
                           (desired_prefer_blank ? "blank" : "noblank"),
                           (desired_allow_exp ? "expose" : "noexpose"));
 
-                XSetScreenSaver (GDK_DISPLAY (),
+                XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
                                  desired_server_timeout,
                                  desired_server_interval,
                                  desired_prefer_blank,
                                  desired_allow_exp);
 
-                XSync (GDK_DISPLAY (), FALSE);
+                XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
         }
 
         if (unblank_screen) {
                 /* Turn off the server builtin saver if it is now running. */
-                XForceScreenSaver (GDK_DISPLAY (), ScreenSaverReset);
+                XForceScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), ScreenSaverReset);
         }
 }
 
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index 3e3180b..d9ac972 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -216,7 +216,7 @@ clear_children (Window window)
         int               status;
 
         children = NULL;
-        status = XQueryTree (GDK_DISPLAY (), window, &root, &parent, &children, &n_children);
+        status = XQueryTree (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), window, &root, &parent, &children, &n_children);
 
         if (status == 0) {
                 if (children) {
@@ -231,7 +231,7 @@ clear_children (Window window)
 
                         child = children [--n_children];
 
-                        XClearWindow (GDK_DISPLAY (), child);
+                        XClearWindow (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), child);
                         clear_children (child);
                 }
 
@@ -838,10 +838,10 @@ select_popup_events (void)
         gdk_error_trap_push ();
 
         memset (&attr, 0, sizeof (attr));
-        XGetWindowAttributes (GDK_DISPLAY (), GDK_ROOT_WINDOW (), &attr);
+        XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_ROOT_WINDOW (), &attr);
 
         events = SubstructureNotifyMask | attr.your_event_mask;
-        XSelectInput (GDK_DISPLAY (), GDK_ROOT_WINDOW (), events);
+        XSelectInput (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_ROOT_WINDOW (), events);
 
         gdk_display_sync (gdk_display_get_default ());
         gdk_error_trap_pop ();
@@ -856,9 +856,9 @@ window_select_shape_events (GSWindow *window)
 
         gdk_error_trap_push ();
 
-        if (XShapeQueryExtension (GDK_DISPLAY (), &window->priv->shape_event_base, &shape_error_base)) {
+        if (XShapeQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &window->priv->shape_event_base, &shape_error_base)) {
                 events = ShapeNotifyMask;
-                XShapeSelectInput (GDK_DISPLAY (), GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window))), events);
+                XShapeSelectInput (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window))), events);
         }
 
         gdk_display_sync (gdk_display_get_default ());
diff --git a/src/test-fade.c b/src/test-fade.c
index d5ae0a6..0982c29 100644
--- a/src/test-fade.c
+++ b/src/test-fade.c
@@ -97,14 +97,14 @@ main (int    argc,
                 exit (1);
         }
 
-        if (! XQueryExtension (GDK_DISPLAY (), XF86_VIDMODE_NAME, &op, &event, &err)) {
+        if (! XQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XF86_VIDMODE_NAME, &op, &event, &err)) {
                 g_message ("no " XF86_VIDMODE_NAME " extension");
         } else {
 # ifdef HAVE_XF86VMODE_GAMMA
                 int major;
                 int minor;
 
-                if (! XF86VidModeQueryVersion (GDK_DISPLAY (), &major, &minor)) {
+                if (! XF86VidModeQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor)) {
                         g_message ("unable to get " XF86_VIDMODE_NAME " version");
                 } else {
                         g_message (XF86_VIDMODE_NAME " version %d.%d", major, minor);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]