Include "config.h" instead of <config.h> Command used: find -name

[~andy/gtk] / gtk / gtkobject.c

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index 412b51c0907b80d13305a9238df854ee286c5f76..a2dde92d8423f87899c91ee7983efa124073d7da 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -24,15 +24,20 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include <config.h>
+#include "config.h"
+
 #include <stdarg.h>
 #include <string.h>
 #include <stdio.h>
+
+#undef GTK_DISABLE_DEPRECATED
+
 #include "gtkobject.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
-#include "gtksignal.h"
 #include "gtkprivate.h"
+
+#define GTK_DISABLE_DEPRECATED
 #include "gtkalias.h"
 
 
@@ -46,7 +51,6 @@ enum {
 };
 
 
-extern void      gtk_object_init_type           (void);        /* for gtktypeutils.h */
 static void       gtk_object_base_class_init     (GtkObjectClass *class);
 static void       gtk_object_base_class_finalize (GtkObjectClass *class);
 static void       gtk_object_class_init          (GtkObjectClass *klass);
@@ -82,7 +86,7 @@ gtk_object_get_type (void)
 
   if (!object_type)
     {
-      static const GTypeInfo object_info =
+      const GTypeInfo object_info =
       {
        sizeof (GtkObjectClass),
        (GBaseInitFunc) gtk_object_base_class_init,
@@ -381,6 +385,12 @@ static void
 gtk_object_init (GtkObject      *object,
                 GtkObjectClass *klass)
 {
+  gboolean was_floating;
+  /* sink the GInitiallyUnowned floating flag */
+  was_floating = gobject_floating_flag_handler (object, -1);
+  /* set GTK_FLOATING via gtk_object_floating_flag_handler */
+  if (was_floating)
+    g_object_force_floating (G_OBJECT (object));
 }
 
 /********************************************