network-manager-applet r847 - trunk/src/wireless-security

[dcbw svn gnome org]

Author: dcbw
Date: Fri Aug 15 18:44:46 2008
New Revision: 847
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=847&view=rev

Log:
Clear out ciphers before resetting

Modified:
   trunk/src/wireless-security/wireless-security.c

Modified: trunk/src/wireless-security/wireless-security.c
==============================================================================
--- trunk/src/wireless-security/wireless-security.c	(original)
+++ trunk/src/wireless-security/wireless-security.c	Fri Aug 15 18:44:46 2008
@@ -174,14 +174,20 @@
 	g_assert (s_wireless_sec);
 
 	// FIXME: allow protocol selection and filter on device capabilities
+	g_slist_foreach (s_wireless_sec->proto, (GFunc) g_free, NULL);
+	g_slist_free (s_wireless_sec->proto);
 	s_wireless_sec->proto = g_slist_append (s_wireless_sec->proto, g_strdup ("wpa"));
 	s_wireless_sec->proto = g_slist_append (s_wireless_sec->proto, g_strdup ("rsn"));
 
 	// FIXME: allow pairwise cipher selection and filter on device capabilities
+	g_slist_foreach (s_wireless_sec->pairwise, (GFunc) g_free, NULL);
+	g_slist_free (s_wireless_sec->pairwise);
 	s_wireless_sec->pairwise = g_slist_append (s_wireless_sec->pairwise, g_strdup ("tkip"));
 	s_wireless_sec->pairwise = g_slist_append (s_wireless_sec->pairwise, g_strdup ("ccmp"));
 
 	// FIXME: allow group cipher selection and filter on device capabilities
+	g_slist_foreach (s_wireless_sec->group, (GFunc) g_free, NULL);
+	g_slist_free (s_wireless_sec->group);
 	s_wireless_sec->group = g_slist_append (s_wireless_sec->group, g_strdup ("wep40"));
 	s_wireless_sec->group = g_slist_append (s_wireless_sec->group, g_strdup ("wep104"));
 	s_wireless_sec->group = g_slist_append (s_wireless_sec->group, g_strdup ("tkip"));