[gnome-settings-daemon] Use gdk_display_get_default instead of GDK_DISPLAY

[Federico Mena Quintero <federico src gnome org>]

commit 19e9928b86d6a2b8390ca2f36ab5f73473bb3120
Author: Kalev Lember <kalev smartlink ee>
Date:   Fri Sep 10 18:43:19 2010 +0300

    Use gdk_display_get_default instead of GDK_DISPLAY
    
    GDK_DISPLAY() was deprecated in GTK+ 2.22 and removed in GTK+ 3.

 plugins/background/gsd-background-manager.c |    8 ++++----
 plugins/common/gsd-keygrab.c                |    4 ++--
 plugins/font/gsd-font-manager.c             |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/plugins/background/gsd-background-manager.c b/plugins/background/gsd-background-manager.c
index 907a08c..5592df9 100644
--- a/plugins/background/gsd-background-manager.c
+++ b/plugins/background/gsd-background-manager.c
@@ -84,14 +84,14 @@ nautilus_is_running (void)
        gboolean       running;
        gint           error;
 
-       window_id_atom = XInternAtom (GDK_DISPLAY (),
+       window_id_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
                                      "NAUTILUS_DESKTOP_WINDOW_ID", True);
 
        if (window_id_atom == None) {
                return FALSE;
        }
 
-       retval = XGetWindowProperty (GDK_DISPLAY (),
+       retval = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
                                     GDK_ROOT_WINDOW (),
                                     window_id_atom,
                                     0,
@@ -118,11 +118,11 @@ nautilus_is_running (void)
                return FALSE;
        }
 
-       wmclass_atom = XInternAtom (GDK_DISPLAY (), "WM_CLASS", False);
+       wmclass_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLASS", False);
 
        gdk_error_trap_push ();
 
-       retval = XGetWindowProperty (GDK_DISPLAY (),
+       retval = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
                                     nautilus_xid,
                                     wmclass_atom,
                                     0,
diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
index 396cb17..c26d3d0 100644
--- a/plugins/common/gsd-keygrab.c
+++ b/plugins/common/gsd-keygrab.c
@@ -74,7 +74,7 @@ grab_key_real (guint      keycode,
                int        mask)
 {
         if (grab) {
-                XGrabKey (GDK_DISPLAY (),
+                XGrabKey (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
                           keycode,
                           mask,
                           GDK_WINDOW_XID (root),
@@ -82,7 +82,7 @@ grab_key_real (guint      keycode,
                           GrabModeAsync,
                           GrabModeAsync);
         } else {
-                XUngrabKey (GDK_DISPLAY (),
+                XUngrabKey (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
                             keycode,
                             mask,
                             GDK_WINDOW_XID (root));
diff --git a/plugins/font/gsd-font-manager.c b/plugins/font/gsd-font-manager.c
index 2c7135d..4febc21 100644
--- a/plugins/font/gsd-font-manager.c
+++ b/plugins/font/gsd-font-manager.c
@@ -312,12 +312,12 @@ load_font_paths (GConfClient *client)
         /* We set font path even if it was not changed, to enforce dropping
          * caches in the server */
         gdk_error_trap_push ();
-        XSetFontPath (gdk_display, new_font_path, new_n_fonts);
+        XSetFontPath (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), new_font_path, new_n_fonts);
         gdk_flush ();
 
         /* if there was an error setting the new path, revert */
         if (gdk_error_trap_pop ()) {
-                XSetFontPath (gdk_display, font_path, n_fonts);
+                XSetFontPath (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), font_path, n_fonts);
         }
 
         g_free (font_dir_name);