printers: Use g_clear_object

5 files changed, 25 insertions, 56 deletions

diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
index 73645751e..eb3f06bf4 100644
--- a/panels/printers/cc-printers-panel.c
+++ b/panels/printers/cc-printers-panel.c
@@ -615,10 +615,7 @@ detach_from_cups_notifier (gpointer data)
     self->subscription_renewal_id = 0;
   }
 
-  if (self->cups_proxy != NULL) {
-    g_object_unref (self->cups_proxy);
-    self->cups_proxy = NULL;
-  }
+  g_clear_object (&self->cups_proxy);
 }
 
 static void
diff --git a/panels/printers/pp-ipp-option-widget.c b/panels/printers/pp-ipp-option-widget.c
index d9c79d3b7..ae24d71e9 100644
--- a/panels/printers/pp-ipp-option-widget.c
+++ b/panels/printers/pp-ipp-option-widget.c
@@ -280,11 +280,8 @@ switch_changed_cb (PpIPPOptionWidget *self)
   else
     values[0] = g_strdup ("False");
 
-  if (self->cancellable)
-    {
-      g_cancellable_cancel (self->cancellable);
-      g_object_unref (self->cancellable);
-    }
+  g_cancellable_cancel (self->cancellable);
+  g_clear_object (&self->cancellable);
 
   self->cancellable = g_cancellable_new ();
   printer_add_option_async (self->printer_name,
@@ -306,11 +303,8 @@ combo_changed_cb (PpIPPOptionWidget *self)
   values = g_new0 (gchar *, 2);
   values[0] = combo_box_get (self->combo);
 
-  if (self->cancellable)
-    {
-      g_cancellable_cancel (self->cancellable);
-      g_object_unref (self->cancellable);
-    }
+  g_cancellable_cancel (self->cancellable);
+  g_clear_object (&self->cancellable);
 
   self->cancellable = g_cancellable_new ();
   printer_add_option_async (self->printer_name,
@@ -332,11 +326,8 @@ spin_button_changed_cb (PpIPPOptionWidget *self)
   values = g_new0 (gchar *, 2);
   values[0] = g_strdup_printf ("%d", gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (self->spin_button)));
 
-  if (self->cancellable)
-    {
-      g_cancellable_cancel (self->cancellable);
-      g_object_unref (self->cancellable);
-    }
+  g_cancellable_cancel (self->cancellable);
+  g_clear_object (&self->cancellable);
 
   self->cancellable = g_cancellable_new ();
   printer_add_option_async (self->printer_name,
diff --git a/panels/printers/pp-ppd-option-widget.c b/panels/printers/pp-ppd-option-widget.c
index 56862ad62..74f425bcc 100644
--- a/panels/printers/pp-ppd-option-widget.c
+++ b/panels/printers/pp-ppd-option-widget.c
@@ -339,11 +339,8 @@ switch_changed_cb (PpPPDOptionWidget *self)
   else
     values[0] = g_strdup ("False");
 
-  if (self->cancellable)
-    {
-      g_cancellable_cancel (self->cancellable);
-      g_object_unref (self->cancellable);
-    }
+  g_cancellable_cancel (self->cancellable);
+  g_clear_object (&self->cancellable);
 
   self->cancellable = g_cancellable_new ();
   printer_add_option_async (self->printer_name,
@@ -365,11 +362,8 @@ combo_changed_cb (PpPPDOptionWidget *self)
   values = g_new0 (gchar *, 2);
   values[0] = combo_box_get (self->combo);
 
-  if (self->cancellable)
-    {
-      g_cancellable_cancel (self->cancellable);
-      g_object_unref (self->cancellable);
-    }
+  g_cancellable_cancel (self->cancellable);
+  g_clear_object (&self->cancellable);
 
   self->cancellable = g_cancellable_new ();
   printer_add_option_async (self->printer_name,
diff --git a/panels/printers/pp-ppd-selection-dialog.c b/panels/printers/pp-ppd-selection-dialog.c
index c94a7c3b4..87782908c 100644
--- a/panels/printers/pp-ppd-selection-dialog.c
+++ b/panels/printers/pp-ppd-selection-dialog.c
@@ -375,7 +375,7 @@ pp_ppd_selection_dialog_free (PpPPDSelectionDialog *self)
 {
   gtk_widget_destroy (GTK_WIDGET (self->dialog));
 
-  g_object_unref (self->builder);
+  g_clear_object (&self->builder);
 
   g_free (self->ppd_name);
 
diff --git a/panels/printers/pp-utils.c b/panels/printers/pp-utils.c
index 03e40d24d..ce3e4344e 100644
--- a/panels/printers/pp-utils.c
+++ b/panels/printers/pp-utils.c
@@ -1452,8 +1452,7 @@ printer_set_ppd_async_dbus_cb (GObject      *source_object,
                     result,
                     data->user_data);
 
-  if (data->cancellable)
-    g_object_unref (data->cancellable);
+  g_clear_object (&data->cancellable);
 
   if (data->ppd_copy)
     {
@@ -1523,8 +1522,7 @@ printer_set_ppd_async (const gchar  *printer_name,
 out:
   callback (g_strdup (printer_name), FALSE, user_data);
 
-  if (data->cancellable)
-    g_object_unref (data->cancellable);
+  g_clear_object (&data->cancellable);
   g_free (data->printer_name);
   g_free (data);
 }
@@ -1580,8 +1578,7 @@ printer_set_ppd_file_async_scb (GObject      *source_object,
 out:
   data->callback (g_strdup (data->printer_name), FALSE, data->user_data);
 
-  if (data->cancellable)
-    g_object_unref (data->cancellable);
+  g_clear_object (&data->cancellable);
   g_free (data->printer_name);
   g_free (data->ppd_copy);
   g_free (data);
@@ -1642,8 +1639,7 @@ printer_set_ppd_file_async (const gchar  *printer_name,
 out:
   callback (g_strdup (printer_name), FALSE, user_data);
 
-  if (data->cancellable)
-    g_object_unref (data->cancellable);
+  g_clear_object (&data->cancellable);
   g_free (data->printer_name);
   g_free (data);
 }
@@ -1841,8 +1837,7 @@ out:
                   g_cancellable_is_cancelled (data->cancellable),
                   data->user_data);
 
-  if (data->cancellable)
-    g_object_unref (data->cancellable);
+  g_clear_object (&data->cancellable);
   g_free (data->printer_name);
   g_free (data);
 }
@@ -1954,8 +1949,7 @@ get_ppd_names_async_dbus_scb (GObject      *source_object,
                       g_cancellable_is_cancelled (data->cancellable),
                       data->user_data);
 
-      if (data->cancellable)
-        g_object_unref (data->cancellable);
+      g_clear_object (&data->cancellable);
       g_free (data->printer_name);
       g_free (data);
     }
@@ -2008,8 +2002,7 @@ out:
                   g_cancellable_is_cancelled (data->cancellable),
                   data->user_data);
 
-  if (data->cancellable)
-    g_object_unref (data->cancellable);
+  g_clear_object (&data->cancellable);
   g_free (data->printer_name);
   g_free (data);
 }
@@ -2228,8 +2221,7 @@ get_device_attributes_async_dbus_cb (GObject      *source_object,
                   data->device_uri,
                   data->user_data);
 
-  if (data->cancellable)
-    g_object_unref (data->cancellable);
+  g_clear_object (&data->cancellable);
   g_free (data->device_uri);
   g_free (data->printer_name);
   g_free (data);
@@ -2299,8 +2291,7 @@ get_device_attributes_async_scb (GHashTable *result,
 out:
   data->callback (NULL, NULL, NULL, data->user_data);
 
-  if (data->cancellable)
-    g_object_unref (data->cancellable);
+  g_clear_object (&data->cancellable);
   g_free (data->device_uri);
   g_free (data->printer_name);
   g_free (data);
@@ -2413,8 +2404,7 @@ get_all_ppds_data_free (gpointer user_data)
 
   if (data->context)
     g_main_context_unref (data->context);
-  if (data->cancellable)
-    g_object_unref (data->cancellable);
+  g_clear_object (&data->cancellable);
   g_free (data);
 }
 
@@ -3105,8 +3095,7 @@ printer_add_option_async_dbus_cb (GObject      *source_object,
   if (!g_cancellable_is_cancelled (data->cancellable))
     data->callback (success, data->user_data);
 
-  if (data->cancellable)
-    g_object_unref (data->cancellable);
+  g_clear_object (&data->cancellable);
   g_free (data);
 }
 
@@ -3290,8 +3279,7 @@ get_cups_devices_async_dbus_cb (GObject      *source_object,
       g_list_free_full (data->backend_list, g_free);
       data->backend_list = NULL;
       g_object_unref (source_object);
-      if (data->cancellable)
-        g_object_unref (data->cancellable);
+      g_clear_object (&data->cancellable);
       g_free (data);
 
       return;
@@ -3369,8 +3357,7 @@ get_cups_devices_async_dbus_cb (GObject      *source_object,
     }
 
   g_object_unref (source_object);
-  if (data->cancellable)
-    g_object_unref (data->cancellable);
+  g_clear_object (&data->cancellable);
   g_free (data);
 }