network-manager-applet r1035 - in trunk: . src src/gconf-helpers

[dcbw svn gnome org]

Author: dcbw
Date: Wed Nov 19 16:24:20 2008
New Revision: 1035
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=1035&view=rev

Log:
2008-11-19  Dan Williams  <dcbw redhat com>

	* src/gconf-helpers/nma-gconf-connection.c
	  src/applet-device-wifi.c
		- Fix up compare flag names



Modified:
   trunk/ChangeLog
   trunk/src/applet-device-wifi.c
   trunk/src/gconf-helpers/nma-gconf-connection.c

Modified: trunk/src/applet-device-wifi.c
==============================================================================
--- trunk/src/applet-device-wifi.c	(original)
+++ trunk/src/applet-device-wifi.c	Wed Nov 19 16:24:20 2008
@@ -1343,7 +1343,7 @@
 		for (iter = all; iter; iter = g_slist_next (iter)) {
 			if (nm_connection_compare (connection,
 			                           NM_CONNECTION (iter->data),
-			                           (COMPARE_FLAGS_FUZZY | COMPARE_FLAGS_IGNORE_ID))) {
+			                           (NM_SETTING_COMPARE_FLAG_FUZZY | NM_SETTING_COMPARE_FLAG_IGNORE_ID))) {
 				fuzzy_match = g_object_ref (NM_CONNECTION (iter->data));
 				break;
 			}

Modified: trunk/src/gconf-helpers/nma-gconf-connection.c
==============================================================================
--- trunk/src/gconf-helpers/nma-gconf-connection.c	(original)
+++ trunk/src/gconf-helpers/nma-gconf-connection.c	Wed Nov 19 16:24:20 2008
@@ -149,7 +149,7 @@
 	utils_clear_filled_connection_certs (gconf_connection);
 
 	/* Ignore the GConf update if nothing changed */
-	if (nm_connection_compare (wrapped_connection, gconf_connection, COMPARE_FLAGS_EXACT))
+	if (nm_connection_compare (wrapped_connection, gconf_connection, NM_SETTING_COMPARE_FLAG_EXACT))
 		return TRUE;
 
 	new_settings = nm_connection_to_hash (gconf_connection);