libnm: drop NMVpnPlugin (for now)danw/novpnplugin-bgo739072

We want to improve the VPN plugin interface, so drop NMVpnPlugin from
libnm for 1.0; VPN plugins can continue to be built against
libnm-glib-vpn.

6 files changed, 3 insertions, 73 deletions

diff --git a/docs/libnm/Makefile.am b/docs/libnm/Makefile.am
index 1e1e9ae276..f3422eda84 100644
--- a/docs/libnm/Makefile.am
+++ b/docs/libnm/Makefile.am
@@ -42,7 +42,9 @@ IGNORE_HFILES= \
 	nm-remote-settings.h \
 	nm-setting-private.h \
 	nm-types-private.h \
-	nm-utils-private.h
+	nm-utils-private.h \
+	nm-vpn-plugin.h \
+	nm-vpn-plugin-utils.h
 
 # Images to copy into HTML directory.
 HTML_IMAGES = libnm.png
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml
index 00eba8abb2..007cbe4108 100644
--- a/docs/libnm/libnm-docs.xml
+++ b/docs/libnm/libnm-docs.xml
@@ -138,13 +138,6 @@
     <xi:include href="xml/nm-utils.xml"/>
   </chapter>
 
-  <chapter>
-    <title>VPN Plugin API Reference </title>
-    <xi:include href="xml/nm-vpn-plugin.xml"/>
-    <xi:include href="xml/nm-vpn-plugin-ui-interface.xml"/>
-    <xi:include href="xml/nm-vpn-plugin-utils.xml"/>
-  </chapter>
-
   <chapter id="object-tree">
     <title>Object Hierarchy</title>
      <xi:include href="xml/tree_index.sgml"/>
diff --git a/libnm-core/nm-errors.c b/libnm-core/nm-errors.c
index 105425504c..9b021a1f9a 100644
--- a/libnm-core/nm-errors.c
+++ b/libnm-core/nm-errors.c
@@ -34,7 +34,6 @@ G_DEFINE_QUARK (nm-device-error-quark, nm_device_error)
 G_DEFINE_QUARK (nm-manager-error-quark, nm_manager_error)
 G_DEFINE_QUARK (nm-secret-agent-error-quark, nm_secret_agent_error)
 G_DEFINE_QUARK (nm-settings-error-quark, nm_settings_error)
-G_DEFINE_QUARK (nm-vpn-plugin-quark, nm_vpn_plugin_error)
 
 static void
 register_error_domain (GQuark domain,
@@ -82,7 +81,4 @@ _nm_dbus_errors_init (void)
 	register_error_domain (NM_SETTINGS_ERROR,
 	                       NM_DBUS_INTERFACE_SETTINGS,
 	                       NM_TYPE_SETTINGS_ERROR);
-	register_error_domain (NM_VPN_PLUGIN_ERROR,
-	                       NM_VPN_DBUS_PLUGIN_INTERFACE,
-	                       NM_TYPE_VPN_PLUGIN_ERROR);
 }
