summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@unixuser.org>2012-05-23 15:15:16 +0100
committerBastien Nocera <hadess@hadess.net>2012-05-23 15:16:01 +0100
commitea8f5d1e00fad8e526af243a89de1d5aff88e4e8 (patch)
treee57c79569045725cd299455f340a99c8c5e412d9
parentec3dd2f3e54f7b27da82b57ae0da1bbe54377a63 (diff)
downloadgnome-settings-daemon-ea8f5d1e00fad8e526af243a89de1d5aff88e4e8.tar.gz
daemon: Fix g_clear_object() usage
https://bugzilla.gnome.org/show_bug.cgi?id=673555
-rw-r--r--gnome-settings-daemon/gnome-settings-manager.c7
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 efc10317..60645bef 100644
--- a/gnome-settings-daemon/gnome-settings-manager.c
+++ b/gnome-settings-daemon/gnome-settings-manager.c
@@ -409,11 +409,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