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

[dcbw svn gnome org]

Author: dcbw
Date: Thu Nov 20 20:17:53 2008
New Revision: 1038
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=1038&view=rev

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

	* src/gconf-helpers/gconf-helpers.c
		- (string_in_list): implement locally now that nm_utils_string_in_list
			was removed from libnm-util



Modified:
   trunk/ChangeLog
   trunk/src/gconf-helpers/gconf-helpers.c

Modified: trunk/src/gconf-helpers/gconf-helpers.c
==============================================================================
--- trunk/src/gconf-helpers/gconf-helpers.c	(original)
+++ trunk/src/gconf-helpers/gconf-helpers.c	Thu Nov 20 20:17:53 2008
@@ -952,6 +952,18 @@
 	return connections;
 }
 
+static gboolean
+string_in_list (const char *str, const char **valid_strings)
+{
+	int i;
+
+	for (i = 0; valid_strings[i]; i++)
+		if (strcmp (str, valid_strings[i]) == 0)
+			break;
+
+	return valid_strings[i] != NULL;
+}
+
 static void
 free_one_addr (gpointer data)
 {
@@ -997,10 +1009,10 @@
 	 * separately.
 	 */
 	if (NM_IS_SETTING_802_1X (setting)) {
-		if (nm_utils_string_in_list (key, applet_8021x_ignore_keys))
+		if (string_in_list (key, applet_8021x_ignore_keys))
 			return;
 	} else if (NM_IS_SETTING_VPN (setting)) {
-		if (nm_utils_string_in_list (key, vpn_ignore_keys))
+		if (string_in_list (key, vpn_ignore_keys))
 			return;
 	}
 
@@ -1325,10 +1337,10 @@
 	 * separately.
 	 */
 	if (NM_IS_SETTING_802_1X (setting)) {
-		if (nm_utils_string_in_list (key, applet_8021x_ignore_keys))
+		if (string_in_list (key, applet_8021x_ignore_keys))
 			return;
 	} else if (NM_IS_SETTING_VPN (setting)) {
-		if (nm_utils_string_in_list (key, vpn_ignore_keys))
+		if (string_in_list (key, vpn_ignore_keys))
 			return;
 	}