Commit f4526060 authored by Dan Winship's avatar Dan Winship

libnm: rename NMVpnPlugin to NMVpnPluginOld

Rename libnm's NMVpnPlugin to NMVpnPluginOld, in preparation for
having a new-and-improved NMVpnPlugin in NM 1.2. Also remove it from
NM-1.0.gir.

Make nm-vpn-plugin-old.h be separately includable, since it's not
included from NetworkManager.h, and we probably don't want it to be.

Remove NMVpnPlugin, NMVpnPluginUiInterface, and nm-vpn-plugin-utils
from the docs, since they're basically undocumented anyway.
parent 1e9c5f41
......@@ -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"/>
......
......@@ -24,7 +24,7 @@ lib_LTLIBRARIES = libnm.la
libnmincludedir = $(includedir)/libnm
libnminclude_HEADERS = \
libnminclude_hfiles = \
NetworkManager.h \
nm-access-point.h \
nm-active-connection.h \
......@@ -53,11 +53,17 @@ 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
libnminclude_nointrospect_hfiles = \
nm-vpn-plugin-old.h
libnminclude_HEADERS = \
$(libnminclude_hfiles) \
$(libnminclude_nointrospect_hfiles)
libnm_la_private_headers = \
nm-dbus-helpers.h \
nm-device-private.h \
......@@ -98,7 +104,7 @@ libnm_la_csources = \
nm-remote-settings.c \
nm-secret-agent.c \
nm-vpn-connection.c \
nm-vpn-plugin.c \
nm-vpn-plugin-old.c \
nm-vpn-plugin-ui-interface.c \
nm-vpn-plugin-utils.c \
nm-wimax-nsp.c
......@@ -148,7 +154,7 @@ INTROSPECTION_COMPILER_ARGS = \
if HAVE_INTROSPECTION
introspection_sources = \
$(libnm_core_headers) \
$(libnminclude_HEADERS) \
$(libnminclude_hfiles) \
$(libnm_core_sources) \
$(libnm_la_csources)
......
......@@ -856,18 +856,18 @@ 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_old_disconnect;
nm_vpn_plugin_old_failure;
nm_vpn_plugin_old_get_connection;
nm_vpn_plugin_old_get_state;
nm_vpn_plugin_old_get_type;
nm_vpn_plugin_old_secrets_required;
nm_vpn_plugin_old_set_ip4_config;
nm_vpn_plugin_old_set_login_banner;
nm_vpn_plugin_old_set_state;
nm_vpn_plugin_ui_capability_get_type;
nm_vpn_plugin_ui_interface_export;
nm_vpn_plugin_ui_interface_get_capabilities;
......
......@@ -19,12 +19,8 @@
* Copyright 2007 - 2013 Red Hat, Inc.
*/
#ifndef __NM_VPN_PLUGIN_H__
#define __NM_VPN_PLUGIN_H__
#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
#error "Only <NetworkManager.h> can be included directly."
#endif
#ifndef __NM_VPN_PLUGIN_OLD_H__
#define __NM_VPN_PLUGIN_OLD_H__
#include <gio/gio.h>
#include <nm-vpn-dbus-interface.h>
......@@ -32,99 +28,99 @@
G_BEGIN_DECLS
#define NM_TYPE_VPN_PLUGIN (nm_vpn_plugin_get_type ())
#define NM_VPN_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_PLUGIN, NMVpnPlugin))
#define NM_VPN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_PLUGIN, NMVpnPluginClass))
#define NM_IS_VPN_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_PLUGIN))
#define NM_IS_VPN_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_PLUGIN))
#define NM_VPN_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_PLUGIN, NMVpnPluginClass))
#define NM_TYPE_VPN_PLUGIN_OLD (nm_vpn_plugin_old_get_type ())
#define NM_VPN_PLUGIN_OLD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_PLUGIN_OLD, NMVpnPluginOld))
#define NM_VPN_PLUGIN_OLD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_PLUGIN_OLD, NMVpnPluginOldClass))
#define NM_IS_VPN_PLUGIN_OLD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_PLUGIN_OLD))
#define NM_IS_VPN_PLUGIN_OLD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_VPN_PLUGIN_OLD))
#define NM_VPN_PLUGIN_OLD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_PLUGIN_OLD, NMVpnPluginOldClass))
#define NM_VPN_PLUGIN_DBUS_SERVICE_NAME "service-name"
#define NM_VPN_PLUGIN_STATE "state"
#define NM_VPN_PLUGIN_OLD_DBUS_SERVICE_NAME "service-name"
#define NM_VPN_PLUGIN_OLD_STATE "state"
typedef struct {
GObject parent;
} NMVpnPlugin;
} NMVpnPluginOld;
typedef struct {
GObjectClass parent;
/* Signals */
void (*state_changed) (NMVpnPlugin *plugin,
void (*state_changed) (NMVpnPluginOld *plugin,
NMVpnServiceState state);
void (*ip4_config) (NMVpnPlugin *plugin,
void (*ip4_config) (NMVpnPluginOld *plugin,
GVariant *ip4_config);
void (*login_banner) (NMVpnPlugin *plugin,
void (*login_banner) (NMVpnPluginOld *plugin,
const char *banner);
void (*failure) (NMVpnPlugin *plugin,
void (*failure) (NMVpnPluginOld *plugin,
NMVpnPluginFailure reason);
void (*quit) (NMVpnPlugin *plugin);
void (*quit) (NMVpnPluginOld *plugin);
void (*config) (NMVpnPlugin *plugin,
void (*config) (NMVpnPluginOld *plugin,
GVariant *config);
void (*ip6_config) (NMVpnPlugin *plugin,
void (*ip6_config) (NMVpnPluginOld *plugin,
GVariant *config);
/* virtual methods */
gboolean (*connect) (NMVpnPlugin *plugin,
gboolean (*connect) (NMVpnPluginOld *plugin,
NMConnection *connection,
GError **err);
gboolean (*need_secrets) (NMVpnPlugin *plugin,
gboolean (*need_secrets) (NMVpnPluginOld *plugin,
NMConnection *connection,
char **setting_name,
GError **error);
gboolean (*disconnect) (NMVpnPlugin *plugin,
gboolean (*disconnect) (NMVpnPluginOld *plugin,
GError **err);
gboolean (*new_secrets) (NMVpnPlugin *plugin,
gboolean (*new_secrets) (NMVpnPluginOld *plugin,
NMConnection *connection,
GError **error);
gboolean (*connect_interactive) (NMVpnPlugin *plugin,
gboolean (*connect_interactive) (NMVpnPluginOld *plugin,
NMConnection *connection,
GVariant *details,
GError **error);
/*< private >*/
gpointer padding[8];
} NMVpnPluginClass;
} NMVpnPluginOldClass;
GType nm_vpn_plugin_get_type (void);
GType nm_vpn_plugin_old_get_type (void);
GDBusConnection *nm_vpn_plugin_get_connection (NMVpnPlugin *plugin);
NMVpnServiceState nm_vpn_plugin_get_state (NMVpnPlugin *plugin);
void nm_vpn_plugin_set_state (NMVpnPlugin *plugin,
NMVpnServiceState state);
GDBusConnection *nm_vpn_plugin_old_get_connection (NMVpnPluginOld *plugin);
NMVpnServiceState nm_vpn_plugin_old_get_state (NMVpnPluginOld *plugin);
void nm_vpn_plugin_old_set_state (NMVpnPluginOld *plugin,
NMVpnServiceState state);
void nm_vpn_plugin_secrets_required (NMVpnPlugin *plugin,
const char *message,
const char **hints);
void nm_vpn_plugin_old_secrets_required (NMVpnPluginOld *plugin,
const char *message,
const char **hints);
void nm_vpn_plugin_set_login_banner (NMVpnPlugin *plugin,
const char *banner);
void nm_vpn_plugin_old_set_login_banner (NMVpnPluginOld *plugin,
const char *banner);
void nm_vpn_plugin_failure (NMVpnPlugin *plugin,
NMVpnPluginFailure reason);
void nm_vpn_plugin_old_failure (NMVpnPluginOld *plugin,
NMVpnPluginFailure reason);
void nm_vpn_plugin_set_config (NMVpnPlugin *plugin,
GVariant *config);
void nm_vpn_plugin_old_set_config (NMVpnPluginOld *plugin,
GVariant *config);
void nm_vpn_plugin_set_ip4_config (NMVpnPlugin *plugin,
GVariant *ip4_config);
void nm_vpn_plugin_old_set_ip4_config (NMVpnPluginOld *plugin,
GVariant *ip4_config);
void nm_vpn_plugin_set_ip6_config (NMVpnPlugin *plugin,
GVariant *ip6_config);
void nm_vpn_plugin_old_set_ip6_config (NMVpnPluginOld *plugin,
GVariant *ip6_config);
gboolean nm_vpn_plugin_disconnect (NMVpnPlugin *plugin,
GError **err);
gboolean nm_vpn_plugin_old_disconnect (NMVpnPluginOld *plugin,
GError **err);
G_END_DECLS
#endif /* __NM_VPN_PLUGIN_H__ */
#endif /* __NM_VPN_PLUGIN_OLD_H__ */
......@@ -24,7 +24,7 @@
#include <string.h>
#include "nm-vpn-plugin-utils.h"
#include "nm-vpn-plugin.h"
#include "nm-vpn-plugin-old.h"
#include "nm-core-internal.h"
#define DATA_KEY_TAG "DATA_KEY="
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment