From 52f7f2da6f9954f5f7cf7bedba08dbab49466e7e Mon Sep 17 00:00:00 2001
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Fri, 3 Aug 2018 11:08:55 +0200
Subject: [PATCH 1/3] Drop the CALLS_DISPOSE_OBJECT() macro

Replace it by g_clear_object() as it does the same thing.
---
 src/calls-call-data.c          | 4 ++--
 src/calls-call-display.c       | 2 +-
 src/calls-call-holder.c        | 6 +++---
 src/calls-call-selector-item.c | 2 +-
 src/calls-main-window.c        | 4 ++--
 src/calls-ofono-call.c         | 2 +-
 src/calls-ofono-object.c       | 6 +++---
 src/calls-ofono-origin.c       | 6 +++---
 src/calls-ofono-provider.c     | 4 ++--
 src/util.h                     | 8 --------
 10 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/calls-call-data.c b/src/calls-call-data.c
index 7b1bb58..08204df 100644
--- a/src/calls-call-data.c
+++ b/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);
-  CALLS_DISPOSE_OBJECT (self->party);
+  g_clear_object (&self->call);
+  g_clear_object (&self->party);
 
   parent_class->dispose (object);
 }
diff --git a/src/calls-call-display.c b/src/calls-call-display.c
index 737a882..568d8d1 100644
--- a/src/calls-call-display.c
+++ b/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);
 }
diff --git a/src/calls-call-holder.c b/src/calls-call-holder.c
index 2a49dda..56f8905 100644
--- a/src/calls-call-holder.c
+++ b/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);
-  CALLS_DISPOSE_OBJECT (self->display);
-  CALLS_DISPOSE_OBJECT (self->data);
+  g_clear_object (&self->selector_item);
+  g_clear_object (&self->display);
+  g_clear_object (&self->data);
   
   parent_class->dispose (object);
 }
diff --git a/src/calls-call-selector-item.c b/src/calls-call-selector-item.c
index 5b4fa2a..344f7b9 100644
--- a/src/calls-call-selector-item.c
+++ b/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);
 }
diff --git a/src/calls-main-window.c b/src/calls-main-window.c
index c83eb3f..2065ba1 100644
--- a/src/calls-main-window.c
+++ b/src/calls-main-window.c
@@ -688,8 +688,8 @@ dispose (GObject *object)
     remove_origins (self);
   }
 
-  CALLS_DISPOSE_OBJECT (self->call_holders);
-  CALLS_DISPOSE_OBJECT (self->provider);
+  g_clear_object (&self->call_holders);
+  g_clear_object (&self->provider);
 
   parent_class->dispose (object);
 }
diff --git a/src/calls-ofono-call.c b/src/calls-ofono-call.c
index cd8b13e..abbde92 100644
--- a/src/calls-ofono-call.c
+++ b/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);
 }
diff --git a/src/calls-ofono-object.c b/src/calls-ofono-object.c
index 2cf715b..3476f3e 100644
--- a/src/calls-ofono-object.c
+++ b/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);
-  CALLS_DISPOSE_OBJECT (self->display);
-  CALLS_DISPOSE_OBJECT (self->data);
+  g_clear_object (&self->selector_item);
+  g_clear_object (&self->display);
+  g_clear_object (&self->data);
   
   parent_class->dispose (object);
 }
diff --git a/src/calls-ofono-origin.c b/src/calls-ofono-origin.c
index 791f229..a1ae7f1 100644
--- a/src/calls-ofono-origin.c
+++ b/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);
-  CALLS_DISPOSE_OBJECT (self->connection);
+  g_clear_object (&self->modem);
+  g_clear_object (&self->connection);
 
   parent_class->dispose (object);
 }
diff --git a/src/calls-ofono-provider.c b/src/calls-ofono-provider.c
index 2f96a04..61f1d5b 100644
--- a/src/calls-ofono-provider.c
+++ b/src/calls-ofono-provider.c
@@ -442,8 +442,8 @@ dispose (GObject *object)
 
   // FIXME
 
-  CALLS_DISPOSE_OBJECT (self->manager);
-  CALLS_DISPOSE_OBJECT (self->connection);
+  g_clear_object (&self->manager);
+  g_clear_object (&self->connection);
 
   parent_class->dispose (object);
 }
diff --git a/src/util.h b/src/util.h
index 02511a1..98870ee 100644
--- a/src/util.h
+++ b/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)                                          \
     {                                                   \

From 3ebf58548cc505b39caae3b780e9ab930c2b0e07 Mon Sep 17 00:00:00 2001
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Fri, 3 Aug 2018 11:14:46 +0200
Subject: [PATCH 2/3] Drop the CALLS_FREE_PTR_PROPERTY() macro

Replace it by g_free() as it does the same thing.
---
 src/calls-ofono-call.c   | 6 +++---
 src/calls-ofono-origin.c | 2 +-
 src/util.h               | 8 +-------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/calls-ofono-call.c b/src/calls-ofono-call.c
index abbde92..d70ecc5 100644
--- a/src/calls-ofono-call.c
+++ b/src/calls-ofono-call.c
@@ -303,9 +303,9 @@ finalize (GObject *object)
   GObjectClass *parent_class = g_type_class_peek (G_TYPE_OBJECT);
   CallsOfonoCall *self = CALLS_OFONO_CALL (object);
 
-  CALLS_FREE_PTR_PROPERTY (self->disconnect_reason);
-  CALLS_FREE_PTR_PROPERTY (self->name);
-  CALLS_FREE_PTR_PROPERTY (self->number);
+  g_free (self->disconnect_reason);
+  g_free (self->name);
+  g_free (self->number);
 
   parent_class->finalize (object);
 }
