denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nm: Port to libnm

Browse Source
This commit is contained in:
Lubomir Rintel
2016-09-05 15:39:43 +02:00
committed by Tobias Brunner
parent 0fa9863363
commit ae8082daa8
8 changed files with 63 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/gnome/auth-dialog/Makefile.am
+2 -2
View File
@@ -4,7 +4,7 @@ nm_strongswan_auth_dialog_CPPFLAGS = \
$(GTK_CFLAGS) \
$(LIBGNOMEUI_CFLAGS) \
$(LIBSECRET_CFLAGS) \
$(LIBNM_GLIB_CFLAGS) \
$(LIBNM_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
@@ -17,4 +17,4 @@ nm_strongswan_auth_dialog_LDADD = \
$(GTK_LIBS) \
$(LIBGNOMEUI_LIBS) \
$(LIBSECRET_LIBS) \
$(LIBNM_GLIB_LIBS)
$(LIBNM_LIBS)
src/frontends/gnome/auth-dialog/main.c
+4 -5
View File
@@ -24,10 +24,9 @@
#include <gtk/gtk.h>
#include <libsecret/secret.h>
#include <libgnomeui/libgnomeui.h>
#include <nm-vpn-plugin.h>
#include <nm-setting-vpn.h>
#include <nm-setting-connection.h>
#include <nm-vpn-plugin-utils.h>
#include <NetworkManager.h>
#include <nm-vpn-service-plugin.h>
#define NM_DBUS_SERVICE_STRONGSWAN "org.freedesktop.NetworkManager.strongswan"
@@ -66,7 +65,7 @@ static char* get_connection_type(char *uuid)
GHashTable *data = NULL, *secrets = NULL;
char *method;
if (!nm_vpn_plugin_utils_read_vpn_details (0, &data, &secrets)) {
if (!nm_vpn_service_plugin_read_vpn_details (0, &data, &secrets)) {
fprintf (stderr, "Failed to read data and secrets from stdin.\n");
return NULL;
}