colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modem: remove SECRETS_CALLER_HSO_GSM; ModemManager abstracts modems for us

Browse Source 
Fixes a bug where if GSM secrets were required, the connection would fail
because they were requested with SECRETS_CALLER_HSO_GSM, but the function
to handle retrieved secrets only expected SECRETS_CALLER_GSM.
This commit is contained in:
Dan Williams
2009-05-20 12:30:09 -04:00
parent f55ed9ffc5
commit 15e64d31ea
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modem-manager/nm-modem-gsm.c
View File

@@ -240,7 +240,7 @@ real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
nm_act_request_request_connection_secrets (req, nm_act_request_request_connection_secrets (req,
setting_name, setting_name,
tries ? TRUE : FALSE, tries ? TRUE : FALSE,
SECRETS_CALLER_HSO_GSM, SECRETS_CALLER_GSM,
hint1, hint1,
hint2); hint2);
g_object_set_data (G_OBJECT (connection), GSM_SECRETS_TRIES, GUINT_TO_POINTER (++tries)); g_object_set_data (G_OBJECT (connection), GSM_SECRETS_TRIES, GUINT_TO_POINTER (++tries));

3
src/nm-activation-request.h
View File

@@ -43,8 +43,7 @@ typedef enum {
SECRETS_CALLER_WIFI, SECRETS_CALLER_WIFI,
SECRETS_CALLER_GSM, SECRETS_CALLER_GSM,
SECRETS_CALLER_CDMA, SECRETS_CALLER_CDMA,
SECRETS_CALLER_PPP, SECRETS_CALLER_PPP
SECRETS_CALLER_HSO_GSM
} RequestSecretsCaller; } RequestSecretsCaller;
typedef struct { typedef struct {