diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:36 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 17:09:07 +0200 |
| commit | ccf6dc06bbee82c3d49f451545c5317337e0777e (patch) | |
| tree | a8fddc8c6e2b3b99bebab1d5bb2a64581eff4bfd /libnm-core/nm-setting-gsm.c | |
| parent | f109e55ef130ce84054d5ba3acf4b71cd8c7564a (diff) | |
| parent | 7ffed1e6136de75188f10ba8763bcb942f932f8e (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'libnm-core/nm-setting-gsm.c')
| -rw-r--r-- | libnm-core/nm-setting-gsm.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/libnm-core/nm-setting-gsm.c b/libnm-core/nm-setting-gsm.c index 4bc957d3..19e2554a 100644 --- a/libnm-core/nm-setting-gsm.c +++ b/libnm-core/nm-setting-gsm.c @@ -41,26 +41,20 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE ( ); typedef struct { - gboolean auto_config; - char *number; /* For dialing, duh */ char *username; char *password; - NMSettingSecretFlags password_flags; - - /* Restrict connection to certain devices or SIMs */ char *device_id; char *sim_id; char *sim_operator_id; - char *apn; /* NULL for dynamic */ char *network_id; /* for manual registration or NULL for automatic */ - char *pin; + NMSettingSecretFlags password_flags; NMSettingSecretFlags pin_flags; - - gboolean home_only; guint32 mtu; + bool auto_config:1; + bool home_only:1; } NMSettingGsmPrivate; G_DEFINE_TYPE (NMSettingGsm, nm_setting_gsm, NM_TYPE_SETTING) @@ -91,7 +85,7 @@ nm_setting_gsm_get_auto_config (NMSettingGsm *setting) * * Returns: the #NMSettingGsm:number property of the setting * - * Deprecated: 1.16: user-provided values for this setting are no longer used. + * Deprecated: 1.16: User-provided values for this setting are no longer used. **/ const char * nm_setting_gsm_get_number (NMSettingGsm *setting) @@ -665,7 +659,7 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass) * Legacy setting that used to help establishing PPP data sessions for * GSM-based modems. * - * Deprecated: 1.16: user-provided values for this setting are no longer used. + * Deprecated: 1.16: User-provided values for this setting are no longer used. **/ obj_properties[PROP_NUMBER] = g_param_spec_string (NM_SETTING_GSM_NUMBER, "", "", @@ -842,7 +836,6 @@ nm_setting_gsm_class_init (NMSettingGsmClass *klass) g_param_spec_uint (NM_SETTING_GSM_MTU, "", "", 0, G_MAXUINT32, 0, G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | NM_SETTING_PARAM_FUZZY_IGNORE | G_PARAM_STATIC_STRINGS); |