From 89f9ebaef309739fb7dec598df2caab86931091f Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 23 Aug 2006 08:46:21 +0000 Subject: [PATCH] changed return value of g_value_dup_object(), fixes #343292. Wed Aug 23 10:35:32 2006 Tim Janik * gobject.[hc]: changed return value of g_value_dup_object(), fixes #343292. 2006-08-23 Sven Neumann * 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). --- ChangeLog | 6 ------ gobject/ChangeLog | 10 ++++++++++ gobject/gobject.c | 2 +- gobject/gobject.h | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fbca8c0..8499c100 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,3 @@ -2006-08-23 Sven Neumann - - * 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 * Branch for 2.12 diff --git a/gobject/ChangeLog b/gobject/ChangeLog index e9b46393..793abef2 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,13 @@ +Wed Aug 23 10:35:32 2006 Tim Janik + + * gobject.[hc]: changed return value of g_value_dup_object(), fixes #343292. + +2006-08-23 Sven Neumann + + * 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 * gobject.c: conditionally thaw the notify queue after construction, diff --git a/gobject/gobject.c b/gobject/gobject.c index 095e74a9..d5290a10 100644 --- 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 21538dfc..4dda1264 100644 --- 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, -- 2.34.1