diff --git a/src/calls-ofono-origin.c b/src/calls-ofono-origin.c
index a1ae7f1..3b63d92 100644
--- a/src/calls-ofono-origin.c
+++ b/src/calls-ofono-origin.c
@@ -506,7 +506,7 @@ finalize (GObject *object)
     {
       g_string_free (self->tone_queue, TRUE);
     }
-  CALLS_FREE_PTR_PROPERTY (self->name);
+  g_free (self->name);
 
   parent_class->finalize (object);
 }
diff --git a/src/util.h b/src/util.h
index 98870ee..5cfbff6 100644
--- a/src/util.h
+++ b/src/util.h
@@ -80,14 +80,8 @@ G_BEGIN_DECLS
   g_object_ref (G_OBJECT (obj_ptr));
   
 
-#define CALLS_FREE_PTR_PROPERTY(ptr)            \
-  if (ptr)                                      \
-    {                                           \
-      g_free (ptr);                             \
-    }                                           \
-
 #define CALLS_SET_PTR_PROPERTY(ptr,new_value)   \
-  CALLS_FREE_PTR_PROPERTY (ptr)                 \
+  g_free (ptr);                                 \
   ptr = new_value;
 
 

From 90f3933e95fdb1b366b6069b76b1190ac6969466 Mon Sep 17 00:00:00 2001
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Fri, 3 Aug 2018 11:23:44 +0200
Subject: [PATCH 3/3] Drop the CALLS_SET_OBJECT_PROPERTY() macro

Replace it by g_set_object() as it does the same thing.
---
 src/calls-call-data.c          | 4 ++--
 src/calls-call-selector-item.c | 2 +-
 src/calls-ofono-call.c         | 4 ++--
 src/calls-ofono-origin.c       | 4 ++--
 src/calls-ofono-provider.c     | 4 ++--
 src/util.h                     | 9 ---------
 6 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/calls-call-data.c b/src/calls-call-data.c
index 08204df..5182a46 100644
--- a/src/calls-call-data.c
+++ b/src/calls-call-data.c
@@ -72,11 +72,11 @@ set_property (GObject      *object,
 
   switch (property_id) {
   case PROP_CALL:
-    CALLS_SET_OBJECT_PROPERTY (self->call, CALLS_CALL (g_value_get_object (value)));
+    g_set_object (&self->call, CALLS_CALL (g_value_get_object (value)));
     break;
 
   case PROP_PARTY:
-    CALLS_SET_OBJECT_PROPERTY (self->party, CALLS_PARTY (g_value_get_object (value)));
+    g_set_object (&self->party, CALLS_PARTY (g_value_get_object (value)));
     break;
 
   default:
diff --git a/src/calls-call-selector-item.c b/src/calls-call-selector-item.c
index 344f7b9..7560e53 100644
--- a/src/calls-call-selector-item.c
+++ b/src/calls-call-selector-item.c
@@ -140,7 +140,7 @@ static void
 set_call_holder (CallsCallSelectorItem *self, CallsCallHolder *holder)
 {
   set_call_data (self, calls_call_holder_get_data (holder));
-  CALLS_SET_OBJECT_PROPERTY (self->holder, holder);
+  g_set_object (&self->holder, holder);
 }
 
 
diff --git a/src/calls-ofono-call.c b/src/calls-ofono-call.c
index d70ecc5..d85ae6d 100644
--- a/src/calls-ofono-call.c
+++ b/src/calls-ofono-call.c
@@ -199,8 +199,8 @@ set_property (GObject      *object,
 
   switch (property_id) {
   case PROP_VOICE_CALL:
-    CALLS_SET_OBJECT_PROPERTY
-      (self->voice_call, GDBO_VOICE_CALL (g_value_get_object (value)));
+    g_set_object
+      (&self->voice_call, GDBO_VOICE_CALL (g_value_get_object (value)));
     break;
 
   case PROP_PROPERTIES:
diff --git a/src/calls-ofono-origin.c b/src/calls-ofono-origin.c
index 3b63d92..619a196 100644
--- a/src/calls-ofono-origin.c
+++ b/src/calls-ofono-origin.c
@@ -134,8 +134,8 @@ set_property (GObject      *object,
 
   switch (property_id) {
   case PROP_MODEM:
-    CALLS_SET_OBJECT_PROPERTY
-      (self->modem, GDBO_MODEM (g_value_get_object (value)));
+    g_set_object
+      (&self->modem, GDBO_MODEM (g_value_get_object (value)));
     break;
 
   default:
diff --git a/src/calls-ofono-provider.c b/src/calls-ofono-provider.c
index 61f1d5b..6971b4b 100644
--- a/src/calls-ofono-provider.c
+++ b/src/calls-ofono-provider.c
@@ -111,8 +111,8 @@ set_property (GObject      *object,
 
   switch (property_id) {
   case PROP_CONNECTION:
-    CALLS_SET_OBJECT_PROPERTY (self->connection,
-                               g_value_get_object (value));
+    g_set_object (&self->connection,
+                  g_value_get_object (value));
     break;
 
   default:
diff --git a/src/util.h b/src/util.h
index 5cfbff6..8796d63 100644
--- a/src/util.h
+++ b/src/util.h
@@ -71,15 +71,6 @@ G_BEGIN_DECLS
 
 
 
-#define CALLS_SET_OBJECT_PROPERTY(obj_ptr,new_value)    \
-  if (obj_ptr)                                          \
-    {                                                   \
-      g_object_unref (G_OBJECT (obj_ptr));              \
-    }                                                   \
-  obj_ptr = new_value;                                  \
-  g_object_ref (G_OBJECT (obj_ptr));
-  
-
 #define CALLS_SET_PTR_PROPERTY(ptr,new_value)   \
   g_free (ptr);                                 \
   ptr = new_value;