From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Sat, 7 Jan 2023 14:10:54 +0000 (-0500)
Subject: gtkfilesystemmodel: Use g_clear_* helpers
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~8^2~87^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b2f43076bd85143e4000625fd8720cb244db80ed;p=gtk4.git

gtkfilesystemmodel: Use g_clear_* helpers

Saves some code.
---

diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index 5fca8c8e95..5005a4c5bf 100644
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -468,11 +468,10 @@ remove_file (GtkFileSystemModel *model,
   node_invalidate_index (model, id);
 
   g_hash_table_remove (model->file_lookup, file);
-  g_object_unref (node->file);
+  g_clear_object (&node->file);
   adjust_file_lookup (model, id, -1);
 
-  if (node->info)
-    g_object_unref (node->info);
+  g_clear_object (&node->info);
 
   g_array_remove_index (model->files, id);
 
@@ -484,11 +483,7 @@ gtk_file_system_model_dispose (GObject *object)
 {
   GtkFileSystemModel *model = GTK_FILE_SYSTEM_MODEL (object);
 
-  if (model->dir_thaw_source)
-    {
-      g_source_remove (model->dir_thaw_source);
-      model->dir_thaw_source = 0;
-    }
+  g_clear_handle_id (&model->dir_thaw_source, g_source_remove);
 
   g_cancellable_cancel (model->cancellable);
   if (model->dir_monitor)
@@ -635,8 +630,7 @@ gtk_file_system_model_got_files (GObject      *object,
                                          NULL);
           if (model->dir_thaw_source != 0)
             {
-              g_source_remove (model->dir_thaw_source);
-              model->dir_thaw_source = 0;
+              g_clear_handle_id (&model->dir_thaw_source, g_source_remove);
               thaw_updates (model);
             }