[network-manager-applet/lr/jtojnar-happy: 34/35] mobile-wizard: return provider name for unlisted providers
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/lr/jtojnar-happy: 34/35] mobile-wizard: return provider name for unlisted providers
- Date: Fri, 26 Oct 2018 09:49:55 +0000 (UTC)
commit 1ed3c56dfe3f7e17627e0232001c795cf435178a
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Tue Aug 28 12:16:28 2018 +0200
mobile-wizard: return provider name for unlisted providers
src/libnma/nma-mobile-wizard.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/src/libnma/nma-mobile-wizard.c b/src/libnma/nma-mobile-wizard.c
index 2131030d..b364a11d 100644
--- a/src/libnma/nma-mobile-wizard.c
+++ b/src/libnma/nma-mobile-wizard.c
@@ -139,8 +139,17 @@ assistant_closed (GtkButton *button, gpointer user_data)
if (family == NMA_MOBILE_FAMILY_UNKNOWN)
family = get_provider_unlisted_type (self);
- if (family == NMA_MOBILE_FAMILY_3GPP)
- wiz_method->gsm_apn = g_strdup (gtk_entry_get_text (priv->plan_apn_entry));
+ switch (family) {
+ case NMA_MOBILE_FAMILY_3GPP:
+ wiz_method->provider_name = g_strdup (_("GSM"));
+ break;
+ case NMA_MOBILE_FAMILY_CDMA:
+ wiz_method->provider_name = g_strdup (_("CDMA"));
+ break;
+ case NMA_MOBILE_FAMILY_UNKNOWN:
+ g_return_if_reached ();
+ break;
+ }
} else {
gboolean manual = FALSE;
@@ -181,7 +190,7 @@ assistant_closed (GtkButton *button, gpointer user_data)
wiz_method->devtype = NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO;
break;
default:
- g_assert_not_reached ();
+ g_return_if_reached ();
break;
}
@@ -616,7 +625,7 @@ get_provider_unlisted_type (NMAMobileWizard *self)
case 1:
return NMA_MOBILE_FAMILY_CDMA;
default:
- return NMA_MOBILE_FAMILY_UNKNOWN;
+ g_return_val_if_reached (NMA_MOBILE_FAMILY_UNKNOWN);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]