summaryrefslogtreecommitdiff
path: root/gobject
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-06-15 19:18:51 +0000
committerFederico Mena Quintero <federico@src.gnome.org>2006-06-15 19:18:51 +0000
commitdd106106dc5b9a9c03cd168643765d9830c076a9 (patch)
treeb6ed9ddcb904610900acd55ce7da7a91aef4999f /gobject
parent99998793d5249477d2b830b834aa12d2a2061fca (diff)
Separate groups by an empty line (#344868, Christian Persch)
2006-06-14 Matthias Clasen <mclasen@redhat.com> * glib/gkeyfile.c (g_key_file_to_data): Separate groups by an empty line (#344868, Christian Persch) 2006-06-14 Tor Lillqvist <tml@novell.com>
Diffstat (limited to 'gobject')
-rw-r--r--gobject/ChangeLog7
-rw-r--r--gobject/gtype.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 2549eb26f..fc5e3d0da 100644
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-15 Federico Mena Quintero <federico@novell.com>
+
+ * gtype.c (g_type_instance_get_private): Fix the error message so
+ that it mentions the right functions:
+ "g_type_instance_get_private() requires a prior call to
+ g_type_class_add_private()".
+
2006-06-12 Matthias Clasen <mclasen@redhat.com>
* === Released 2.11.3 ===
diff --git a/gobject/gtype.c b/gobject/gtype.c
index acc94ef82..04bcc7e10 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -3557,7 +3557,7 @@ g_type_instance_get_private (GTypeInstance *instance,
if (G_UNLIKELY (private_node->data->instance.private_size == parent_node->data->instance.private_size))
{
- g_warning ("g_type_get_private() requires a prior call to g_type_add_private()");
+ g_warning ("g_type_instance_get_private() requires a prior call to g_type_class_add_private()");
return NULL;
}