NetworkManager r3623 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Wed Apr 30 19:19:50 2008
New Revision: 3623
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3623&view=rev

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

	* src/nm-gsm-device.c
		- (enter_pin): fix setting name passed to applets when asking for a GSM
			PIN or PUK



Modified:
   trunk/ChangeLog
   trunk/src/nm-gsm-device.c

Modified: trunk/src/nm-gsm-device.c
==============================================================================
--- trunk/src/nm-gsm-device.c	(original)
+++ trunk/src/nm-gsm-device.c	Wed Apr 30 19:19:50 2008
@@ -358,7 +358,7 @@
 	NMActRequest *req;
 	NMConnection *connection;
 	char *secret;
-	char *secret_setting_name;
+	char *secret_name = NULL;
 
 	req = nm_device_get_act_request (NM_DEVICE (device));
 	g_assert (req);
@@ -370,11 +370,11 @@
 	switch (NM_GSM_DEVICE_GET_PRIVATE (device)->need_secret) {
 	case NM_GSM_SECRET_PIN:
 		secret = setting->pin;
-		secret_setting_name = NM_SETTING_GSM_PIN;
+		secret_name = NM_SETTING_GSM_PIN;
 		break;
 	case NM_GSM_SECRET_PUK:
 		secret = setting->puk;
-		secret_setting_name = NM_SETTING_GSM_PIN;
+		secret_name = NM_SETTING_GSM_PUK;
 		break;
 	default:
 		do_register (device);
@@ -401,9 +401,9 @@
 			nm_device_state_changed (NM_DEVICE (device), NM_DEVICE_STATE_FAILED);
 		}
 	} else {
-		nm_info ("%s required", secret_setting_name);
+		nm_info ("(%s): GSM %s secret required", nm_device_get_iface (NM_DEVICE (device)), secret_name);
 		nm_device_state_changed (NM_DEVICE (device), NM_DEVICE_STATE_NEED_AUTH);
-		nm_act_request_request_connection_secrets (req, secret_setting_name, retry);
+		nm_act_request_request_connection_secrets (req, NM_SETTING_GSM_SETTING_NAME, retry);
 	}
 }