From ade314556cb317bdc3f5560cd1835a82a4eacc13 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 25 Feb 2008 22:06:18 +0000 Subject: [PATCH] 2008-02-25 Dan Williams * libnm-util/nm-setting.c - (nm_setting_compare): Fix C&P error from r3068 that caused settings comparisons to always succeed; clarify assignment of values to 'different' git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3341 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ libnm-util/nm-setting.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index de5ddfdb1d..6ecf7de9d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-02-25 Dan Williams + + * libnm-util/nm-setting.c + - (nm_setting_compare): Fix C&P error from r3068 that caused settings + comparisons to always succeed; clarify assignment of values to + 'different' + 2008-02-24 Dan Williams * libnm-util/nm-setting.c diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c index 6d090fd6a6..2375fb11d5 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -188,9 +188,9 @@ nm_setting_compare (NMSetting *setting, g_object_get_property (G_OBJECT (setting), prop_spec->name, &value1); g_value_init (&value2, prop_spec->value_type); - g_object_get_property (G_OBJECT (setting), prop_spec->name, &value2); + g_object_get_property (G_OBJECT (other), prop_spec->name, &value2); - different = g_param_values_cmp (prop_spec, &value1, &value2) != 0; + different = g_param_values_cmp (prop_spec, &value1, &value2); g_value_unset (&value1); g_value_unset (&value2);