network-manager-applet r673 - in trunk: . src/wireless-security

[dcbw svn gnome org]

Author: dcbw
Date: Tue Apr 15 19:16:00 2008
New Revision: 673
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=673&view=rev

Log:
2008-04-15  Dan Williams  <dcbw redhat com>

	* src/wireless-security/wireless-security.c
	  src/wireless-security/eap-method-leap.c
	  src/wireless-security/ws-dynamic-wep.c
	  src/wireless-security/eap-method-peap.c
	  src/wireless-security/eap-method-ttls.c
	  src/wireless-security/ws-wep-key.c
	  src/wireless-security/ws-leap.c
	  src/wireless-security/ws-wpa-psk.c
	  src/wireless-security/eap-method-simple.c
	  src/wireless-security/eap-method-tls.c
		- Don't require 'connection_id' as this won't have been determined when
			adding a new connection



Modified:
   trunk/ChangeLog
   trunk/src/wireless-security/eap-method-leap.c
   trunk/src/wireless-security/eap-method-peap.c
   trunk/src/wireless-security/eap-method-simple.c
   trunk/src/wireless-security/eap-method-tls.c
   trunk/src/wireless-security/eap-method-ttls.c
   trunk/src/wireless-security/wireless-security.c
   trunk/src/wireless-security/ws-dynamic-wep.c
   trunk/src/wireless-security/ws-leap.c
   trunk/src/wireless-security/ws-wep-key.c
   trunk/src/wireless-security/ws-wpa-psk.c

Modified: trunk/src/wireless-security/eap-method-leap.c
==============================================================================
--- trunk/src/wireless-security/eap-method-leap.c	(original)
+++ trunk/src/wireless-security/eap-method-leap.c	Tue Apr 15 19:16:00 2008
@@ -120,8 +120,6 @@
 	GladeXML *xml;
 
 	g_return_val_if_fail (glade_file != NULL, NULL);
-	if (connection)
-		g_return_val_if_fail (connection_id != NULL, NULL);
 
 	xml = glade_xml_new (glade_file, "eap_leap_notebook", NULL);
 	if (xml == NULL) {
@@ -167,7 +165,7 @@
 	                  (GCallback) wireless_security_changed_cb,
 	                  parent);
 	/* Fill secrets, if any */
