NetworkManager r4296 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Tue Nov 18 14:40:37 2008
New Revision: 4296
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4296&view=rev

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

	* src/nm-hso-gsm-device.c
		- (real_connection_secrets_updated): handle PIN/PUK correctly for HSO
			devices



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

Modified: trunk/src/nm-hso-gsm-device.c
==============================================================================
--- trunk/src/nm-hso-gsm-device.c	(original)
+++ trunk/src/nm-hso-gsm-device.c	Tue Nov 18 14:40:37 2008
@@ -404,10 +404,15 @@
                                  GSList *updated_settings,
                                  RequestSecretsCaller caller)
 {
-	g_return_if_fail (caller == SECRETS_CALLER_HSO_GSM);
 	g_return_if_fail (nm_device_get_state (device) == NM_DEVICE_STATE_NEED_AUTH);
 
-	nm_device_activate_schedule_stage2_device_config (device);
+	if (caller == SECRETS_CALLER_HSO_GSM)  { /* HSO PPP auth */
+		nm_device_activate_schedule_stage2_device_config (device);
+		return;
+	}
+
+	/* Let parent handle other auth like PIN/PUK */
+	NM_DEVICE_CLASS (nm_hso_gsm_device_parent_class)->connection_secrets_updated (device, connection, updated_settings, caller);
 }
 
 static void