NetworkManager r3556 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Thu Apr 10 19:37:14 2008
New Revision: 3556
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3556&view=rev

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

	* src/nm-gsm-device.c
		- (automatic_registration): accept "+CREG: 0,0"
		- (automatic_registration_response): fail on "+CREG: 0,0"



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	Thu Apr 10 19:37:14 2008
@@ -262,6 +262,10 @@
 		gsm_device_set_pending (NM_GSM_DEVICE (device),
 						    g_timeout_add (1000, automatic_registration_again, device));
 		break;
+	case 3:
+		nm_warning ("Automatic registration failed: not registered and not searching.");
+		nm_device_state_changed (NM_DEVICE (device), NM_DEVICE_STATE_FAILED);
+		break;
 	case -1:
 		nm_warning ("Automatic registration timed out");
 		nm_device_state_changed (NM_DEVICE (device), NM_DEVICE_STATE_FAILED);
@@ -277,7 +281,7 @@
 automatic_registration (NMSerialDevice *device)
 {
 	guint id;
-	char *responses[] = { "+CREG: 0,1", "+CREG: 0,5", "+CREG: 0,2", NULL };
+	char *responses[] = { "+CREG: 0,1", "+CREG: 0,5", "+CREG: 0,2", "+CREG: 0,0", NULL };
 
 	if (!nm_serial_device_send_command_string (device, "AT+CREG?")) {
 		nm_device_state_changed (NM_DEVICE (device), NM_DEVICE_STATE_FAILED);