-	if (connection) {
+	if (connection && connection_id) {
 		GHashTable *secrets;
 		GError *error = NULL;
 		GValue *value;

Modified: trunk/src/wireless-security/eap-method-peap.c
==============================================================================
--- trunk/src/wireless-security/eap-method-peap.c	(original)
+++ trunk/src/wireless-security/eap-method-peap.c	Tue Apr 15 19:16:00 2008
@@ -353,8 +353,6 @@
 	const char *filename;
 
 	g_return_val_if_fail (glade_file != NULL, NULL);
-	if (connection)
-		g_return_val_if_fail (connection_id != NULL, NULL);
 
 	xml = glade_xml_new (glade_file, "eap_peap_notebook", NULL);
 	if (xml == NULL) {

Modified: trunk/src/wireless-security/eap-method-simple.c
==============================================================================
--- trunk/src/wireless-security/eap-method-simple.c	(original)
+++ trunk/src/wireless-security/eap-method-simple.c	Tue Apr 15 19:16:00 2008
@@ -136,8 +136,6 @@
 	GladeXML *xml;
 
 	g_return_val_if_fail (glade_file != NULL, NULL);
-	if (connection)
-		g_return_val_if_fail (connection_id != NULL, NULL);
 
 	xml = glade_xml_new (glade_file, "eap_simple_notebook", NULL);
 	if (xml == NULL) {
@@ -185,7 +183,7 @@
 	                  (GCallback) wireless_security_changed_cb,
 	                  parent);
 	/* Fill secrets, if any */
-	if (connection) {
+	if (connection && connection_id) {
 		GHashTable *secrets;
 		GError *error = NULL;
 		GValue *value;

Modified: trunk/src/wireless-security/eap-method-tls.c
==============================================================================
--- trunk/src/wireless-security/eap-method-tls.c	(original)
+++ trunk/src/wireless-security/eap-method-tls.c	Tue Apr 15 19:16:00 2008
@@ -348,8 +348,6 @@
 	NMSetting8021x *s_8021x = NULL;
 
 	g_return_val_if_fail (glade_file != NULL, NULL);
-	if (connection)
-		g_return_val_if_fail (connection_id != NULL, NULL);
 
 	xml = glade_xml_new (glade_file, "eap_tls_notebook", NULL);
 	if (xml == NULL) {
@@ -408,7 +406,7 @@
 	                  (GCallback) wireless_security_changed_cb,
 	                  parent);
 	/* Fill secrets, if any */
-	if (connection) {
+	if (connection && connection_id) {
 		GHashTable *secrets;
 		GError *error = NULL;
 		GValue *value;

Modified: trunk/src/wireless-security/eap-method-ttls.c
==============================================================================
--- trunk/src/wireless-security/eap-method-ttls.c	(original)
+++ trunk/src/wireless-security/eap-method-ttls.c	Tue Apr 15 19:16:00 2008
@@ -366,8 +366,6 @@
 	const char *filename;
 
 	g_return_val_if_fail (glade_file != NULL, NULL);
-	if (connection)
-		g_return_val_if_fail (connection_id != NULL, NULL);
 
 	xml = glade_xml_new (glade_file, "eap_ttls_notebook", NULL);
 	if (xml == NULL) {

Modified: trunk/src/wireless-security/wireless-security.c
==============================================================================
--- trunk/src/wireless-security/wireless-security.c	(original)
+++ trunk/src/wireless-security/wireless-security.c	Tue Apr 15 19:16:00 2008
@@ -289,9 +289,6 @@
 	const char *default_method = NULL;
 	int active = -1;
 
-	if (connection)
-		g_return_val_if_fail (connection_id != NULL, NULL);
-
 	/* Grab the default EAP method out of the security object */
 	if (connection) {
 		NMSetting8021x *s_8021x;

Modified: trunk/src/wireless-security/ws-dynamic-wep.c
==============================================================================
--- trunk/src/wireless-security/ws-dynamic-wep.c	(original)
+++ trunk/src/wireless-security/ws-dynamic-wep.c	Tue Apr 15 19:16:00 2008
@@ -106,8 +106,6 @@
 	GladeXML *xml;
 
 	g_return_val_if_fail (glade_file != NULL, NULL);
-	if (connection)
-		g_return_val_if_fail (connection_id != NULL, NULL);
 
 	xml = glade_xml_new (glade_file, "dynamic_wep_notebook", NULL);
 	if (xml == NULL) {

Modified: trunk/src/wireless-security/ws-leap.c
==============================================================================
--- trunk/src/wireless-security/ws-leap.c	(original)
+++ trunk/src/wireless-security/ws-leap.c	Tue Apr 15 19:16:00 2008
@@ -119,8 +119,6 @@
 	NMSettingWirelessSecurity *wsec = NULL;
 
 	g_return_val_if_fail (glade_file != NULL, NULL);
-	if (connection)
-		g_return_val_if_fail (connection_id != NULL, NULL);
 
 	xml = glade_xml_new (glade_file, "leap_notebook", NULL);
 	if (xml == NULL) {
@@ -161,7 +159,7 @@
 	g_signal_connect (G_OBJECT (widget), "changed",
 	                  (GCallback) wireless_security_changed_cb,
 	                  sec);
-	if (wsec) {
+	if (wsec && connection_id) {
 		GHashTable *secrets;
 		GError *error = NULL;
 		GValue *value;

Modified: trunk/src/wireless-security/ws-wep-key.c
==============================================================================
--- trunk/src/wireless-security/ws-wep-key.c	(original)
+++ trunk/src/wireless-security/ws-wep-key.c	Tue Apr 15 19:16:00 2008
@@ -277,8 +277,6 @@
 	guint8 default_key_idx = 0;
 
 	g_return_val_if_fail (glade_file != NULL, NULL);
-	if (connection)
-		g_return_val_if_fail (connection_id != NULL, NULL);
 
 	xml = glade_xml_new (glade_file, "wep_key_notebook", NULL);
 	if (xml == NULL) {
@@ -310,7 +308,7 @@
 	g_assert (widget);
 
 	/* Fill secrets, if any */
-	if (connection) {
+	if (connection && connection_id) {
 		GHashTable *secrets;
 		GError *error = NULL;
 		GValue *value;
@@ -431,6 +429,8 @@
 	if (!connection)
 		return WEP_KEY_TYPE_PASSPHRASE;
 
+	g_return_val_if_fail (connection_id != NULL, WEP_KEY_TYPE_PASSPHRASE);
+
 	secrets = nm_gconf_get_keyring_items (connection, connection_id,
 	                                      NM_SETTING_WIRELESS_SECURITY_SETTING_NAME,
 	                                      FALSE,

Modified: trunk/src/wireless-security/ws-wpa-psk.c
==============================================================================
--- trunk/src/wireless-security/ws-wpa-psk.c	(original)
+++ trunk/src/wireless-security/ws-wpa-psk.c	Tue Apr 15 19:16:00 2008
@@ -148,15 +148,15 @@
 }
 
 WirelessSecurityWPAPSK *
-ws_wpa_psk_new (const char *glade_file, NMConnection *connection, const char *connection_id)
+ws_wpa_psk_new (const char *glade_file,
+                NMConnection *connection,
+                const char *connection_id)
 {
 	WirelessSecurityWPAPSK *sec;
 	GtkWidget *widget;
 	GladeXML *xml;
 
 	g_return_val_if_fail (glade_file != NULL, NULL);
-	if (connection)
-		g_return_val_if_fail (connection_id != NULL, NULL);
 
 	xml = glade_xml_new (glade_file, "wpa_psk_notebook", NULL);
 	if (xml == NULL) {
@@ -190,7 +190,7 @@
 	                  sec);
 
 	/* Fill secrets, if any */
-	if (connection) {
+	if (connection && connection_id) {
 		GHashTable *secrets;
 		GError *error = NULL;
 		GValue *value;