[gnome-settings-daemon/gnome-3-4] daemon: Fix g_clear_object() usage



commit 5a22b07ab04f38e881e0e4a295913e05e3ec561a
Author: Daiki Ueno <ueno unixuser org>
Date:   Wed May 23 15:15:16 2012 +0100

    daemon: Fix g_clear_object() usage
    
    https://bugzilla.gnome.org/show_bug.cgi?id=673555

 gnome-settings-daemon/gnome-settings-manager.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/gnome-settings-daemon/gnome-settings-manager.c b/gnome-settings-daemon/gnome-settings-manager.c
index 672c53f..b824a4f 100644
--- a/gnome-settings-daemon/gnome-settings-manager.c
+++ b/gnome-settings-daemon/gnome-settings-manager.c
@@ -461,11 +461,8 @@ gnome_settings_manager_stop (GnomeSettingsManager *manager)
                 manager->priv->owner_id = 0;
         }
 
-        if (manager->priv->settings)
-                g_clear_object (&manager->priv->settings);
-
-        if (manager->priv->pnp_ids)
-                g_clear_object (&manager->priv->pnp_ids);
+        g_clear_object (&manager->priv->settings);
+        g_clear_object (&manager->priv->pnp_ids);
 }
 
 static void



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