depend on glib-2.10.1.

Tue Mar  7 17:16:34 2006  Tim Janik  <timj@gtk.org>

        * configure.in: depend on glib-2.10.1.

        * gtk/gtkobject.c: fixed up messing with non-GtkObject floating flags.
        this requires glib-2.10.1.

diff --git a/ChangeLog b/ChangeLog
index 44cfdcfa49bcbfe6932317996611ab341ec34703..4fe20bebbf7d5c84959f850748fbe8e912f866ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Mar  7 17:16:34 2006  Tim Janik  <timj@gtk.org>
+
+       * configure.in: depend on glib-2.10.1.
+
+       * gtk/gtkobject.c: fixed up messing with non-GtkObject floating flags.
+       this requires glib-2.10.1.
+
 2006-03-07  Michael Natterer  <mitch@imendio.com>
 
        Add infrastructure for copy/paste and DND of rich text for

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 44cfdcfa49bcbfe6932317996611ab341ec34703..4fe20bebbf7d5c84959f850748fbe8e912f866ed 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Mar  7 17:16:34 2006  Tim Janik  <timj@gtk.org>
+
+       * configure.in: depend on glib-2.10.1.
+
+       * gtk/gtkobject.c: fixed up messing with non-GtkObject floating flags.
+       this requires glib-2.10.1.
+
 2006-03-07  Michael Natterer  <mitch@imendio.com>
 
        Add infrastructure for copy/paste and DND of rich text for

diff --git a/configure.in b/configure.in
index d1402a5699c85146b3024b3f584e0b5f4e517467..27faaff9fe7484690d8de2f54e8f455d6cbcbf71 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ m4_define([gtk_api_version], [2.0])
 m4_define([gtk_binary_version], [2.4.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.9.2])
+m4_define([glib_required_version], [2.10.1])
 m4_define([pango_required_version], [1.9.0])
 m4_define([atk_required_version], [1.0.1])
 m4_define([cairo_required_version], [0.9.2])

diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index 287aefb556cdc7dc3f93b1fa7ff6478ce7fbd141..412b51c0907b80d13305a9238df854ee286c5f76 100644 (file)
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -314,11 +314,15 @@ gtk_object_add_arg_type (const gchar *arg_name,
   g_object_class_install_property (oclass, arg_id, pspec);
 }
 
+static guint (*gobject_floating_flag_handler) (GtkObject*,gint) = NULL;
+
 static guint
 gtk_object_floating_flag_handler (GtkObject *object,
                                   gint       job)
 {
   /* FIXME: remove this whole thing once GTK+ breaks ABI */
+  if (!GTK_IS_OBJECT (object))
+    return gobject_floating_flag_handler (object, job);
   switch (job)
     {
       guint32 oldvalue;
@@ -341,9 +345,13 @@ static void
 gtk_object_class_init (GtkObjectClass *class)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+  gboolean is_glib_2_10_1;
 
   parent_class = g_type_class_ref (G_TYPE_OBJECT);
 
+  is_glib_2_10_1 = g_object_compat_control (3, &gobject_floating_flag_handler);
+  if (!is_glib_2_10_1)
+    g_error ("this version of Gtk+ requires GLib-2.10.1");
   g_object_compat_control (2, gtk_object_floating_flag_handler);
 
   gobject_class->set_property = gtk_object_set_property;