From 0c1636b7aafdb04a1aa5817610916cb52f830067 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Tue, 10 Mar 2026 20:45:35 -0300 Subject: [PATCH] gui/multi-choice: Use g_clear_pointer more Just a cosmetic improvement. Part-of: --- src/gui/event-editor/gcal-multi-choice.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/gui/event-editor/gcal-multi-choice.c b/src/gui/event-editor/gcal-multi-choice.c index f3e98246..3bf72afc 100644 --- a/src/gui/event-editor/gcal-multi-choice.c +++ b/src/gui/event-editor/gcal-multi-choice.c @@ -367,18 +367,12 @@ gcal_multi_choice_dispose (GObject *object) { GcalMultiChoice *self = GCAL_MULTI_CHOICE (object); - g_free (self->choices); - self->choices = NULL; - + g_clear_pointer (&self->choices, g_free); g_clear_pointer (&self->category, g_free); g_clear_pointer (&self->prev_button_tooltip_text, g_free); g_clear_pointer (&self->next_button_tooltip_text, g_free); - if (self->format_destroy) - { - self->format_destroy (self->format_data); - self->format_destroy = NULL; - } + g_clear_pointer (&self->format_data, self->format_destroy); if (self->popover) { @@ -388,8 +382,7 @@ gcal_multi_choice_dispose (GObject *object) g_signal_handlers_disconnect_by_func (self->popover, popover_destroy_cb, object); - gtk_widget_unparent (self->popover); - self->popover = NULL; + g_clear_pointer (&self->popover, gtk_widget_unparent); } G_OBJECT_CLASS (gcal_multi_choice_parent_class)->dispose (object);