[gnome-font-viewer] Use g_clear_* helpers to release memory

[Cosimo Cecchi <cosimoc src gnome org>]

commit 5698a889db240c9e9eef3545be029f327e8c0c59
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sat Jul 6 05:56:27 2019 -0700

    Use g_clear_* helpers to release memory
    
    Simplify memory management a bit.

 src/font-model.c | 33 ++++++++-------------------------
 src/font-view.c  | 11 ++---------
 2 files changed, 10 insertions(+), 34 deletions(-)
---
diff --git a/src/font-model.c b/src/font-model.c
index 2d56125..0ed0739 100644
--- a/src/font-model.c
+++ b/src/font-model.c
@@ -488,10 +488,8 @@ ensure_font_list (FontViewModel *self)
     if (!FcInitReinitialize())
         return;
 
-    if (self->priv->cancellable) {
-        g_cancellable_cancel (self->priv->cancellable);
-        g_clear_object (&self->priv->cancellable);
-    }
+    g_cancellable_cancel (self->priv->cancellable);
+    g_clear_object (&self->priv->cancellable);
 
     gtk_list_store_clear (GTK_LIST_STORE (self));
 
@@ -500,10 +498,7 @@ ensure_font_list (FontViewModel *self)
 
     g_mutex_lock (&self->priv->font_list_mutex);
 
-    if (self->priv->font_list) {
-        FcFontSetDestroy (self->priv->font_list);
-        self->priv->font_list = NULL;
-    }
+    g_clear_pointer (&self->priv->font_list, FcFontSetDestroy);
 
     FcPatternAddBool (pat, FC_SCALABLE, FcTrue);
     self->priv->font_list = FcFontList (NULL, pat, os);
@@ -613,25 +608,13 @@ font_view_model_finalize (GObject *obj)
     FontViewModel *self = FONT_VIEW_MODEL (obj);
     GtkSettings *settings;
 
-    if (self->priv->cancellable) {
-        g_cancellable_cancel (self->priv->cancellable);
-        g_clear_object (&self->priv->cancellable);
-    }
+    g_cancellable_cancel (self->priv->cancellable);
+    g_clear_object (&self->priv->cancellable);
 
-    if (self->priv->font_list) {
-        FcFontSetDestroy (self->priv->font_list);
-        self->priv->font_list = NULL;
-    }
+    g_clear_pointer (&self->priv->font_list, FcFontSetDestroy);
+    g_clear_pointer (&self->priv->library, FT_Done_FreeType);
 
-    if (self->priv->library != NULL) {
-        FT_Done_FreeType (self->priv->library);
-        self->priv->library = NULL;
-    }
-
-    if (self->priv->font_list_idle_id != 0) {
-        g_source_remove (self->priv->font_list_idle_id);
-        self->priv->font_list_idle_id = 0;
-    }
+    g_clear_handle_id (&self->priv->font_list_idle_id, g_source_remove);
 
     if (self->priv->fontconfig_update_id != 0) {
         settings = gtk_settings_get_default ();
diff --git a/src/font-view.c b/src/font-view.c
index 2425de1..b8c2063 100644
--- a/src/font-view.c
+++ b/src/font-view.c
@@ -1006,15 +1006,8 @@ font_view_application_do_overview (FontViewApplication *self)
 {
     g_clear_object (&self->font_file);
 
-    if (self->back_button) {
-        gtk_widget_destroy (self->back_button);
-        self->back_button = NULL;
-    }
-
-    if (self->info_button) {
-        gtk_widget_destroy (self->info_button);
-        self->info_button = NULL;
-    }
+    g_clear_pointer (&self->back_button, gtk_widget_destroy);
+    g_clear_pointer (&self->info_button, gtk_widget_destroy);
 
     if (self->install_button) {
         g_clear_pointer (&self->install_label, gtk_widget_destroy);