[network-manager-iodine: 4/10] Drop old nm-glib compat code

[Guido Günther <guidog src gnome org>]

commit dca561224903ea0dc68fdd77011fc47e59dae961
Author: Guido Günther <agx sigxcpu org>
Date:   Thu Dec 23 23:19:37 2021 +0100

    Drop old nm-glib compat code

 Makefile.am            | 15 ---------------
 configure.ac           | 20 +-------------------
 properties/Makefile.am |  6 ++----
 properties/nm-iodine.c | 15 ---------------
 4 files changed, 3 insertions(+), 53 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 357132d..19a6f43 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,21 +16,6 @@ dbusservice_DATA = nm-iodine-service.conf
 nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
 nmvpnservice_DATA = nm-iodine-service.name
 
-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 $(NM_VPN_SERVICE_DIR)\n\n|" \
-           -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
-           -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
-           <$(srcdir)/nm-iodine-service.name.in \
-           >$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-iodine-service.name
-
-uninstall-hook:
-       rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-iodine-service.name
-endif
-
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdata_in_files = appdata/network-manager-iodine.metainfo.xml.in
diff --git a/configure.ac b/configure.ac
index 936511d..028df5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,9 +45,6 @@ AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
 AC_ARG_WITH(authdlg, AS_HELP_STRING([--without-authdlg], [Build NetworkManager-iodine without authentication 
dialog]))
 AM_CONDITIONAL(WITH_AUTHDLG, test x"$with_authdlg" != xno)
 
-AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-iodine without 
libnm-glib comatibility]))
-AM_CONDITIONAL(WITH_LIBNM_GLIB, test x"$with_libnm_glib" != xno)
-
 AC_ARG_ENABLE(absolute-paths, AS_HELP_STRING([--enable-absolute-paths], [Use absolute paths to in .name 
files. Useful for development. (default is no)]))
 
 GETTEXT_PACKAGE=NetworkManager-iodine
@@ -58,22 +55,7 @@ IT_PROG_INTLTOOL([0.35])
 AM_GLIB_GNU_GETTEXT
 
 if test x"$with_gnome" != xno; then
-       gtk3_req=2.91.4
-       PKG_CHECK_MODULES(GTK, gtk+-3.0 > $gtk3_req, ,
-                         [PKG_CHECK_MODULES(GTK, gtk+-2.0 > $gtk2_req)])
-
-       PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0)
-        PKG_CHECK_MODULES(LIBSECRET, libsecret-1)
-
-       if test x"$with_libnm_glib" != xno; then
-               PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 0.9.9.0)
-               PKG_CHECK_MODULES(LIBNM_GLIB,
-                                 NetworkManager >= 1.1.0
-                                 libnm-util >= 1.1.0
-                                 libnm-glib  >= 1.1.0
-                                 libnm-glib-vpn >= 1.1.0)
-       fi
-
+       with_gnome=yes
 fi
 
 PKG_CHECK_MODULES(LIBNM, libnm >= 1.1.0)
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 6edc5bc..bf6cf8d 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -1,6 +1,6 @@
 plugindir = $(libdir)/NetworkManager
 plugin_LTLIBRARIES = libnm-vpn-plugin-iodine.la
-if WITH_LIBNM_GLIB
+if WITH_GNOME
 plugin_LTLIBRARIES += libnm-iodine-properties.la
 endif
 
@@ -32,7 +32,6 @@ libnm_vpn_plugin_iodine_la_CFLAGS =                     \
 
 libnm_iodine_properties_la_CFLAGS =                     \
         -DNM_IODINE_OLD                                 \
-        $(LIBNM_GLIB_CFLAGS)                            \
         $(common_CFLAGS)
 
 libnm_vpn_plugin_iodine_la_LIBADD =                     \
@@ -41,8 +40,7 @@ libnm_vpn_plugin_iodine_la_LIBADD =                     \
         $(LIBNM_LIBS)
 
 libnm_iodine_properties_la_LIBADD =                     \
-        $(GTK_LIBS)                                     \
-        $(LIBNM_GLIB_LIBS)
+        $(GTK_LIBS)
 
 libnm_vpn_plugin_iodine_la_LDFLAGS =                    \
         -avoid-version
diff --git a/properties/nm-iodine.c b/properties/nm-iodine.c
index 50e4036..39aef8b 100644
--- a/properties/nm-iodine.c
+++ b/properties/nm-iodine.c
@@ -33,26 +33,11 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#ifdef NM_IODINE_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-setting-ip4-config.h>
-
-#define nm_simple_connection_new nm_connection_new
-
-#define IODINE_EDITOR_PLUGIN_ERROR                     NM_SETTING_VPN_ERROR
-#define IODINE_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY    NM_SETTING_VPN_ERROR_INVALID_PROPERTY
- 
-#else /* !NM_IODINE_OLD */
-
 #include <NetworkManager.h>
 #include <nma-ui-utils.h>
 
 #define IODINE_EDITOR_PLUGIN_ERROR                     NM_CONNECTION_ERROR
 #define IODINE_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY    NM_CONNECTION_ERROR_INVALID_PROPERTY
-#endif
 
 #include "nm-iodine-service-defines.h"
 #include "nm-iodine.h"