[network-manager-openconnect/th/vpn-editor-split-bgo767690: 2/14] build/trivial: rename define NM_LIBRESWAN_OLD to NM_VPN_OLD

[Thomas Haller <thaller src gnome org>]

commit 0c5e63b5e2b549af143fd13d491055f5c74cbd2a
Author: Thomas Haller <thaller redhat com>
Date:   Tue Jun 14 16:38:19 2016 +0200

    build/trivial: rename define NM_LIBRESWAN_OLD to NM_VPN_OLD
    
    We use a define with the same purpose for other plugins. No need
    to name them different everywhere -- it just increases the diff.

 properties/Makefile.am      |    2 +-
 properties/auth-helpers.h   |    4 ++--
 properties/nm-openconnect.c |   10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 90269f5..46e4cd2 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -31,7 +31,7 @@ libnm_vpn_plugin_openconnect_la_CFLAGS =                \
        $(LIBNM_CFLAGS)
 
 libnm_openconnect_properties_la_CFLAGS =            \
-       -DNM_OPENCONNECT_OLD                            \
+       -DNM_VPN_OLD \
        $(common_CFLAGS)                                \
        $(LIBNM_GLIB_CFLAGS)
 
diff --git a/properties/auth-helpers.h b/properties/auth-helpers.h
index 19ac773..4f754ed 100644
--- a/properties/auth-helpers.h
+++ b/properties/auth-helpers.h
@@ -26,11 +26,11 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#ifdef NM_OPENCONNECT_OLD
+#ifdef NM_VPN_OLD
 #define NM_VPN_LIBNM_COMPAT
 #include <nm-connection.h>
 #include <nm-setting-vpn.h>
-#else /* !NM_OPENCONNECT_OLD */
+#else /* !NM_VPN_OLD */
 #include <NetworkManager.h>
 #endif
 
diff --git a/properties/nm-openconnect.c b/properties/nm-openconnect.c
index f2b7abd..46ecab6 100644
--- a/properties/nm-openconnect.c
+++ b/properties/nm-openconnect.c
@@ -49,7 +49,7 @@
 #define openconnect_has_oath_support() 0
 #endif
 
-#ifdef NM_OPENCONNECT_OLD
+#ifdef NM_VPN_OLD
 #define NM_VPN_LIBNM_COMPAT
 #include <nm-vpn-plugin-ui-interface.h>
 #include <nm-setting-vpn.h>
@@ -64,7 +64,7 @@
 #define OPENCONNECT_EDITOR_PLUGIN_ERROR                   NM_SETTING_VPN_ERROR
 #define OPENCONNECT_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY  NM_SETTING_VPN_ERROR_INVALID_PROPERTY
 
-#else /* !NM_OPENCONNECT_OLD */
+#else /* !NM_VPN_OLD */
 
 #include <NetworkManager.h>
 
@@ -76,7 +76,7 @@
 #include "nm-openconnect.h"
 #include "auth-helpers.h"
 
-#ifndef NM_OPENCONNECT_OLD
+#ifndef NM_VPN_OLD
 #include "nm-utils/nm-vpn-editor-plugin-call.h"
 #endif
 
@@ -810,7 +810,7 @@ get_capabilities (NMVpnEditorPlugin *iface)
                NM_VPN_EDITOR_PLUGIN_CAPABILITY_IPV6);
 }
 
-#ifndef NM_OPENCONNECT_OLD
+#ifndef NM_VPN_OLD
 static void
 notify_plugin_info_set (NMVpnEditorPlugin *plugin,
                         NMVpnPluginInfo *plugin_info)
@@ -979,7 +979,7 @@ openconnect_editor_plugin_interface_init (NMVpnEditorPluginInterface *iface_clas
        iface_class->get_capabilities = get_capabilities;
        iface_class->import_from_file = import;
        iface_class->export_to_file = export;
-#ifndef NM_OPENCONNECT_OLD
+#ifndef NM_VPN_OLD
        iface_class->notify_plugin_info_set = notify_plugin_info_set;
        iface_class->get_vt = _get_vt;
 #endif