diff options
| author | Timm Bäder <mail@baedert.org> | 2016-04-24 10:46:03 +0200 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2016-05-05 15:03:58 -0400 |
| commit | 021d065a1f62826d9c124dc71b22e48f781719d8 (patch) | |
| tree | 5b909eea5fa7954ec268d99c16ef3473d2019a78 | |
| parent | db17324d825ed1a762f6ab2675ad287b994119b6 (diff) | |
| download | gtk+-021d065a1f62826d9c124dc71b22e48f781719d8.tar.gz | |
GtkLabel: Use g_clear_object
https://bugzilla.gnome.org/show_bug.cgi?id=765496
| -rw-r--r-- | gtk/gtklabel.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index caf031c46d..6464157229 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -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); } /** |