Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkThemingEngine: increase the level of the hacks

Browse Source 
GtkThemingEngine contains a rather fantastic hack that modifies-in-place
the structure of a GParamSpec.  Recent changes to GLib have caused this
hack to explode in a very bad way.

Modify the hack to check the GLib version and do the correct thing on
either side of the change.
This commit is contained in:
Ryan Lortie
2011-07-21 15:22:05 +02:00
parent dbefb01d45
commit 98513a02a2
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtkthemingengine.c
View File

@@ -381,8 +381,28 @@ gtk_theming_engine_register_property (const gchar *name_space,
/* FIXME: hack hack hack, replacing pspec->name to include namespace */
name = g_strdup_printf ("-%s-%s", name_space, pspec->name);
g_free (pspec->name);
pspec->name = name;
/**
* GParamSpec ->name field is stored in two different ways depending
* on the flags used to create it and the GLib verison we are using.
*
* If G_PARAM_STATIC_NAME (or G_PARAM_STATIC_STRINGS) was given then
* the string is interned. It is also interned in all cases for GLib
* versions starting with 2.29.12.
*
* On GLib versions before 2.29.12, if G_PARAM_STATIC_NAME was not
* specified, then ->name was allocated with g_strdup().
*/
if (glib_check_version (2, 29, 12) == NULL || (pspec->flags & G_PARAM_STATIC_NAME) != 0)
{
pspec->name = (char *) g_intern_string (name);
g_free (name);
}
else
{
g_free ((char *) pspec->name);
pspec->name = name;
}
gtk_style_properties_register_property (parse_func, pspec);
}