[gtk+] x11: Remove extra variable

[Benjamin Otte <otte src gnome org>]

commit 84679ba78bbd5a3f13044084e03364eb4d8040da
Author: Benjamin Otte <otte redhat com>
Date:   Sat Feb 16 23:59:07 2013 +0100

    x11: Remove extra variable
    
    Use a getter instead.

 gdk/x11/xsettings-client.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c
index 5092f82..1bb437f 100644
--- a/gdk/x11/xsettings-client.c
+++ b/gdk/x11/xsettings-client.c
@@ -53,7 +53,6 @@ struct _XSettingsBuffer
 struct _XSettingsClient
 {
   GdkScreen *screen;
-  Display *display;
 
   GdkWindow *manager_window;
   Atom selection_atom;
@@ -371,7 +370,7 @@ read_settings (XSettingsClient *client)
       Atom xsettings_atom = gdk_x11_get_xatom_by_name_for_display (display, "_XSETTINGS_SETTINGS");
 
       gdk_x11_display_error_trap_push (display);
-      result = XGetWindowProperty (client->display,
+      result = XGetWindowProperty (gdk_x11_display_get_xdisplay (display),
                                    gdk_x11_window_get_xid (client->manager_window),
                                   xsettings_atom, 0, LONG_MAX,
                                   False, xsettings_atom,
@@ -409,9 +408,11 @@ static void
 check_manager_window (XSettingsClient *client)
 {
   GdkDisplay *display;
+  Display *xdisplay;
   Window manager_window_xid;
 
   display = gdk_screen_get_display (client->screen);
+  xdisplay = gdk_x11_display_get_xdisplay (display);
 
   if (client->manager_window)
     {
@@ -421,14 +422,14 @@ check_manager_window (XSettingsClient *client)
 
   gdk_x11_display_grab (display);
 
-  manager_window_xid = XGetSelectionOwner (client->display,
+  manager_window_xid = XGetSelectionOwner (xdisplay,
                                           client->selection_atom);
   client->manager_window = gdk_x11_window_foreign_new_for_display (display,
                                                                    manager_window_xid);
   /* XXX: Can't use gdk_window_set_events() here because the first call to this
    * function happens too early in gdk_init() */
   if (client->manager_window)
-    XSelectInput (client->display,
+    XSelectInput (xdisplay,
                   gdk_x11_window_get_xid (client->manager_window),
                   PropertyChangeMask | StructureNotifyMask);
 
@@ -505,8 +506,6 @@ xsettings_client_new (GdkScreen *screen)
     return NULL;
 
   client->screen = screen;
-  client->display = gdk_x11_display_get_xdisplay (gdk_screen_get_display (screen));
-  client->screen = screen;
   client->manager_window = None;
   client->settings = NULL;