diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
| commit | 96642ebde58e1eea692aea6a92d33f45452fa9c0 (patch) | |
| tree | 106ddfa2180b3997e8965787b5cb122982ebab9d /libnm-core/nm-setting-tun.c | |
| parent | 8f6881ac06714ef99cc470a03e7ac0ce1af49a16 (diff) | |
| parent | d460892bbfece74fb6d3cd846bf6ef548290be41 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latestt pu
Diffstat (limited to 'libnm-core/nm-setting-tun.c')
| -rw-r--r-- | libnm-core/nm-setting-tun.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libnm-core/nm-setting-tun.c b/libnm-core/nm-setting-tun.c index 312c5c53..ba9e64ad 100644 --- a/libnm-core/nm-setting-tun.c +++ b/libnm-core/nm-setting-tun.c @@ -34,12 +34,12 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE ( ); typedef struct { - NMSettingTunMode mode; char *owner; char *group; - gboolean pi; - gboolean vnet_hdr; - gboolean multi_queue; + NMSettingTunMode mode; + bool pi:1; + bool vnet_hdr:1; + bool multi_queue:1; } NMSettingTunPrivate; G_DEFINE_TYPE (NMSettingTun, nm_setting_tun, NM_TYPE_SETTING) @@ -248,8 +248,11 @@ set_property (GObject *object, guint prop_id, /*****************************************************************************/ static void -nm_setting_tun_init (NMSettingTun *setting) +nm_setting_tun_init (NMSettingTun *self) { + NMSettingTunPrivate *priv = NM_SETTING_TUN_GET_PRIVATE (self); + + priv->mode = NM_SETTING_TUN_MODE_TUN; } /** @@ -307,7 +310,6 @@ nm_setting_tun_class_init (NMSettingTunClass *klass) g_param_spec_uint (NM_SETTING_TUN_MODE, "", "", 0, G_MAXUINT, NM_SETTING_TUN_MODE_TUN, G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS); |