From f810e0a9b1962a3a9f626c43ce40d1d4f81a9727 Mon Sep 17 00:00:00 2001 From: Evangelos Ribeiro Tzaras Date: Wed, 11 Sep 2024 16:31:25 +0200 Subject: [PATCH] tree: Remove custom clearing macros The macros was emulating g_clear_handle_id() and friends let's use the glib functions directly instead. Part-of: --- src/calls-call-record-row.c | 2 +- src/calls-util.h | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/calls-call-record-row.c b/src/calls-call-record-row.c index 57f69c1..dfbc305 100644 --- a/src/calls-call-record-row.c +++ b/src/calls-call-record-row.c @@ -494,7 +494,7 @@ dispose (GObject *object) g_clear_object (&self->contact); g_clear_object (&self->action_map); - calls_clear_source (&self->date_change_timeout); + g_clear_handle_id (&self->date_change_timeout, g_source_remove); calls_clear_signal (self->record, &self->answered_notify_handler_id); calls_clear_signal (self->record, &self->end_notify_handler_id); g_clear_object (&self->record); diff --git a/src/calls-util.h b/src/calls-util.h index 9a7e284..9331ada 100644 --- a/src/calls-util.h +++ b/src/calls-util.h @@ -89,13 +89,6 @@ G_BEGIN_DECLS CALLS_DEFINE_IFACE_GETTER_BASE(calls,iface,Calls,Iface,CALLS,IFACE,prop,rettype,errval) -#define calls_clear_source(source_id_ptr) \ - if (*source_id_ptr != 0) \ - { \ - g_source_remove (*source_id_ptr); \ - *source_id_ptr = 0; \ - } - #define calls_clear_signal(object,handler_id_ptr) \ if (*handler_id_ptr != 0) \ { \ @@ -103,13 +96,6 @@ G_BEGIN_DECLS *handler_id_ptr = 0; \ } -#define calls_date_time_unref(date_time) \ - if (date_time) \ - { \ - g_date_time_unref (date_time); \ - } - - gboolean calls_date_time_is_same_day (GDateTime *a, GDateTime *b);