Update upstream source from tag 'upstream/1.11.4'

Update to upstream version '1.11.4'
with Debian dir d0638aa2e32d5bae4e8daa021b9a66b7c4d6647e

1 files changed, 0 insertions, 23 deletions

diff --git a/src/settings/nm-settings-plugin.h b/src/settings/nm-settings-plugin.h
index 97bb7b65..6fba25e7 100644
--- a/src/settings/nm-settings-plugin.h
+++ b/src/settings/nm-settings-plugin.h
@@ -34,33 +34,10 @@ GObject * nm_settings_plugin_factory (void);
 #define NM_IS_SETTINGS_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTINGS_PLUGIN))
 #define NM_SETTINGS_PLUGIN_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), NM_TYPE_SETTINGS_PLUGIN, NMSettingsPluginInterface))
 
-
-#define NM_SETTINGS_PLUGIN_NAME "name"
-#define NM_SETTINGS_PLUGIN_INFO "info"
-#define NM_SETTINGS_PLUGIN_CAPABILITIES "capabilities"
-
 #define NM_SETTINGS_PLUGIN_UNMANAGED_SPECS_CHANGED "unmanaged-specs-changed"
 #define NM_SETTINGS_PLUGIN_UNRECOGNIZED_SPECS_CHANGED "unrecognized-specs-changed"
 #define NM_SETTINGS_PLUGIN_CONNECTION_ADDED "connection-added"
 
-typedef enum {
-	NM_SETTINGS_PLUGIN_CAP_NONE = 0x00000000,
-	NM_SETTINGS_PLUGIN_CAP_MODIFY_CONNECTIONS = 0x00000001,
-
-	/* When adding more capabilities, be sure to update the "Capabilities"
-	 * property max value in nm-settings-plugin.c.
-	 */
-} NMSettingsPluginCapabilities;
-
-typedef enum {
-	NM_SETTINGS_PLUGIN_PROP_FIRST = 0x1000,
-
-	NM_SETTINGS_PLUGIN_PROP_NAME = NM_SETTINGS_PLUGIN_PROP_FIRST,
-	NM_SETTINGS_PLUGIN_PROP_INFO,
-	NM_SETTINGS_PLUGIN_PROP_CAPABILITIES,
-} NMSettingsPluginProp;
-
-
 typedef struct _NMSettingsPlugin NMSettingsPlugin;
 
 typedef struct {