[gtk/wip/baedert/for-master] fontbutton: Shorted clear_font_data a bit
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/baedert/for-master] fontbutton: Shorted clear_font_data a bit
- Date: Fri, 13 Sep 2019 12:49:15 +0000 (UTC)
commit 56ed5080947ae5df530fb6dee258d47baf5b28dc
Author: Timm Bäder <mail baedert org>
Date: Fri Sep 13 14:28:48 2019 +0200
fontbutton: Shorted clear_font_data a bit
gtk/gtkfontbutton.c | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 72d71a7fb8..79ac0c31ed 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -190,23 +190,11 @@ clear_font_data (GtkFontButton *font_button)
{
GtkFontButtonPrivate *priv = gtk_font_button_get_instance_private (font_button);
- if (priv->font_family)
- g_object_unref (priv->font_family);
- priv->font_family = NULL;
-
- if (priv->font_face)
- g_object_unref (priv->font_face);
- priv->font_face = NULL;
-
- if (priv->font_desc)
- pango_font_description_free (priv->font_desc);
- priv->font_desc = NULL;
-
- g_free (priv->fontname);
- priv->fontname = NULL;
-
- g_free (priv->font_features);
- priv->font_features = NULL;
+ g_clear_object (&priv->font_family);
+ g_clear_object (&priv->font_face);
+ g_clear_pointer (&priv->font_desc, pango_font_description_free);
+ g_clear_pointer (&priv->fontname, g_free);
+ g_clear_pointer (&priv->font_features, g_free);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]