From ed6ac15b5ca8f567ccb71ab438f093f9c72c59a0 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Thu, 31 May 2018 09:20:53 +1200 Subject: power: Simplify cancellable destruction --- panels/power/cc-power-panel.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'panels/power/cc-power-panel.c') diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c index 98f1c26aa..34cfd9bed 100644 --- a/panels/power/cc-power-panel.c +++ b/panels/power/cc-power-panel.c @@ -128,12 +128,8 @@ cc_power_panel_dispose (GObject *object) g_clear_pointer (&self->chassis_type, g_free); g_clear_object (&self->gsd_settings); g_clear_object (&self->session_settings); - if (self->cancellable != NULL) - { - g_cancellable_cancel (self->cancellable); - g_object_unref (self->cancellable); - self->cancellable = NULL; - } + g_cancellable_cancel (self->cancellable); + g_clear_object (&self->cancellable); g_clear_pointer (&self->automatic_suspend_dialog, gtk_widget_destroy); g_clear_object (&self->builder); g_clear_object (&self->screen_proxy); -- cgit v1.2.1