system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-04-30 Dan Williams <dcbw@redhat.com>

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



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3623 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-04-30 19:19:50 +00:00
parent 1813185dcc
commit 9c5d7e916b
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
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
2008-04-30 Dan Williams <dcbw@redhat.com>
* src/nm-manager.c

10
src/nm-gsm-device.c
View file

@ -358,7 +358,7 @@ enter_pin (NMSerialDevice *device, gboolean retry)
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 @@ enter_pin (NMSerialDevice *device, gboolean retry)
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 @@ enter_pin (NMSerialDevice *device, gboolean retry)
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);
}
}