fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-24 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

mobile: fix handling of CDMA username/password for ModemManager1

Browse source 
The new MM1 bits only looked at the GSM setting, which CDMA connections
don't necessarily have.
This commit is contained in:
Dan Williams 2013-01-09 18:14:37 -06:00
parent eb50c69129
commit 9c839d3417
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/modem-manager/nm-modem-broadband.c
View file

@ -573,15 +573,25 @@ get_user_pass (NMModem *modem,
const char **pass)
{
NMSettingGsm *s_gsm;
NMSettingCdma *s_cdma;
s_gsm = nm_connection_get_setting_gsm (connection);
if (!s_gsm)
s_cdma = nm_connection_get_setting_cdma (connection);
if (!s_gsm && !s_cdma)
return FALSE;
if (user)
*user = nm_setting_gsm_get_username (s_gsm);
if (pass)
*pass = nm_setting_gsm_get_password (s_gsm);
if (user) {
if (s_gsm)
*user = nm_setting_gsm_get_username (s_gsm);
else if (s_cdma)
*user = nm_setting_cdma_get_username (s_cdma);
}
if (pass) {
if (s_gsm)
*pass = nm_setting_gsm_get_password (s_gsm);
else if (s_cdma)
*pass = nm_setting_cdma_get_password (s_cdma);
}
return TRUE;
}