From: Tim Janik <timj@gtk.org>
Date: Tue, 7 Mar 2006 16:15:20 +0000 (+0000)
Subject: added case3 to hand out the original floating flag handler. required by
X-Git-Tag: GLIB_2_10_1~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e9b421f212929d862ad217cb1380679a6c815a4f;p=platform%2Fupstream%2Fglib.git

added case3 to hand out the original floating flag handler. required by

Tue Mar  7 17:09:07 2006  Tim Janik  <timj@gtk.org>

        * gobject.c (g_object_compat_control): added case3 to hand out the
        original floating flag handler. required by gtk+ >= 2.10.
---

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 710f5f2..df10229 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar  7 17:09:07 2006  Tim Janik  <timj@gtk.org>
+
+	* gobject.c (g_object_compat_control): added case3 to hand out the
+	original floating flag handler. required by gtk+ >= 2.10.
+
 2006-02-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* === Released 2.10.0 ===
diff --git a/gobject/gobject.c b/gobject/gobject.c
index 27c2b9c..8cfb812 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -2204,11 +2204,16 @@ g_object_compat_control (gsize           what,
 {
   switch (what)
     {
+      gpointer *pp;
     case 1:     /* floating base type */
       return G_TYPE_INITIALLY_UNOWNED;
     case 2:     /* FIXME: remove this once GLib/Gtk+ break ABI again */
       floating_flag_handler = (guint(*)(GObject*,gint)) data;
       return 1;
+    case 3:     /* FIXME: remove this once GLib/Gtk+ break ABI again */
+      pp = data;
+      *pp = floating_flag_handler;
+      return 1;
     default:
       return 0;
     }