network-manager-applet r712 - in trunk: . src/connection-editor

[dcbw svn gnome org]

Author: dcbw
Date: Mon May  5 20:52:52 2008
New Revision: 712
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=712&view=rev

Log:
2008-05-05  Dan Williams  <dcbw redhat com>

	* src/connection-editor/page-wireless-security.c
		- (update_connection): handle unencrypted connections without crashing



Modified:
   trunk/ChangeLog
   trunk/src/connection-editor/page-wireless-security.c

Modified: trunk/src/connection-editor/page-wireless-security.c
==============================================================================
--- trunk/src/connection-editor/page-wireless-security.c	(original)
+++ trunk/src/connection-editor/page-wireless-security.c	Mon May  5 20:52:52 2008
@@ -404,8 +404,17 @@
 	WirelessSecurity *sec;
 
 	sec = wireless_security_combo_get_active (self);
-	g_assert (sec);
-	wireless_security_fill_connection (sec, connection);
+	if (sec)
+		wireless_security_fill_connection (sec, connection);
+	else {
+		NMSettingWireless *s_wireless;
+
+		/* No security, unencrypted */
+		s_wireless = NM_SETTING_WIRELESS (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS));
+		g_assert (s_wireless);
+		g_free (s_wireless->security);
+		s_wireless->security = NULL;
+	}
 }
 
 static void