changed return value of g_value_dup_object(), fixes #343292.

Wed Aug 23 10:35:32 2006  Tim Janik  <timj@gtk.org>

        * gobject.[hc]: changed return value of g_value_dup_object(), fixes #343292.

2006-08-23  Sven Neumann  <sven@gimp.org>

        * gobject/glib-genmarshal.[c1]: added new command-line option
        "--internal" that can be used to let glib-genmarshal generate
        internal functions using the G_GNUC_INTERNAL attribute (bug #346647).

diff --git a/ChangeLog b/ChangeLog
index 6fbca8c..8499c10 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,3 @@
-2006-08-23  Sven Neumann  <sven@gimp.org>
-
-       * gobject/glib-genmarshal.[c1]: added new command-line option
-       "--internal" that can be used to let glib-genmarshal generate
-       internal functions using the G_GNUC_INTERNAL attribute (bug #346647).
-
 2006-08-22  Matthias Clasen <mclasen@redhat.com>
 
        * Branch for 2.12

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index e9b4639..793abef 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,13 @@
+Wed Aug 23 10:35:32 2006  Tim Janik  <timj@gtk.org>
+
+       * gobject.[hc]: changed return value of g_value_dup_object(), fixes #343292.
+
+2006-08-23  Sven Neumann  <sven@gimp.org>
+
+       * gobject/glib-genmarshal.[c1]: added new command-line option
+       "--internal" that can be used to let glib-genmarshal generate
+       internal functions using the G_GNUC_INTERNAL attribute (bug #346647).
+
 Wed Aug 16 13:55:08 2006  Tim Janik  <timj@imendio.com>
 
        * gobject.c: conditionally thaw the notify queue after construction,

diff --git a/gobject/gobject.c b/gobject/gobject.c
index 095e74a..d5290a1 100644 (file)
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -2044,7 +2044,7 @@ g_value_get_object (const GValue *value)
   return value->data[0].v_pointer;
 }
 
-GObject*
+gpointer
 g_value_dup_object (const GValue *value)
 {
   g_return_val_if_fail (G_VALUE_HOLDS_OBJECT (value), NULL);

diff --git a/gobject/gobject.h b/gobject/gobject.h
index 21538df..4dda126 100644 (file)
--- a/gobject/gobject.h
+++ b/gobject/gobject.h
@@ -237,7 +237,7 @@ GClosure*   g_closure_new_object              (guint           sizeof_closure,
 void        g_value_set_object                (GValue         *value,
                                               gpointer        v_object);
 gpointer    g_value_get_object                (const GValue   *value);
-GObject*    g_value_dup_object                (const GValue   *value);
+gpointer    g_value_dup_object                (const GValue   *value);
 gulong     g_signal_connect_object           (gpointer        instance,
                                               const gchar    *detailed_signal,
                                               GCallback       c_handler,