move the floating flag from the GInitiallyUnowned bit to GTK_FLOATING.

Thu Mar  9 14:29:43 2006  Tim Janik  <timj@gtk.org>

        * gtk/gtkobject.c (gtk_object_init): move the floating flag from
        the GInitiallyUnowned bit to GTK_FLOATING. fixes tests/floatingcheck.
        kudos to mitch for debugging this.

diff --git a/ChangeLog b/ChangeLog
index c10067b04cd17bede87c3915e603768831828508..b56c639e9b00db44438305f0443a00a9997bd7fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar  9 14:29:43 2006  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkobject.c (gtk_object_init): move the floating flag from
+       the GInitiallyUnowned bit to GTK_FLOATING. fixes tests/floatingcheck.
+       kudos to mitch for debugging this.
+
 2006-03-09  Matthias Clasen <mclasen@redhat.com>
 
        * Makefile.am: Add ChangeLog.pre-2.8 to EXTRA_DIST.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c10067b04cd17bede87c3915e603768831828508..b56c639e9b00db44438305f0443a00a9997bd7fc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Mar  9 14:29:43 2006  Tim Janik  <timj@gtk.org>
+
+       * gtk/gtkobject.c (gtk_object_init): move the floating flag from
+       the GInitiallyUnowned bit to GTK_FLOATING. fixes tests/floatingcheck.
+       kudos to mitch for debugging this.
+
 2006-03-09  Matthias Clasen <mclasen@redhat.com>
 
        * Makefile.am: Add ChangeLog.pre-2.8 to EXTRA_DIST.

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index 412b51c0907b80d13305a9238df854ee286c5f76..1b9d78215d15567bb333e7d06617ad0cafd00705 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -381,6 +381,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));
 }
 
 /********************************************