diff --git a/libnm-core/nm-errors.h b/libnm-core/nm-errors.h
index fa6919c569..c3c26e8763 100644
--- a/libnm-core/nm-errors.h
+++ b/libnm-core/nm-errors.h
@@ -272,48 +272,4 @@ typedef enum {
 GQuark nm_settings_error_quark (void);
 #define NM_SETTINGS_ERROR (nm_settings_error_quark ())
 
-/**
- * NMVpnPluginError:
- * @NM_VPN_PLUGIN_ERROR_FAILED: unknown or unclassified error
- * @NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS: the plugin is already starting,
- *   and another connect request was received
- * @NM_VPN_PLUGIN_ERROR_ALREADY_STARTED: the plugin is already connected, and
- *   another connect request was received
- * @NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS: the plugin is already stopping,
- *   and another stop request was received
- * @NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED: the plugin is already stopped, and
- *   another disconnect request was received
- * @NM_VPN_PLUGIN_ERROR_WRONG_STATE: the operation could not be performed in
- *   this state
- * @NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS: the operation could not be performed as
- *   the request contained malformed arguments, or arguments of unexpected type.
- *   Usually means that one of the VPN setting data items or secrets was not of
- *   the expected type (ie int, string, bool, etc).
- * @NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED: a child process failed to launch
- * @NM_VPN_PLUGIN_ERROR_INVALID_CONNECTION: the operation could not be performed
- *   because the connection was invalid.  Usually means that the connection's
- *   VPN setting was missing some required data item or secret.
- * @NM_VPN_PLUGIN_ERROR_INTERACTIVE_NOT_SUPPORTED: the operation could not be
- *   performed as the plugin does not support interactive operations, such as
- *   ConnectInteractive() or NewSecrets()
- *
- * Returned by the VPN service plugin to indicate errors. These codes correspond
- * to errors in the "org.freedesktop.NetworkManager.VPN.Error" namespace.
- **/
-typedef enum {
-	NM_VPN_PLUGIN_ERROR_FAILED,                    /*< nick=Failed >*/
-	NM_VPN_PLUGIN_ERROR_STARTING_IN_PROGRESS,      /*< nick=StartingInProgress >*/
-	NM_VPN_PLUGIN_ERROR_ALREADY_STARTED,           /*< nick=AlreadyStarted >*/
-	NM_VPN_PLUGIN_ERROR_STOPPING_IN_PROGRESS,      /*< nick=StoppingInProgress >*/
-	NM_VPN_PLUGIN_ERROR_ALREADY_STOPPED,           /*< nick=AlreadyStopped >*/
-	NM_VPN_PLUGIN_ERROR_WRONG_STATE,               /*< nick=WrongState >*/
-	NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,             /*< nick=BadArguments >*/
-	NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED,             /*< nick=LaunchFailed >*/
-	NM_VPN_PLUGIN_ERROR_INVALID_CONNECTION,        /*< nick=InvalidConnection >*/
-	NM_VPN_PLUGIN_ERROR_INTERACTIVE_NOT_SUPPORTED, /*< nick=InteractiveNotSupported >*/
-} NMVpnPluginError;
-
-#define NM_VPN_PLUGIN_ERROR      (nm_vpn_plugin_error_quark ())
-GQuark nm_vpn_plugin_error_quark    (void);
-
 #endif /* __NM_ERRORS_H__ */
diff --git a/libnm/Makefile.am b/libnm/Makefile.am
index 458aee8860..d0fff8acb6 100644
--- a/libnm/Makefile.am
+++ b/libnm/Makefile.am
@@ -53,9 +53,7 @@ libnminclude_HEADERS =			\
 	nm-secret-agent.h		\
 	nm-types.h			\
 	nm-vpn-connection.h		\
-	nm-vpn-plugin.h			\
 	nm-vpn-plugin-ui-interface.h	\
-	nm-vpn-plugin-utils.h		\
 	nm-wimax-nsp.h
 
 libnm_la_private_headers =		\
@@ -98,9 +96,7 @@ libnm_la_csources =			\
 	nm-remote-settings.c		\
 	nm-secret-agent.c		\
 	nm-vpn-connection.c		\
-	nm-vpn-plugin.c			\
 	nm-vpn-plugin-ui-interface.c	\
-	nm-vpn-plugin-utils.c		\
 	nm-wimax-nsp.c
 
 libnm_la_SOURCES =			\
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 54d6057327..f0b261249c 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -856,18 +856,7 @@ global:
 	nm_vpn_connection_get_vpn_state;
 	nm_vpn_connection_state_get_type;
 	nm_vpn_connection_state_reason_get_type;
-	nm_vpn_plugin_disconnect;
-	nm_vpn_plugin_error_get_type;
-	nm_vpn_plugin_error_quark;
-	nm_vpn_plugin_failure;
 	nm_vpn_plugin_failure_get_type;
-	nm_vpn_plugin_get_connection;
-	nm_vpn_plugin_get_state;
-	nm_vpn_plugin_get_type;
-	nm_vpn_plugin_secrets_required;
-	nm_vpn_plugin_set_ip4_config;
-	nm_vpn_plugin_set_login_banner;
-	nm_vpn_plugin_set_state;
 	nm_vpn_plugin_ui_capability_get_type;
 	nm_vpn_plugin_ui_interface_export;
 	nm_vpn_plugin_ui_interface_get_capabilities;
@@ -879,8 +868,6 @@ global:
 	nm_vpn_plugin_ui_widget_interface_get_type;
 	nm_vpn_plugin_ui_widget_interface_get_widget;
 	nm_vpn_plugin_ui_widget_interface_update_connection;
-	nm_vpn_plugin_utils_get_secret_flags;
-	nm_vpn_plugin_utils_read_vpn_details;
 	nm_vpn_service_state_get_type;
 	nm_wep_key_type_get_type;
 	nm_wimax_nsp_connection_valid;