From 330cb3563000405384e2586302d99631e6a49825 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 27 Oct 2010 16:22:18 -0500 Subject: [PATCH] policy: make sure we have a valid settings object --- src/nm-policy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nm-policy.c b/src/nm-policy.c index 793a5a7b42..028558c57b 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1130,6 +1130,7 @@ nm_policy_new (NMManager *manager, policy = g_malloc0 (sizeof (NMPolicy)); policy->manager = g_object_ref (manager); + policy->settings = g_object_ref (settings); policy->update_state_id = 0; /* Grab hostname on startup and use that if nothing provides one */ @@ -1236,8 +1237,6 @@ nm_policy_destroy (NMPolicy *policy) } g_slist_free (policy->dev_signal_ids); - g_object_unref (policy->settings); - /* Rewrite /etc/hosts on exit to ensure we don't leave stale IP addresses * lying around. FIXME: this will take out a valid IP address of an * ethernet device we're leaving active (ie, a connection we can "assume" @@ -1250,6 +1249,7 @@ nm_policy_destroy (NMPolicy *policy) g_free (policy->orig_hostname); g_free (policy->cur_hostname); + g_object_unref (policy->settings); g_object_unref (policy->manager); g_free (policy); }