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>

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 2549eb26f273819d4ef5b889936deec847771952..fc5e3d0dae80f2d964f49181ed6cbb7c6114e6a3 100644 (file)
--- 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 acc94ef82a5a571e0760ba386390155e8a16d782..04bcc7e10ccd22386c0d890eb4f510ba27f2633b 100644 (file)
--- 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;
        }