Revert fix for 548689

svn path=/trunk/; revision=7379

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index ab94eda..879f1ce 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -14,13 +14,6 @@
        * gobject.symbols:
        Add g_object_get_type
 
-2008-08-20  Johan Dahlin  <johan@gnome.org>
-
-       Bug 548689 – The type name for GParamSpec is wrong
-
-       * gparam.c (g_param_type_init):
-       Register the type name as GParamSpec instead of GParam.
-
 2008-08-18  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.17.7 ===

diff --git a/gobject/gparam.c b/gobject/gparam.c
index b635746..3dccff0 100644 (file)
--- a/gobject/gparam.c
+++ b/gobject/gparam.c
@@ -122,7 +122,12 @@ g_param_type_init (void)
   };
   GType type;
 
-  type = g_type_register_fundamental (G_TYPE_PARAM, g_intern_static_string ("GParamSpec"), &param_spec_info, &finfo, G_TYPE_FLAG_ABSTRACT);
+  /* This should be registred as GParamSpec instead of GParam, for
+   * consistency sake, so that type name can be mapped to struct name,
+   * However, some language bindings, most noticable the python ones
+   * depends on the "GParam" identifier, see #548689
+   */
+  type = g_type_register_fundamental (G_TYPE_PARAM, g_intern_static_string ("GParam"), &param_spec_info, &finfo, G_TYPE_FLAG_ABSTRACT);
   g_assert (type == G_TYPE_PARAM);
   g_value_register_transform_func (G_TYPE_PARAM, G_TYPE_PARAM, value_param_transform_value);
 }