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-tun.c | |
| parent | f109e55ef130ce84054d5ba3acf4b71cd8c7564a (diff) | |
| parent | 7ffed1e6136de75188f10ba8763bcb942f932f8e (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
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); |