Flush outstanding stuff when clearing directly on a window

[~andy/gtk] / gdk / gdkdisplaymanager.c

diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c
index 157bcf42c4171ff66add4583c48b96e3cbaf5548..0f9a094eb9c64aa3da47f9ce35bc5c169eff9967 100644 (file)
--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "gdkscreen.h"
 #include "gdkdisplay.h"
@@ -67,33 +67,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 static GdkDisplay *default_display = NULL;
 
-GType
-gdk_display_manager_get_type (void)
-{
-  static GType object_type = 0;
-
-  if (!object_type)
-    {
-      static const GTypeInfo object_info =
-      {
-        sizeof (GdkDisplayManagerClass),
-        (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) gdk_display_manager_class_init,
-        NULL,           /* class_finalize */
-        NULL,           /* class_data */
-        sizeof (GdkDisplayManager),
-        0,              /* n_preallocs */
-        (GInstanceInitFunc) NULL,
-      };
-      
-      object_type = g_type_register_static (G_TYPE_OBJECT,
-                                            "GdkDisplayManager",
-                                            &object_info, 0);
-    }
-  
-  return object_type;
-}
+G_DEFINE_TYPE (GdkDisplayManager, gdk_display_manager, G_TYPE_OBJECT)
 
 static void
 gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
@@ -113,12 +87,12 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
    * Since: 2.2
    */
   signals[DISPLAY_OPENED] =
-    g_signal_new ("display_opened",
+    g_signal_new (g_intern_static_string ("display-opened"),
                  G_OBJECT_CLASS_TYPE (object_class),
                  G_SIGNAL_RUN_LAST,
                  G_STRUCT_OFFSET (GdkDisplayManagerClass, display_opened),
                  NULL, NULL,
-                 gdk_marshal_VOID__OBJECT,
+                 _gdk_marshal_VOID__OBJECT,
                  G_TYPE_NONE,
                  1,
                  GDK_TYPE_DISPLAY);
@@ -133,6 +107,11 @@ gdk_display_manager_class_init (GdkDisplayManagerClass *klass)
                                                        G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB));
 }
 
+static void
+gdk_display_manager_init (GdkDisplayManager *manager)
+{
+}
+
 static void
 gdk_display_manager_set_property (GObject      *object,
                                  guint         prop_id,
@@ -142,7 +121,8 @@ gdk_display_manager_set_property (GObject      *object,
   switch (prop_id)
     {
     case PROP_DEFAULT_DISPLAY:
-      default_display = g_value_get_object (value);
+      gdk_display_manager_set_default_display (GDK_DISPLAY_MANAGER (object),
+                                              g_value_get_object (value));
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -208,10 +188,8 @@ gdk_display_manager_get_default_display (GdkDisplayManager *display_manager)
  * gdk_display_get_default:
  *
  * Gets the default #GdkDisplay. This is a convenience
- * function for:
- * <programlisting>
- *   gdk_display_manager_get_default_display (gdk_display_manager_get ())
- * </programlisting>
+ * function for
+ * <literal>gdk_display_manager_get_default_display (gdk_display_manager_get ())</literal>.
  * 
  * Returns: a #GdkDisplay, or %NULL if there is no default
  *   display.