gui/multi-choice: Use g_clear_pointer more
Just a cosmetic improvement. Part-of: <https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/721>
This commit is contained in:
@@ -367,18 +367,12 @@ gcal_multi_choice_dispose (GObject *object)
|
|||||||
{
|
{
|
||||||
GcalMultiChoice *self = GCAL_MULTI_CHOICE (object);
|
GcalMultiChoice *self = GCAL_MULTI_CHOICE (object);
|
||||||
|
|
||||||
g_free (self->choices);
|
g_clear_pointer (&self->choices, g_free);
|
||||||
self->choices = NULL;
|
|
||||||
|
|
||||||
g_clear_pointer (&self->category, g_free);
|
g_clear_pointer (&self->category, g_free);
|
||||||
g_clear_pointer (&self->prev_button_tooltip_text, g_free);
|
g_clear_pointer (&self->prev_button_tooltip_text, g_free);
|
||||||
g_clear_pointer (&self->next_button_tooltip_text, g_free);
|
g_clear_pointer (&self->next_button_tooltip_text, g_free);
|
||||||
|
|
||||||
if (self->format_destroy)
|
g_clear_pointer (&self->format_data, self->format_destroy);
|
||||||
{
|
|
||||||
self->format_destroy (self->format_data);
|
|
||||||
self->format_destroy = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (self->popover)
|
if (self->popover)
|
||||||
{
|
{
|
||||||
@@ -388,8 +382,7 @@ gcal_multi_choice_dispose (GObject *object)
|
|||||||
g_signal_handlers_disconnect_by_func (self->popover,
|
g_signal_handlers_disconnect_by_func (self->popover,
|
||||||
popover_destroy_cb,
|
popover_destroy_cb,
|
||||||
object);
|
object);
|
||||||
gtk_widget_unparent (self->popover);
|
g_clear_pointer (&self->popover, gtk_widget_unparent);
|
||||||
self->popover = NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
G_OBJECT_CLASS (gcal_multi_choice_parent_class)->dispose (object);
|
G_OBJECT_CLASS (gcal_multi_choice_parent_class)->dispose (object);
|
||||||
|
|||||||
Reference in New Issue
Block a user