nm: Remove old libnm-glib compat stuff

This shouldn't be necessary anymore.

diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am
index 646d913a24aaaeb1877f72ac1224338442f3308d..3dd41a3bc7c82cae217089edc98b3cd913cfa64d 100644 (file)
--- a/src/frontends/gnome/Makefile.am
+++ b/src/frontends/gnome/Makefile.am
@@ -11,23 +11,6 @@ metainfo_DATA = $(metainfo_in_files:.xml.in=.xml)
 metainfo_in_files = NetworkManager-strongswan.metainfo.xml.in
 @INTLTOOL_XML_RULE@
 
-if WITH_LIBNM_GLIB
-# Install a file with full path to plugins for an old gnome-shell
-# https://bugzilla.gnome.org/show_bug.cgi?id=693590
-install-data-hook:
-       mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN
-       sed -e "1s|^|# This file is obsoleted by a file in $(nmvpnservicedir)\n\n|" \
-           -e 's|[@]NM_LIBEXECDIR[@]|$(nm_libexecdir)|g' \
-           -e 's|[@]NM_PLUGINDIR[@]|$(nm_plugindir)|g' \
-           -e 's|[@]NM_PLUGINDIR_ABS[@]|$(nm_plugindir)|g' \
-           -e 's|[@]CHARON[@]|$(charon)|' \
-           <$(srcdir)/nm-strongswan-service.name.in \
-           >$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-strongswan-service.name
-
-uninstall-hook:
-        rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-strongswan-service.name
-endif
-
 nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
        $(AM_V_GEN) \
        sed -e 's|[@]NM_LIBEXECDIR[@]|$(nm_libexecdir)|' \

diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac
index f92049bf582349a0c7c88b3d64cef9a3cfe352df..8dd57ed8821f42f39d9589fc78264e7836a4624d 100644 (file)
--- a/src/frontends/gnome/configure.ac
+++ b/src/frontends/gnome/configure.ac
@@ -66,36 +66,17 @@ AC_ARG_ENABLE(
        [nm-absolute-paths],
        AS_HELP_STRING([--enable-nm-absolute-paths],[use absolute paths for NM plugins in the .name file])
 )
-AC_ARG_WITH(
-       [libnm-glib],
-       AS_HELP_STRING([--without-libnm-glib], [build NetworkManager-strongswan without libnm-glib compatibility]),
-       [with_libnm_glib=no],
-       [with_libnm_glib=yes]
-)
-
-AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
 
 PKG_CHECK_MODULES(LIBNM, libnm >= 1.1.0)
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
 LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2"
 PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0)
 
-if test x"$with_libnm_glib" != xno; then
-       PKG_CHECK_MODULES(LIBNM_GLIB, NetworkManager >= 1.1.0 libnm-util libnm-glib libnm-glib-vpn)
-       PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.1.0)
-       if test -z "$nm_libexecdir"; then
-               nm_libexecdir=$($PKG_CONFIG --variable=libgnome_serverdir NetworkManager)
-       fi
-       if test -z "$nm_plugindir"; then
-               nm_plugindir=$($PKG_CONFIG --variable=plugindir NetworkManager)
-       fi
-else
-       if test -z "$nm_libexecdir"; then
-               nm_libexecdir=$($PKG_CONFIG --variable=exec_prefix libnm)/lib/NetworkManager
-       fi
-       if test -z "$nm_plugindir"; then
-               nm_plugindir=$($PKG_CONFIG --variable=libdir libnm)/NetworkManager
-       fi
+if test -z "$nm_libexecdir"; then
+       nm_libexecdir=$($PKG_CONFIG --variable=exec_prefix libnm)/lib/NetworkManager
+fi
+if test -z "$nm_plugindir"; then
+       nm_plugindir=$($PKG_CONFIG --variable=libdir libnm)/NetworkManager
 fi
 
 AC_SUBST(nm_libexecdir)

