From de06e5715e780baade318f3490ac7a4c9ce84e32 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 24 Mar 2012 01:37:02 +0100 Subject: Imported Upstream version 0.9.4.0 --- libnm-util/nm-setting.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libnm-util/nm-setting.h') diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h index 3edf2a1f..6cc6ed3e 100644 --- a/libnm-util/nm-setting.h +++ b/libnm-util/nm-setting.h @@ -54,15 +54,12 @@ G_BEGIN_DECLS **/ typedef enum { - NM_SETTING_ERROR_UNKNOWN = 0, - NM_SETTING_ERROR_PROPERTY_NOT_FOUND, - NM_SETTING_ERROR_PROPERTY_NOT_SECRET, - NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH + NM_SETTING_ERROR_UNKNOWN = 0, /*< nick=UnknownError >*/ + NM_SETTING_ERROR_PROPERTY_NOT_FOUND, /*< nick=PropertyNotFound >*/ + NM_SETTING_ERROR_PROPERTY_NOT_SECRET, /*< nick=PropertyNotSecret >*/ + NM_SETTING_ERROR_PROPERTY_TYPE_MISMATCH /*< nick=PropertyTypeMismatch >*/ } NMSettingError; -#define NM_TYPE_SETTING_ERROR (nm_setting_error_get_type ()) -GType nm_setting_error_get_type (void); - #define NM_SETTING_ERROR nm_setting_error_quark () GQuark nm_setting_error_quark (void); @@ -203,9 +200,10 @@ typedef struct { NMSettingClearSecretsWithFlagsFn func, gpointer user_data); + const char *(*get_virtual_iface_name) (NMSetting *setting); + /* Padding for future expansion */ void (*_reserved1) (void); - void (*_reserved2) (void); } NMSettingClass; /** @@ -308,6 +306,8 @@ gboolean nm_setting_set_secret_flags (NMSetting *setting, NMSettingSecretFlags flags, GError **error); +const char *nm_setting_get_virtual_iface_name (NMSetting *setting); + G_END_DECLS #endif /* NM_SETTING_H */ -- cgit 1.3.0-6-gf8a5