[gnome-settings-daemon] power: Use g_clear_pointer() in _stop when possible



commit c03e62e70927cb60b83d6f198c6154ed080f44c2
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Jan 30 12:19:16 2017 +0100

    power: Use g_clear_pointer() in _stop when possible

 plugins/power/gsd-power-manager.c |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 63c4480..ab9e3dc 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -2664,10 +2664,7 @@ gsd_power_manager_stop (GsdPowerManager *manager)
                 g_clear_object (&manager->priv->cancellable);
         }
 
-        if (manager->priv->introspection_data) {
-                g_dbus_node_info_unref (manager->priv->introspection_data);
-                manager->priv->introspection_data = NULL;
-        }
+        g_clear_pointer (&manager->priv->introspection_data, g_dbus_node_info_unref);
 
         if (manager->priv->up_client)
                 g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager);
@@ -2695,10 +2692,7 @@ gsd_power_manager_stop (GsdPowerManager *manager)
         g_clear_object (&manager->priv->logind_proxy);
         g_clear_object (&manager->priv->rr_screen);
 
-        if (manager->priv->devices_array != NULL) {
-                g_ptr_array_unref (manager->priv->devices_array);
-                manager->priv->devices_array = NULL;
-        }
+        g_clear_pointer (&manager->priv->devices_array, g_ptr_array_unref);
         g_clear_object (&manager->priv->device_composite);
 
         g_clear_object (&manager->priv->screensaver_proxy);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]