]> Pileus Git - ~andy/gtk/commitdiff
x11: Use gdk_display_flush()
authorBenjamin Otte <otte@redhat.com>
Fri, 15 Feb 2013 21:26:45 +0000 (22:26 +0100)
committerBenjamin Otte <otte@redhat.com>
Tue, 19 Feb 2013 13:33:38 +0000 (14:33 +0100)
gdk/x11/xsettings-client.c

index 5edeb46622e836f7e8086cdc6a045e6a858d4b4b..c5f4bcac21dd822148806f52c9590178913cdda3 100644 (file)
@@ -407,10 +407,14 @@ gdk_xsettings_watch (Window     window,
 static void
 check_manager_window (XSettingsClient *client)
 {
+  GdkDisplay *display;
+
+  display = gdk_screen_get_display (client->screen);
+
   if (client->manager_window)
     gdk_xsettings_watch (client->manager_window, False, client->screen);
 
-  gdk_x11_display_grab (gdk_screen_get_display (client->screen));
+  gdk_x11_display_grab (display);
 
   client->manager_window = XGetSelectionOwner (client->display,
                                               client->selection_atom);
@@ -418,9 +422,9 @@ check_manager_window (XSettingsClient *client)
     XSelectInput (client->display, client->manager_window,
                  PropertyChangeMask | StructureNotifyMask);
 
-  gdk_x11_display_ungrab (gdk_screen_get_display (client->screen));
+  gdk_x11_display_ungrab (display);
   
-  XFlush (client->display);
+  gdk_display_flush (display);
 
   if (client->manager_window)
     {