[network-manager-pptp/lr/libnm: 8/14] fixup! all: port pptp plugin to libnm
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-pptp/lr/libnm: 8/14] fixup! all: port pptp plugin to libnm
- Date: Sat, 15 Aug 2015 23:05:33 +0000 (UTC)
commit 26ab35587e07904914672a898902436be12c7488
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Sat Jul 25 09:56:38 2015 +0200
fixup! all: port pptp plugin to libnm
libnm and libnm-gtk can't mix; use libnma instead.
auth-dialog/Makefile.am | 4 ++--
configure.ac | 4 ++--
properties/Makefile.am | 4 ++--
properties/advanced-dialog.c | 2 +-
properties/import-export.c | 2 +-
properties/nm-pptp.c | 1 +
6 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 3ba28fc..28847e9 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -4,7 +4,7 @@ nm_pptp_auth_dialog_CPPFLAGS = \
$(LIBNM_GLIB_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
- $(NMGTK_CFLAGS) \
+ $(LIBNM_GTK_CFLAGS) \
$(LIBSECRET_CFLAGS) \
-I${top_srcdir} \
-DICONDIR=\""$(datadir)/pixmaps"\" \
@@ -19,7 +19,7 @@ nm_pptp_auth_dialog_SOURCES = \
nm_pptp_auth_dialog_LDADD = \
$(LIBNM_GLIB_LIBS) \
$(GTK_LIBS) \
- $(NMGTK_LIBS) \
+ $(LIBNM_GTK_LIBS) \
$(LIBSECRET_LIBS)
CLEANFILES = *~
diff --git a/configure.ac b/configure.ac
index 2d4638b..b94e478 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,8 +75,8 @@ if test x"$with_gnome" != xno; then
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
- PKG_CHECK_MODULES(NMGTK, libnm-gtk >= 0.9.10)
-
+ PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 0.9.10)
+ PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0)
PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
fi
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 39f8f40..c759ffa 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -17,7 +17,7 @@ ui_DATA = nm-pptp-dialog.ui
libnm_pptp_properties_la_CFLAGS = \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
- $(NMGTK_CFLAGS) \
+ $(LIBNMA_CFLAGS) \
$(LIBNM_CFLAGS) \
-I$(top_srcdir)/src \
-DICONDIR=\""$(datadir)/pixmaps"\" \
@@ -29,7 +29,7 @@ libnm_pptp_properties_la_CFLAGS = \
libnm_pptp_properties_la_LIBADD = \
$(GTK_LIBS) \
$(LIBNM_LIBS) \
- $(NMGTK_LIBS)
+ $(LIBNMA_LIBS)
libnm_pptp_properties_la_LDFLAGS = \
-avoid-version
diff --git a/properties/advanced-dialog.c b/properties/advanced-dialog.c
index 7429319..10bb848 100644
--- a/properties/advanced-dialog.c
+++ b/properties/advanced-dialog.c
@@ -39,7 +39,7 @@
#include "advanced-dialog.h"
#include "nm-pptp.h"
-#include "../src/nm-pptp-service.h"
+#include "../src/nm-pptp-service-defines.h"
#define COL_NAME 0
#define COL_VALUE 1
diff --git a/properties/import-export.c b/properties/import-export.c
index c9cb1b7..5ef040c 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -38,7 +38,7 @@
#include "import-export.h"
#include "nm-pptp.h"
-#include "../src/nm-pptp-service.h"
+#include "../src/nm-pptp-service-defines.h"
NMConnection *
do_import (const char *path, char **lines, GError **error)
diff --git a/properties/nm-pptp.c b/properties/nm-pptp.c
index e017716..8f3070f 100644
--- a/properties/nm-pptp.c
+++ b/properties/nm-pptp.c
@@ -35,6 +35,7 @@
#include <gtk/gtk.h>
#include <NetworkManager.h>
+#include <nma-ui-utils.h>
#include "nm-pptp-service-defines.h"
#include "nm-pptp.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]