diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-07-29 23:26:52 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-07-29 23:33:31 +0200 |
| commit | 3e39e5b4f04aa1ad16b226ae687413d02aa5b8eb (patch) | |
| tree | 345be85fe931b3f65489e36e47da1e38b170ba25 /libnm/NetworkManager.h | |
| parent | 5f7f38a5867338d910fd10a49957d2796dce9435 (diff) | |
| parent | 6be8a1f5495a6fb73f591cb47dd53a00cfda778b (diff) | |
libnm: merge branch 'th/libnm-vpn-plugin-bgo749877'
- add new NMVpnPluginInfo class with new API to load
VPN name files.
- move NMVpnEditorPlugin to libnm-core, including code
to load the client plugin from the shared library.
- deprecate NMVpnPluginOld and add NMVpnServicePlugin.
The latter is identical to NMVpnPluginOld but renamed
and introduced as new API for 1.2.
https://bugzilla.gnome.org/show_bug.cgi?id=749877
Diffstat (limited to 'libnm/NetworkManager.h')
| -rw-r--r-- | libnm/NetworkManager.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h index 251a042216..085437e6f5 100644 --- a/libnm/NetworkManager.h +++ b/libnm/NetworkManager.h @@ -81,7 +81,9 @@ #include <nm-version.h> #include <nm-vpn-connection.h> #include <nm-vpn-dbus-interface.h> +#include <nm-vpn-editor.h> #include <nm-vpn-editor-plugin.h> +#include <nm-vpn-plugin-info.h> #include <nm-wimax-nsp.h> #undef __NETWORKMANAGER_H_INSIDE__ |