1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2024-12-04 20:07:36 +00:00

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: <https://gitlab.gnome.org/GNOME/calls/-/merge_requests/755>
This commit is contained in:
Evangelos Ribeiro Tzaras 2024-09-11 16:31:25 +02:00
parent 5eabbb2ada
commit f810e0a9b1
2 changed files with 1 additions and 15 deletions

View file

@ -494,7 +494,7 @@ dispose (GObject *object)
g_clear_object (&self->contact); g_clear_object (&self->contact);
g_clear_object (&self->action_map); 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->answered_notify_handler_id);
calls_clear_signal (self->record, &self->end_notify_handler_id); calls_clear_signal (self->record, &self->end_notify_handler_id);
g_clear_object (&self->record); g_clear_object (&self->record);

View file

@ -89,13 +89,6 @@ G_BEGIN_DECLS
CALLS_DEFINE_IFACE_GETTER_BASE(calls,iface,Calls,Iface,CALLS,IFACE,prop,rettype,errval) 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) \ #define calls_clear_signal(object,handler_id_ptr) \
if (*handler_id_ptr != 0) \ if (*handler_id_ptr != 0) \
{ \ { \
@ -103,13 +96,6 @@ G_BEGIN_DECLS
*handler_id_ptr = 0; \ *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, gboolean calls_date_time_is_same_day (GDateTime *a,
GDateTime *b); GDateTime *b);