callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stylecontext: Add style_info_set_data()

Browse Source 
.. to take care of the refcounting properly.
This commit is contained in:
Benjamin Otte
2012-04-11 12:22:07 +02:00
parent b8c72a0bdb
commit 42d2430498
1 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
gtk/gtkstylecontext.c
View File

@ -533,10 +533,25 @@ style_info_new (void)
} }
static void static void
style_info_free (GtkStyleInfo *info) style_info_set_data (GtkStyleInfo *info,
StyleData *data)
{ {
if (info->data == data)
return;
if (data)
style_data_ref (data);
if (info->data) if (info->data)
style_data_unref (info->data); style_data_unref (info->data);
info->data = data;
}
static void
style_info_free (GtkStyleInfo *info)
{
style_info_set_data (info, NULL);
g_array_free (info->style_classes, TRUE); g_array_free (info->style_classes, TRUE);
g_array_free (info->regions, TRUE); g_array_free (info->regions, TRUE);
g_slice_free (GtkStyleInfo, info); g_slice_free (GtkStyleInfo, info);
@ -569,8 +584,7 @@ style_info_copy (GtkStyleInfo *info)
copy->next = info; copy->next = info;
copy->junction_sides = info->junction_sides; copy->junction_sides = info->junction_sides;
copy->state_flags = info->state_flags; copy->state_flags = info->state_flags;
if (info->data) style_info_set_data (copy, info->data);
copy->data = style_data_ref (info->data);
return copy; return copy;
} }
@ -938,7 +952,9 @@ static StyleData *
style_data_lookup (GtkStyleContext *context) style_data_lookup (GtkStyleContext *context)
{ {
GtkStyleContextPrivate *priv; GtkStyleContextPrivate *priv;
GtkWidgetPath *path;
GtkStyleInfo *info; GtkStyleInfo *info;
StyleData *data;
priv = context->priv; priv = context->priv;
info = priv->info; info = priv->info;
@ -949,29 +965,26 @@ style_data_lookup (GtkStyleContext *context)
g_assert (priv->widget != NULL || priv->widget_path != NULL); g_assert (priv->widget != NULL || priv->widget_path != NULL);
info->data = g_hash_table_lookup (priv->style_data, info); data = g_hash_table_lookup (priv->style_data, info);
if (data)
if (info->data)
{ {
style_data_ref (info->data); style_info_set_data (info, data);
return data;
} }
else
{
GtkWidgetPath *path;
path = create_query_path (context); path = create_query_path (context);
info->data = style_data_new (); data = style_data_new ();
style_info_set_data (info, data);
g_hash_table_insert (priv->style_data, g_hash_table_insert (priv->style_data,
style_info_copy (info), style_info_copy (info),
style_data_ref (info->data)); data);
build_properties (context, info->data, path, info->state_flags); build_properties (context, data, path, info->state_flags);
gtk_widget_path_free (path); gtk_widget_path_free (path);
}
return info->data; return data;
} }
static void static void
@ -1016,11 +1029,7 @@ gtk_style_context_queue_invalidate_internal (GtkStyleContext *context,
if (gtk_style_context_is_saved (context)) if (gtk_style_context_is_saved (context))
{ {
if (info->data) style_info_set_data (info, NULL);
{
style_data_unref (info->data);
info->data = NULL;
}
} }
else else
{ {
@ -2888,11 +2897,7 @@ gtk_style_context_clear_cache (GtkStyleContext *context)
for (info = priv->info; info; info = info->next) for (info = priv->info; info; info = info->next)
{ {
if (info->data) style_info_set_data (info, NULL);
{
style_data_unref (info->data);
info->data = NULL;
}
} }
g_hash_table_remove_all (priv->style_data); g_hash_table_remove_all (priv->style_data);
} }
@ -2981,7 +2986,7 @@ _gtk_style_context_validate (GtkStyleContext *context,
if ((priv->relevant_changes & change) & ~GTK_STYLE_CONTEXT_CACHED_CHANGE) if ((priv->relevant_changes & change) & ~GTK_STYLE_CONTEXT_CACHED_CHANGE)
gtk_style_context_clear_cache (context); gtk_style_context_clear_cache (context);
else else
info->data = NULL; style_info_set_data (info, NULL);
if (old) if (old)
{ {