[network-manager-libreswan/th/vpn-editor-split: 3/18] build/trivial: rename define NM_LIBRESWAN_OLD to NM_VPN_OLD

[Thomas Haller <thaller src gnome org>]

commit 4733e8c62d233e6ee332e02c802f1eb70b91e059
Author: Thomas Haller <thaller redhat com>
Date:   Tue May 10 09:35:15 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.

 common/Makefile.am        |    2 +-
 common/utils.c            |    2 +-
 properties/Makefile.am    |    2 +-
 properties/nm-libreswan.c |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/common/Makefile.am b/common/Makefile.am
index 5cce395..a68dfcb 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -19,6 +19,6 @@ libnm_libreswan_common_la_CPPFLAGS = \
        $(common_CPPFLAGS)
 
 libnm_vpn_plugin_libreswan_common_la_CPPFLAGS = \
-       -DNM_LIBRESWAN_OLD \
+       -DNM_VPN_OLD \
        $(LIBNM_GLIB_CFLAGS) \
        $(common_CPPFLAGS)
diff --git a/common/utils.c b/common/utils.c
index 3219dab..f46c11a 100644
--- a/common/utils.c
+++ b/common/utils.c
@@ -26,7 +26,7 @@
 #include <glib.h>
 #include <NetworkManager.h>
 
-#ifdef NM_LIBRESWAN_OLD
+#ifdef NM_VPN_OLD
 #define NM_VPN_LIBNM_COMPAT
 #include <nm-connection.h>
 #define nm_simple_connection_new nm_connection_new
diff --git a/properties/Makefile.am b/properties/Makefile.am
index ee96307..7865925 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -19,7 +19,7 @@ libnm_vpn_plugin_libreswan_la_CFLAGS = \
        $(LIBNMA_CFLAGS)
 
 libnm_libreswan_properties_la_CFLAGS = \
-       -DNM_LIBRESWAN_OLD \
+       -DNM_VPN_OLD \
        $(common_CFLAGS) \
        $(LIBNM_GLIB_CFLAGS) \
        $(LIBNM_GTK_CFLAGS)
diff --git a/properties/nm-libreswan.c b/properties/nm-libreswan.c
index 12b9b37..a510168 100644
--- a/properties/nm-libreswan.c
+++ b/properties/nm-libreswan.c
@@ -36,7 +36,7 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#ifdef NM_LIBRESWAN_OLD
+#ifdef NM_VPN_OLD
 #define NM_VPN_LIBNM_COMPAT
 
 #include <nm-vpn-plugin-ui-interface.h>
@@ -48,7 +48,7 @@
 #define LIBRESWAN_EDITOR_PLUGIN_ERROR                  NM_SETTING_VPN_ERROR
 #define LIBRESWAN_EDITOR_PLUGIN_ERROR_INVALID_PROPERTY NM_SETTING_VPN_ERROR_INVALID_PROPERTY
 
-#else /* !NM_LIBRESWAN_OLD */
+#else /* !NM_VPN_OLD */
 
 #include <NetworkManager.h>
 #include <nma-ui-utils.h>