2008-08-17 Dan Williams <dcbw@redhat.com>

* include/NetworkManager.h
	  introspection/nm-device.xml
	  src/nm-gsm-device.c
		- Finer-grained GSM registration failure error codes



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3978 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-08-17 23:41:41 +00:00
parent a419bdfb9e
commit afe47b8d3a
4 changed files with 37 additions and 6 deletions

View file

@ -1,3 +1,10 @@
2008-08-17 Dan Williams <dcbw@redhat.com>
* include/NetworkManager.h
introspection/nm-device.xml
src/nm-gsm-device.c
- Finer-grained GSM registration failure error codes
2008-08-17 Dan Williams <dcbw@redhat.com>
* callouts/Makefile.am

View file

@ -307,6 +307,15 @@ typedef enum {
/* Failed to select the specified APN */
NM_DEVICE_STATE_REASON_GSM_APN_FAILED,
/* Not searching for networks */
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING,
/* Network registration denied */
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED,
/* Network registration timed out */
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT,
/* Failed to register with the requested network */
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED,

View file

@ -290,12 +290,27 @@
Failed to select the specified GSM APN.
</tp:docstring>
</tp:enumvalue>
<tp:enumvalue suffix="GSM_REGISTRATION_FAILED" value="30">
<tp:enumvalue suffix="GSM_REGISTRATION_NOT_SEARCHING" value="30">
<tp:docstring>
Not searching for networks.
</tp:docstring>
</tp:enumvalue>
<tp:enumvalue suffix="GSM_REGISTRATION_DENIED" value="31">
<tp:docstring>
Network registration was denied.
</tp:docstring>
</tp:enumvalue>
<tp:enumvalue suffix="GSM_REGISTRATION_TIMEOUT" value="32">
<tp:docstring>
Network registration timed out.
</tp:docstring>
</tp:enumvalue>
<tp:enumvalue suffix="GSM_REGISTRATION_FAILED" value="33">
<tp:docstring>
Failed to register with the requested GSM network.
</tp:docstring>
</tp:enumvalue>
<tp:enumvalue suffix="GSM_PIN_CHECK_FAILED" value="31">
<tp:enumvalue suffix="GSM_PIN_CHECK_FAILED" value="34">
<tp:docstring>
PIN check failed.
</tp:docstring>

View file

@ -241,7 +241,7 @@ manual_registration_done (NMSerialDevice *device,
nm_warning ("Manual registration timed out");
nm_device_state_changed (NM_DEVICE (device),
NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED);
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT);
break;
default:
nm_warning ("Manual registration failed");
@ -304,7 +304,7 @@ automatic_registration_response (NMSerialDevice *device,
nm_warning ("Automatic registration failed: not registered and not searching.");
nm_device_state_changed (NM_DEVICE (device),
NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED);
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING);
break;
case 1:
nm_info ("Registered on Home network");
@ -317,7 +317,7 @@ automatic_registration_response (NMSerialDevice *device,
nm_warning ("Automatic registration failed: registration denied.");
nm_device_state_changed (NM_DEVICE (device),
NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED);
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED);
break;
case 4:
nm_info ("Registered on Roaming network");
@ -327,7 +327,7 @@ automatic_registration_response (NMSerialDevice *device,
nm_warning ("Automatic registration timed out");
nm_device_state_changed (NM_DEVICE (device),
NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED);
NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT);
break;
default:
nm_warning ("Automatic registration failed");