[gtk+/broadway: 217/246] broadway: Implement gdk_display_flush



commit 7c12e5f27ec546b09ecde90e4fab649840cae909
Author: Alexander Larsson <alexl redhat com>
Date:   Fri Mar 11 14:37:39 2011 +0100

    broadway: Implement gdk_display_flush

 gdk/broadway/gdkdisplay-broadway.c |    9 +++++++++
 gdk/broadway/gdkwindow-broadway.c  |    9 ++-------
 2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
index c75b0c4..7e7bdff 100644
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -679,8 +679,17 @@ gdk_broadway_display_sync (GdkDisplay *display)
 static void
 gdk_broadway_display_flush (GdkDisplay *display)
 {
+  GdkBroadwayDisplay *broadway_display = GDK_BROADWAY_DISPLAY (display);
+
   g_return_if_fail (GDK_IS_DISPLAY (display));
 
+  if (broadway_display->output &&
+      !broadway_output_flush (broadway_display->output))
+    {
+      broadway_display->saved_serial = broadway_output_get_next_serial (broadway_display->output);
+      broadway_output_free (broadway_display->output);
+      broadway_display->output = NULL;
+    }
 }
 
 static gboolean
diff --git a/gdk/broadway/gdkwindow-broadway.c b/gdk/broadway/gdkwindow-broadway.c
index 6dc3f68..9659a36 100644
--- a/gdk/broadway/gdkwindow-broadway.c
+++ b/gdk/broadway/gdkwindow-broadway.c
@@ -184,12 +184,7 @@ dirty_flush_idle (gpointer data)
 	}
     }
 
-  if (!broadway_output_flush (display->output))
-    {
-      display->saved_serial = broadway_output_get_next_serial (display->output);
-      broadway_output_free (display->output);
-      display->output = NULL;
-    }
+  gdk_display_flush (GDK_DISPLAY (display));
 
   return FALSE;
 }
@@ -236,7 +231,7 @@ _gdk_broadway_resync_windows (void)
 	}
     }
 
-  broadway_output_flush (display->output);
+  gdk_display_flush (GDK_DISPLAY (display));
 }
 
 static void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]