Import Debian changes 1.12.2-0ubuntu3

network-manager (1.12.2-0ubuntu3) cosmic; urgency=medium

  * debian/rules:
    - use --with-libnm-glib, the default reversed since that's a legacy
      library but we still need it for unity-control-center

network-manager (1.12.2-0ubuntu2) cosmic; urgency=medium

  * debian/patches/git-newglib-test.patch:
    - backport upstream commit to fix the tests with the new glib 

network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium

  * New upstream version
  * d/p/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch,
    d/p/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch,
    d/p/git_thunderbolt_connect.patch:
    - removed, those changes are in the new version
  * Backport Debian changes
  * Update symbols file for libnm0
  * Enable iwd support
  * Drop version requirements when oldstable ships a newer version
  * Drop dh_strip override, the dbgsym migration is done
  * Rebase patches
  * Make sure the example server.conf is actually installed
  * Update install path for plugins, it now includes a version number
  * Drop libnl3 build dependency.
    Upstream has copied the code directly from libnl3 for the few functions it
    needs with a few small modifications.
  * Drop libiw build dependency.
    Hasn't been needed for a long time and was simply a left over from older
    releases.
  * Bump Standards-Version to 4.1.5
  * Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372)

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 {