From e152ec7bf4ba252ff9d3eb13eabd417b931dac9a Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 24 Sep 2018 09:29:55 +0100 Subject: Import Upstream version 1.12.2 --- libnm-util/nm-setting.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'libnm-util/nm-setting.h') diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h index ce5cf3f5..1470a69b 100644 --- a/libnm-util/nm-setting.h +++ b/libnm-util/nm-setting.h @@ -62,7 +62,6 @@ typedef enum #define NM_SETTING_ERROR nm_setting_error_quark () GQuark nm_setting_error_quark (void); - /* DEPRECATED AND UNUSED */ #define NM_SETTING_PARAM_SERIALIZE (1 << (0 + G_PARAM_USER_SHIFT)) @@ -79,7 +78,6 @@ GQuark nm_setting_error_quark (void); /* Note: all non-glib GParamFlags bits are reserved by NetworkManager */ - #define NM_SETTING_NAME "name" /** @@ -156,7 +154,6 @@ typedef enum { /* 0x80000000 is used for a private flag */ } NMSettingCompareFlags; - /** * NMSetting: * @@ -167,7 +164,6 @@ typedef struct { GObject parent; } NMSetting; - /** * NMSettingClearSecretsWithFlagsFn: * @setting: The setting for which secrets are being iterated @@ -241,7 +237,6 @@ typedef void (*NMSettingValueIterFn) (NMSetting *setting, GParamFlags flags, gpointer user_data); - GType nm_setting_get_type (void); /** -- cgit 1.3.0-6-gf8a5