diff --git a/src/frontends/gnome/nm-strongswan-service.name.in b/src/frontends/gnome/nm-strongswan-service.name.in
index f52eec26dfa96a4adcc851dcb85f4734232ab6b6..373262a41a46ab81f3d8fe9866008977ba4660a5 100644 (file)
--- a/src/frontends/gnome/nm-strongswan-service.name.in
+++ b/src/frontends/gnome/nm-strongswan-service.name.in
@@ -8,5 +8,4 @@ plugin=@NM_PLUGINDIR@/libnm-vpn-plugin-strongswan.so
 
 [GNOME]
 auth-dialog=@NM_LIBEXECDIR@/nm-strongswan-auth-dialog
-properties=@NM_PLUGINDIR_ABS@/libnm-strongswan-properties
 supports-external-ui-mode=true

diff --git a/src/frontends/gnome/properties/Makefile.am b/src/frontends/gnome/properties/Makefile.am
index 317305d6fa02c11517ece1917e06328009e3eb52..3906872527b05ceec388d5e8757393746405beb7 100644 (file)
--- a/src/frontends/gnome/properties/Makefile.am
+++ b/src/frontends/gnome/properties/Makefile.am
@@ -1,16 +1,9 @@
 nm_plugin_LTLIBRARIES = libnm-vpn-plugin-strongswan.la
 
-if WITH_LIBNM_GLIB
-nm_plugin_LTLIBRARIES += libnm-strongswan-properties.la
-endif
-
 libnm_vpn_plugin_strongswan_la_SOURCES = \
        nm-strongswan.c \
        nm-strongswan.h
 
-libnm_strongswan_properties_la_SOURCES = \
-       $(libnm_vpn_plugin_strongswan_la_SOURCES)
-
 uidir = $(datadir)/gnome-vpn-properties/strongswan
 ui_DATA = nm-strongswan-dialog.ui
 
@@ -25,26 +18,12 @@ libnm_vpn_plugin_strongswan_la_CFLAGS = \
        $(LIBNMA_CFLAGS) \
        $(common_CFLAGS)
 
-libnm_strongswan_properties_la_CFLAGS = \
-       -DNM_STRONGSWAN_OLD \
-       $(LIBNM_GTK_CFLAGS) \
-       $(LIBNM_GLIB_CFLAGS) \
-       $(common_CFLAGS)
-
 libnm_vpn_plugin_strongswan_la_LIBADD = \
        $(GTK_LIBS) \
        $(LIBNMA_LIBS) \
        $(LIBNM_LIBS)
 
-libnm_strongswan_properties_la_LIBADD = \
-       $(GTK_LIBS) \
-       $(LIBNM_GTK_LIBS) \
-       $(LIBNM_GLIB_LIBS)
-
 libnm_vpn_plugin_strongswan_la_LDFLAGS = \
        -avoid-version
 
-libnm_strongswan_properties_la_LDFLAGS = \
-       $(libnm_vpn_plugin_strongswan_la_LDFLAGS)
-
 EXTRA_DIST = $(ui_DATA)

diff --git a/src/frontends/gnome/properties/nm-strongswan.c b/src/frontends/gnome/properties/nm-strongswan.c
index 07bfb1c5630967b719c373443a28f196eb026bad..e42074ab644624a2e1636d45c93b43d00138f4b6 100644 (file)
--- a/src/frontends/gnome/properties/nm-strongswan.c
+++ b/src/frontends/gnome/properties/nm-strongswan.c
@@ -27,16 +27,8 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#ifdef NM_STRONGSWAN_OLD
-#define NM_VPN_LIBNM_COMPAT
-#include <nm-vpn-plugin-ui-interface.h>
-#include <nm-setting-vpn.h>
-#include <nm-setting-connection.h>
-#include <nm-ui-utils.h>
-#else
 #include <NetworkManager.h>
 #include <nma-ui-utils.h>
-#endif
 
 #include "nm-strongswan.h"