gnome-desktop r5351 - trunk/libgnome-desktop

[halfline svn gnome org]

Author: halfline
Date: Mon Jan 19 22:57:36 2009
New Revision: 5351
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5351&view=rev

Log:
Use gdk functions to grab server and flush client

It looks a little nicer this way.

Modified:
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/gnome-bg.c

Modified: trunk/libgnome-desktop/gnome-bg.c
==============================================================================
--- trunk/libgnome-desktop/gnome-bg.c	(original)
+++ trunk/libgnome-desktop/gnome-bg.c	Mon Jan 19 22:57:36 2009
@@ -1048,7 +1048,7 @@
 
 
 /* Set the root pixmap, and properties pointing to it. We
- * do this atomically with XGrabServer to make sure that
+ * do this atomically with a server grab to make sure that
  * we won't leak the pixmap if somebody else it setting
  * it at the same time. (This assumes that they follow the
  * same conventions we do)
@@ -1074,7 +1074,7 @@
 	data_esetroot = NULL;
 	display = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
 	
-	XGrabServer (display);
+	gdk_x11_display_grab (gdk_screen_get_display (screen));
 	
 	result = XGetWindowProperty (
 		display, RootWindow (display, screen_num),
@@ -1109,10 +1109,9 @@
 	XSetWindowBackgroundPixmap (display, RootWindow (display, screen_num),
 				    pixmap_id);
 	XClearWindow (display, RootWindow (display, screen_num));
-	
-	XUngrabServer (display);
-	
-	XFlush (display);
+
+	gdk_display_flush (gdk_screen_get_display (screen));
+	gdk_x11_display_ungrab (gdk_screen_get_display (screen));
 }