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] 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;