NetworkManager r3341 - in trunk: . libnm-util

[dcbw svn gnome org]

Author: dcbw
Date: Mon Feb 25 22:06:18 2008
New Revision: 3341
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3341&view=rev

Log:
2008-02-25  Dan Williams  <dcbw redhat com>

	* 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'



Modified:
   trunk/ChangeLog
   trunk/libnm-util/nm-setting.c

Modified: trunk/libnm-util/nm-setting.c
==============================================================================
--- trunk/libnm-util/nm-setting.c	(original)
+++ trunk/libnm-util/nm-setting.c	Mon Feb 25 22:06:18 2008
@@ -188,9 +188,9 @@
 		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);