diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:52:15 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:24:27 +0100 |
| commit | e8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (patch) | |
| tree | 017883e210043859ee695250f6285380b795f8e4 /libnm-core/nm-setting.h | |
| parent | b05c072fe2594e0369cbfb00a3fba176d2d309dc (diff) | |
| parent | 1b878e595ff7be634a4800ca6cc506046e49548e (diff) | |
Merge remote-tracking branch 'salsa/master' into disco
Diffstat (limited to 'libnm-core/nm-setting.h')
| -rw-r--r-- | libnm-core/nm-setting.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/libnm-core/nm-setting.h b/libnm-core/nm-setting.h index 47a2fdc1..a7a0f81f 100644 --- a/libnm-core/nm-setting.h +++ b/libnm-core/nm-setting.h @@ -168,11 +168,13 @@ typedef gboolean (*NMSettingClearSecretsWithFlagsFn) (NMSetting *setting, NMSettingSecretFlags flags, gpointer user_data); +struct _NMMetaSettingInfo; + typedef struct { GObjectClass parent; /* Virtual functions */ - gint (*verify) (NMSetting *setting, + int (*verify) (NMSetting *setting, NMConnection *connection, GError **error); @@ -211,7 +213,10 @@ typedef struct { NMSettingCompareFlags flags); /*< private >*/ - gpointer padding[7]; + const struct _NMMetaSettingInfo *setting_info; + + /*< private >*/ + gpointer padding[6]; } NMSettingClass; /** @@ -282,7 +287,8 @@ void nm_setting_enumerate_values (NMSetting *setting, char *nm_setting_to_string (NMSetting *setting); -/* Secrets */ +/*****************************************************************************/ + gboolean nm_setting_get_secret_flags (NMSetting *setting, const char *secret_name, NMSettingSecretFlags *out_flags, @@ -293,10 +299,13 @@ gboolean nm_setting_set_secret_flags (NMSetting *setting, NMSettingSecretFlags flags, GError **error); -/* Properties */ +/*****************************************************************************/ + const GVariantType *nm_setting_get_dbus_property_type (NMSetting *setting, const char *property_name); +/*****************************************************************************/ + G_END_DECLS #endif /* __NM_SETTING_H__ */ |