From 9c839d341759d942dffe9e178f16dd9a5dded26f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 9 Jan 2013 18:14:37 -0600 Subject: [PATCH] mobile: fix handling of CDMA username/password for ModemManager1 The new MM1 bits only looked at the GSM setting, which CDMA connections don't necessarily have. --- src/modem-manager/nm-modem-broadband.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/modem-manager/nm-modem-broadband.c b/src/modem-manager/nm-modem-broadband.c index e3edab357d..05cd35651d 100644 --- a/src/modem-manager/nm-modem-broadband.c +++ b/src/modem-manager/nm-modem-broadband.c @@ -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; }