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

GtkLabel: Use g_clear_object

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=765496
This commit is contained in:
Timm Bäder
2016-04-24 10:46:03 +02:00
committed by Matthias Clasen
parent be5a105f2e
commit 1951642c0e
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtklabel.c
View File

@@ -3288,14 +3288,9 @@ gtk_label_finalize (GObject *object)
g_free (priv->label);
g_free (priv->text);
if (priv->layout)
g_object_unref (priv->layout);
if (priv->attrs)
pango_attr_list_unref (priv->attrs);
if (priv->markup_attrs)
pango_attr_list_unref (priv->markup_attrs);
g_clear_object (&priv->layout);
g_clear_pointer (&priv->attrs, pango_attr_list_unref);
g_clear_pointer (&priv->markup_attrs, pango_attr_list_unref);
if (priv->select_info)
{
@@ -3314,13 +3309,7 @@ gtk_label_finalize (GObject *object)
static void
gtk_label_clear_layout (GtkLabel *label)
{
GtkLabelPrivate *priv = label->priv;
if (priv->layout)
{
g_object_unref (priv->layout);
priv->layout = NULL;
}
g_clear_object (&label->priv->layout);
}
/**