AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure we initialize a quark first

Browse Source 
The style function here can also be called before the corresponding
class_init had a chance to create the quark. Fix this.
This commit is contained in:
Matthias Clasen 2016-05-06 00:46:17 -04:00
parent d91b8c91d3
commit cb8817f710
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/deprecated/gtkstyle.c
View File

@ -509,8 +509,6 @@ gtk_style_class_init (GtkStyleClass *klass)
NULL, NULL,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
quark_default_style = g_quark_from_static_string ("gtk-legacy-default-style");
}
static void
@ -4019,6 +4017,9 @@ gtk_widget_get_default_style_for_screen (GdkScreen *screen)
{
GtkStyle *default_style;
if G_UNLIKELY (quark_default_style == 0)
quark_default_style = g_quark_from_static_string ("gtk-legacy-default-style");
default_style = g_object_get_qdata (G_OBJECT (screen), quark_default_style);
if (default_style == NULL)
{