Merge lp:~cimi/overlay-scrollbar/use-gdk-flush-in-present-window into lp:overlay-scrollbar

[Andrea Cimitan]

just use gdk_flush instead XSync

[Loïc Molinari (loic.molinari)]

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-03-29 10:35:30 +0000
+++ os/os-scrollbar.c	2011-03-29 11:16:22 +0000
@@ -114,8 +114,7 @@
 
 /* Present a X11 window. */
 static void
-os_present_window_with_timestamp (Display *default_display,
-                                  Screen  *screen,
+os_present_window_with_timestamp (Screen  *screen,
                                   gint     xid,
                                   guint32  timestamp)
 {
@@ -144,12 +143,13 @@
   xev.xclient.data.l[4] = 0;
 
   gdk_error_trap_push ();
-  XSendEvent (display,
-              root,
-              False,
+
+  XSendEvent (display, root, False,
               SubstructureRedirectMask | SubstructureNotifyMask,
               &xev);
-  XSync (default_display, False);
+
+  gdk_flush ();
+
   gdk_error_trap_pop ();
 }
 
@@ -158,8 +158,7 @@
 os_present_gdk_window_with_timestamp (GtkWidget *widget,
                                       guint32    timestamp)
 {
-  os_present_window_with_timestamp (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-                                    GDK_SCREEN_XSCREEN (gtk_widget_get_screen (widget)),
+  os_present_window_with_timestamp (GDK_SCREEN_XSCREEN (gtk_widget_get_screen (widget)),
                                     GDK_WINDOW_XID (gtk_widget_get_window (widget)),
                                     timestamp);
 }