libnm-core/Makefile
libnm-core/tests/Makefile
libnm/libnm.pc
-libnm/libnm-vpn.pc
libnm/Makefile
libnm/tests/Makefile
libnm-util/libnm-util.pc
GTKDOC_LIBS = \
$(top_builddir)/libnm/libnm.la \
- $(top_builddir)/libnm/libnm-vpn.la \
$(GLIB_LIBS)
-I$(top_builddir)/libnm \
-DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION \
- -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE
+ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(GUDEV_CFLAGS) \
+ -DNMRUNDIR=\"$(nmrundir)\"
include $(top_srcdir)/libnm-core/Makefile.libnm-core
lib_LTLIBRARIES = libnm.la
-libnm_la_CFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(GUDEV_CFLAGS) \
- -DNMRUNDIR=\"$(nmrundir)\"
-
libnmincludedir = $(includedir)/libnm
libnminclude_HEADERS = \
nm-remote-settings.h \
nm-secret-agent.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 = \
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 = \
nm-secret-agent-glue.h: $(top_srcdir)/introspection/nm-secret-agent.xml
$(AM_V_GEN) dbus-binding-tool --prefix=nm_secret_agent --mode=glib-server --output=$@ $<
+nm-vpn-plugin-glue.h: $(top_srcdir)/introspection/nm-vpn-plugin.xml
+ $(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=$@ $<
+
GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
nm_enum_types_sources = $(libnminclude_HEADERS)
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
libnm_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \
-version-info "0:0:0"
-
-# libnm-vpn
-
-lib_LTLIBRARIES += libnm-vpn.la
-
-libnmvpndir = $(includedir)/libnm
-
-libnmvpn_HEADERS = \
- nm-vpn-plugin.h \
- nm-vpn-plugin-ui-interface.h \
- nm-vpn-plugin-utils.h \
- nm-vpn-enum-types.h
-
-libnm_vpn_la_SOURCES = \
- nm-vpn-plugin.c \
- nm-vpn-plugin-ui-interface.c \
- nm-vpn-plugin-utils.c \
- nm-vpn-enum-types.c
-
-nm-vpn-plugin-glue.h: $(top_srcdir)/introspection/nm-vpn-plugin.xml
- $(AM_V_GEN) dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=$@ $<
-
-GLIB_GENERATED += nm-vpn-enum-types.h nm-vpn-enum-types.c
-nm_vpn_enum_types_sources = $(libnmvpn_HEADERS)
-libnm_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
-libnm_vpn_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS)
-libnm_vpn_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-vpn.ver \
- -version-info "0:0:0"
-
###
BUILT_SOURCES += $(GLIB_GENERATED)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libnm.pc libnm-vpn.pc
+pkgconfig_DATA = libnm.pc
-DISTCLEANFILES = libnm.pc libnm-vpn.pc
+DISTCLEANFILES = libnm.pc
-EXTRA_DIST = libnm.pc.in libnm-vpn.pc.in libnm.ver libnm-vpn.ver
+EXTRA_DIST = libnm.pc.in libnm.ver
CLEANFILES = $(BUILT_SOURCES)
+++ /dev/null
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libnm-vpn
-Description: Convenience library for NetworkManager VPN plugins
-Version: @VERSION@
-Requires: libnm >= @VERSION@ gio-2.0 dbus-glib-1
-Cflags: -I${includedir}/libnm
-Libs: -L${libdir} -lnm-vpn
-
-
+++ /dev/null
-{
-global:
- nm_vpn_plugin_disconnect;
- nm_vpn_plugin_error_get_type;
- nm_vpn_plugin_error_quark;
- nm_vpn_plugin_failure;
- 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_delete_connection;
- nm_vpn_plugin_ui_interface_export;
- nm_vpn_plugin_ui_interface_get_capabilities;
- nm_vpn_plugin_ui_interface_get_suggested_name;
- nm_vpn_plugin_ui_interface_get_type;
- nm_vpn_plugin_ui_interface_import;
- nm_vpn_plugin_ui_interface_prop_get_type;
- nm_vpn_plugin_ui_interface_ui_factory;
- nm_vpn_plugin_ui_widget_interface_get_type;
- nm_vpn_plugin_ui_widget_interface_get_widget;
- nm_vpn_plugin_ui_widget_interface_save_secrets;
- nm_vpn_plugin_ui_widget_interface_update_connection;
- nm_vpn_plugin_utils_get_secret_flags;
- nm_vpn_plugin_utils_read_vpn_details;
-local:
- *;
-};
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;
+ nm_vpn_plugin_ui_interface_get_suggested_name;
+ nm_vpn_plugin_ui_interface_get_type;
+ nm_vpn_plugin_ui_interface_import;
+ nm_vpn_plugin_ui_interface_prop_get_type;
+ nm_vpn_plugin_ui_interface_ui_factory;
+ 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;
}
+/**
+ * nm_vpn_plugin_ui_interface_ui_factory:
+ *
+ * Returns: (transfer full):
+ */
NMVpnPluginUiWidgetInterface *
nm_vpn_plugin_ui_interface_ui_factory (NMVpnPluginUiInterface *iface,
NMConnection *connection,
return NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE (iface)->get_capabilities (iface);
}
+/**
+ * nm_vpn_plugin_ui_interface_import:
+ *
+ * Returns: (transfer full):
+ */
NMConnection *
nm_vpn_plugin_ui_interface_import (NMVpnPluginUiInterface *iface,
const char *path,
return vpn_plugin_ui_widget_interface_type;
}
+/**
+ * nm_vpn_plugin_ui_widget_interface_get_widget:
+ *
+ * Returns: (transfer none):
+ */
GObject *
nm_vpn_plugin_ui_widget_interface_get_widget (NMVpnPluginUiWidgetInterface *iface)
{
/* Plugin's factory function that returns a GObject that implements
* NMVpnPluginUiInterface.
*/
+#ifndef __GI_SCANNER__
typedef NMVpnPluginUiInterface * (*NMVpnPluginUiFactory) (GError **error);
NMVpnPluginUiInterface *nm_vpn_plugin_ui_factory (GError **error);
+#endif
/**************************************************/
#include "nm-glib-compat.h"
#include "nm-vpn-plugin.h"
-#include "nm-vpn-enum-types.h"
+#include "nm-enum-types.h"
#include "nm-utils.h"
#include "nm-dbus-glib-types.h"
GType nm_vpn_plugin_get_type (void);
GQuark nm_vpn_plugin_error_quark (void);
-GType nm_vpn_plugin_error_get_type (void);
DBusGConnection *nm_vpn_plugin_get_connection (NMVpnPlugin *plugin);
NMVpnServiceState nm_vpn_plugin_get_state (NMVpnPlugin *plugin);