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

Code cleanup

Browse Source 
Use g_slist_free_full more consistently. This commit just converts
the obvious cases where g_slist_forall is directly followed by
g_slist_free.
This commit is contained in:
Matthias Clasen
2015-07-31 17:57:04 -04:00
parent 9dd2645c4a
commit 9f24b54786
25 changed files with 57 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/deprecated/gtkrc.c
View File

@ -1018,11 +1018,8 @@ gtk_rc_style_finalize (GObject *object)
rc_style->rc_properties = NULL;
}
g_slist_foreach (rc_style->icon_factories, (GFunc) g_object_unref, NULL);
g_slist_free (rc_style->icon_factories);
g_slist_foreach (rc_priv->color_hashes, (GFunc) g_hash_table_unref, NULL);
g_slist_free (rc_priv->color_hashes);
g_slist_free_full (rc_style->icon_factories, g_object_unref);
g_slist_free_full (rc_priv->color_hashes, (GDestroyNotify)g_hash_table_unref);
G_OBJECT_CLASS (gtk_rc_style_parent_class)->finalize (object);
}

6
gtk/deprecated/gtkstyle.c
View File

@ -542,8 +542,7 @@ gtk_style_finalize (GObject *object)
}
}
g_slist_foreach (style->icon_factories, (GFunc) g_object_unref, NULL);
g_slist_free (style->icon_factories);
g_slist_free_full (style->icon_factories, g_object_unref);
pango_font_description_free (style->font_desc);
@ -1108,8 +1107,7 @@ gtk_style_real_copy (GtkStyle *style,
if (src->rc_style)
g_object_ref (src->rc_style);
g_slist_foreach (style->icon_factories, (GFunc) g_object_unref, NULL);
g_slist_free (style->icon_factories);
g_slist_free_full (style->icon_factories, g_object_unref);
style->icon_factories = g_slist_copy (src->icon_factories);
g_slist_foreach (style->icon_factories, (GFunc) g_object_ref, NULL);
}