[gnome-settings-daemon] daemon: don't unref member objects twice on dispose
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] daemon: don't unref member objects twice on dispose
- Date: Thu, 17 May 2012 16:05:12 +0000 (UTC)
commit 04125979df9521f2c942ec600f0345bdbc52e9a9
Author: Daiki Ueno <ueno unixuser org>
Date: Thu Apr 5 16:41:12 2012 +0900
daemon: don't unref member objects twice on dispose
https://bugzilla.gnome.org/show_bug.cgi?id=673555
gnome-settings-daemon/gnome-settings-manager.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gnome-settings-daemon/gnome-settings-manager.c b/gnome-settings-daemon/gnome-settings-manager.c
index 10dfe9f..efc1031 100644
--- a/gnome-settings-daemon/gnome-settings-manager.c
+++ b/gnome-settings-daemon/gnome-settings-manager.c
@@ -409,11 +409,11 @@ gnome_settings_manager_stop (GnomeSettingsManager *manager)
manager->priv->owner_id = 0;
}
- g_object_unref (manager->priv->settings);
- manager->priv->settings = NULL;
+ if (manager->priv->settings)
+ g_clear_object (&manager->priv->settings);
- g_object_unref (manager->priv->pnp_ids);
- manager->priv->pnp_ids = NULL;
+ if (manager->priv->pnp_ids)
+ g_clear_object (&manager->priv->pnp_ids);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]