summaryrefslogtreecommitdiff
path: root/gobject
diff options
context:
space:
mode:
authorJohan Dahlin <johan@src.gnome.org>2008-08-21 09:45:07 +0000
committerJohan Dahlin <johan@src.gnome.org>2008-08-21 09:45:07 +0000
commitf9cc9f4bc79ea37e8e98b586f656a1c27baf62cd (patch)
tree3fdae891dd3f3a1656872ed4007e8b03c3cefcc3 /gobject
parenta12f4b7be7c37624953765e94f01e9bf34a8fea2 (diff)
Revert fix for 548689
svn path=/trunk/; revision=7379
Diffstat (limited to 'gobject')
-rw-r--r--gobject/ChangeLog7
-rw-r--r--gobject/gparam.c7
2 files changed, 6 insertions, 8 deletions
diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index ab94edaba..879f1ce69 100644
--- 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 b63574641..3dccff01f 100644
--- 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);
}