callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x11: Remove extra variable

Browse Source 
Use a getter instead.
This commit is contained in:
Benjamin Otte
2013-02-16 23:59:07 +01:00
parent 78ce2563be
commit 84679ba78b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gdk/x11/xsettings-client.c
View File

@ -53,7 +53,6 @@ struct _XSettingsBuffer
struct _XSettingsClient struct _XSettingsClient
{ {
GdkScreen *screen; GdkScreen *screen;
Display *display;
GdkWindow *manager_window; GdkWindow *manager_window;
Atom selection_atom; 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"); Atom xsettings_atom = gdk_x11_get_xatom_by_name_for_display (display, "_XSETTINGS_SETTINGS");
gdk_x11_display_error_trap_push (display); 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), gdk_x11_window_get_xid (client->manager_window),
xsettings_atom, 0, LONG_MAX, xsettings_atom, 0, LONG_MAX,
False, xsettings_atom, False, xsettings_atom,
@ -409,9 +408,11 @@ static void
check_manager_window (XSettingsClient *client) check_manager_window (XSettingsClient *client)
{ {
GdkDisplay *display; GdkDisplay *display;
Display *xdisplay;
Window manager_window_xid; Window manager_window_xid;
display = gdk_screen_get_display (client->screen); display = gdk_screen_get_display (client->screen);
xdisplay = gdk_x11_display_get_xdisplay (display);
if (client->manager_window) if (client->manager_window)
{ {
@ -421,14 +422,14 @@ check_manager_window (XSettingsClient *client)
gdk_x11_display_grab (display); gdk_x11_display_grab (display);
manager_window_xid = XGetSelectionOwner (client->display, manager_window_xid = XGetSelectionOwner (xdisplay,
client->selection_atom); client->selection_atom);
client->manager_window = gdk_x11_window_foreign_new_for_display (display, client->manager_window = gdk_x11_window_foreign_new_for_display (display,
manager_window_xid); manager_window_xid);
/* XXX: Can't use gdk_window_set_events() here because the first call to this /* XXX: Can't use gdk_window_set_events() here because the first call to this
* function happens too early in gdk_init() */ * function happens too early in gdk_init() */
if (client->manager_window) if (client->manager_window)
XSelectInput (client->display, XSelectInput (xdisplay,
gdk_x11_window_get_xid (client->manager_window), gdk_x11_window_get_xid (client->manager_window),
PropertyChangeMask | StructureNotifyMask); PropertyChangeMask | StructureNotifyMask);
@ -504,8 +505,6 @@ xsettings_client_new (GdkScreen *screen)
if (!client) if (!client)
return NULL; return NULL;
client->screen = screen;
client->display = gdk_x11_display_get_xdisplay (gdk_screen_get_display (screen));
client->screen = screen; client->screen = screen;
client->manager_window = None; client->manager_window = None;
client->settings = NULL; client->settings = NULL;