more use of g_clear_object() where appropriate

1 files changed, 21 insertions, 28 deletions

diff --git a/src/datetime-prefs.c b/src/datetime-prefs.c
index 9fdfbed..50445ff 100644
--- a/src/datetime-prefs.c
+++ b/src/datetime-prefs.c
@@ -776,46 +776,39 @@ static void
 indicator_datetime_panel_dispose (GObject * object)
 {
   IndicatorDatetimePanel * self = (IndicatorDatetimePanel *) object;
+  IndicatorDatetimePanelPrivate * priv = self->priv;
 
-  if (self->priv->builder) {
-    g_object_unref (self->priv->builder);
-    self->priv->builder = NULL;
-  }
-
-  if (self->priv->proxy) {
-    g_object_unref (self->priv->proxy);
-    self->priv->proxy = NULL;
-  }
+  g_clear_object (&priv->builder);
+  g_clear_object (&priv->proxy);
 
-  if (self->priv->loc_dlg) {
-    gtk_widget_destroy (self->priv->loc_dlg);
-    self->priv->loc_dlg = NULL;
+  if (priv->loc_dlg) {
+    gtk_widget_destroy (priv->loc_dlg);
+    priv->loc_dlg = NULL;
   }
 
-  if (self->priv->save_time_id) {
-    g_source_remove (self->priv->save_time_id);
-    self->priv->save_time_id = 0;
+  if (priv->save_time_id) {
+    g_source_remove (priv->save_time_id);
+    priv->save_time_id = 0;
   }
 
-  if (self->priv->completion) {
-    cc_timezone_completion_watch_entry (self->priv->completion, NULL);
-    g_object_unref (self->priv->completion);
-    self->priv->completion = NULL;
+  if (priv->completion) {
+    cc_timezone_completion_watch_entry (priv->completion, NULL);
+    g_clear_object (&priv->completion);
   }
 
-  if (self->priv->tz_entry) {
-    gtk_widget_destroy (self->priv->tz_entry);
-    self->priv->tz_entry = NULL;
+  if (priv->tz_entry) {
+    gtk_widget_destroy (priv->tz_entry);
+    priv->tz_entry = NULL;
   }
 
-  if (self->priv->time_spin) {
-    gtk_widget_destroy (self->priv->time_spin);
-    self->priv->time_spin = NULL;
+  if (priv->time_spin) {
+    gtk_widget_destroy (priv->time_spin);
+    priv->time_spin = NULL;
   }
 
-  if (self->priv->date_spin) {
-    gtk_widget_destroy (self->priv->date_spin);
-    self->priv->date_spin = NULL;
+  if (priv->date_spin) {
+    gtk_widget_destroy (priv->date_spin);
+    priv->date_spin = NULL;
   }
 }