Drop the CALLS_DISPOSE_OBJECT() macro

Replace it by g_clear_object() as it does the same thing.

src/calls-call-data.c

@@ -116,8 +116,8 @@ dispose (GObject *object)
   GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsCallData *self = CALLS_CALL_DATA (object);
 
-  CALLS_DISPOSE_OBJECT (self->call);
+  g_clear_object (&self->call);
-  CALLS_DISPOSE_OBJECT (self->party);
+  g_clear_object (&self->party);
 
   parent_class->dispose (object);
 }

src/calls-call-display.c

@@ -279,7 +279,7 @@ dispose (GObject *object)
   GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_BOX);
   CallsCallDisplay *self = CALLS_CALL_DISPLAY (object);
 
-  CALLS_DISPOSE_OBJECT (self->call);
+  g_clear_object (&self->call);
 
   parent_class->dispose (object);
 }

src/calls-call-holder.c

@@ -134,9 +134,9 @@ dispose (GObject *object)
   GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsCallHolder *self = CALLS_CALL_HOLDER (object);
 
-  CALLS_DISPOSE_OBJECT (self->selector_item);
+  g_clear_object (&self->selector_item);
-  CALLS_DISPOSE_OBJECT (self->display);
+  g_clear_object (&self->display);
-  CALLS_DISPOSE_OBJECT (self->data);
+  g_clear_object (&self->data);
   
   parent_class->dispose (object);
 }

src/calls-call-selector-item.c

@@ -191,7 +191,7 @@ dispose (GObject *object)
   GObjectClass *parent_class = g_type_class_peek (GTK_TYPE_EVENT_BOX);
   CallsCallSelectorItem *self = CALLS_CALL_SELECTOR_ITEM (object);
 
-  CALLS_DISPOSE_OBJECT (self->holder);
+  g_clear_object (&self->holder);
 
   parent_class->dispose (object);
 }

src/calls-main-window.c

@@ -688,8 +688,8 @@ dispose (GObject *object)
     remove_origins (self);
   }
 
-  CALLS_DISPOSE_OBJECT (self->call_holders);
+  g_clear_object (&self->call_holders);
-  CALLS_DISPOSE_OBJECT (self->provider);
+  g_clear_object (&self->provider);
 
   parent_class->dispose (object);
 }

src/calls-ofono-call.c

@@ -291,7 +291,7 @@ dispose (GObject *object)
   GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsOfonoCall *self = CALLS_OFONO_CALL (object);
 
-  CALLS_DISPOSE_OBJECT (self->voice_call);
+  g_clear_object (&self->voice_call);
 
   parent_class->dispose (object);
 }

src/calls-ofono-object.c

@@ -130,9 +130,9 @@ dispose (GObject *object)
   GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsOfonoObject *self = CALLS_OFONO_OBJECT (object);
 
-  CALLS_DISPOSE_OBJECT (self->selector_item);
+  g_clear_object (&self->selector_item);
-  CALLS_DISPOSE_OBJECT (self->display);
+  g_clear_object (&self->display);
-  CALLS_DISPOSE_OBJECT (self->data);
+  g_clear_object (&self->data);
   
   parent_class->dispose (object);
 }

src/calls-ofono-origin.c

@@ -476,7 +476,7 @@ constructed (GObject *object)
      (GAsyncReadyCallback)voice_new_cb,
      self);
 
-  CALLS_DISPOSE_OBJECT (self->modem);
+  g_clear_object (&self->modem);
      
   parent_class->constructed (object);
 }
@@ -489,8 +489,8 @@ dispose (GObject *object)
   CallsOfonoOrigin *self = CALLS_OFONO_ORIGIN (object);
 
   remove_calls (self, NULL);
-  CALLS_DISPOSE_OBJECT (self->modem);
+  g_clear_object (&self->modem);
-  CALLS_DISPOSE_OBJECT (self->connection);
+  g_clear_object (&self->connection);
 
   parent_class->dispose (object);
 }

src/calls-ofono-provider.c

@@ -442,8 +442,8 @@ dispose (GObject *object)
 
   // FIXME
 
-  CALLS_DISPOSE_OBJECT (self->manager);
+  g_clear_object (&self->manager);
-  CALLS_DISPOSE_OBJECT (self->connection);
+  g_clear_object (&self->connection);
 
   parent_class->dispose (object);
 }

src/util.h

@@ -71,14 +71,6 @@ G_BEGIN_DECLS
 
 
 
-#define CALLS_DISPOSE_OBJECT(obj_ptr)           \
-  if (obj_ptr)                                  \
-    {                                           \
-      g_object_unref (G_OBJECT (obj_ptr));      \
-      obj_ptr = NULL;                           \
-    }
-
-
 #define CALLS_SET_OBJECT_PROPERTY(obj_ptr,new_value)    \
   if (obj_ptr)                                          \
     {                                                   \