[network-manager-openvpn] build/trivial: rename define NM_OPENVPN_OLD to NM_VPN_OLD

[Thomas Haller <thaller src gnome org>]

commit 95c04c21a1ef49d5bc8d7820a130477db8dd7bb4
Author: Thomas Haller <thaller redhat com>
Date:   Tue May 10 13:06:56 2016 +0200

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

 properties/Makefile.am                |    2 +-
 properties/import-export.c            |    6 +++---
 properties/nm-openvpn-editor-plugin.c |    6 +++---
 properties/nm-openvpn-editor.c        |    2 +-
 properties/tests/Makefile.am          |    2 +-
 properties/tests/test-import-export.c |    2 +-
 shared/Makefile.am                    |    2 +-
 shared/nm-default.h                   |   12 ++++++------
 8 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/properties/Makefile.am b/properties/Makefile.am
index a158b26..028709d 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -82,7 +82,7 @@ libnm_openvpn_properties_la_SOURCES = \
         $(editor_sources)
 
 libnm_openvpn_properties_la_CFLAGS =                \
-        -DNM_OPENVPN_OLD \
+        -DNM_VPN_OLD \
         $(common_CFLAGS)                                \
         $(GTK_CFLAGS) \
         -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
diff --git a/properties/import-export.c b/properties/import-export.c
index 00a1d37..8cf4884 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -1250,7 +1250,7 @@ do_import (const char *path, const char *contents, gsize contents_len, GError **
                        }
 
                        {
-#ifdef NM_OPENVPN_OLD
+#ifdef NM_VPN_OLD
                                NMIP4Route *route;
 
                                route = nm_ip4_route_new ();
@@ -1872,7 +1872,7 @@ do_export_create (NMConnection *connection, const char *path, GError **error)
 
        s_ip4 = nm_connection_get_setting_ip4_config (connection);
        if (s_ip4) {
-#ifdef NM_OPENVPN_OLD
+#ifdef NM_VPN_OLD
                num = nm_setting_ip4_config_get_num_routes (s_ip4);
 #else
                num = nm_setting_ip_config_get_num_routes (s_ip4);
@@ -1885,7 +1885,7 @@ do_export_create (NMConnection *connection, const char *path, GError **error)
                        guint64 metric;
                        char metric_buf[50];
 
-#ifdef NM_OPENVPN_OLD
+#ifdef NM_VPN_OLD
                        char next_hop_str_buf[INET_ADDRSTRLEN] = { 0 };
                        char dest_str_buf[INET_ADDRSTRLEN] = { 0 };
                        in_addr_t dest, next_hop;
diff --git a/properties/nm-openvpn-editor-plugin.c b/properties/nm-openvpn-editor-plugin.c
index 90d1d72..191b2de 100644
--- a/properties/nm-openvpn-editor-plugin.c
+++ b/properties/nm-openvpn-editor-plugin.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef NM_OPENVPN_OLD
+#ifdef NM_VPN_OLD
 #include "nm-openvpn-editor.h"
 #else
 #include "nm-vpn-plugin-utils.h"
@@ -126,7 +126,7 @@ get_capabilities (NMVpnEditorPlugin *iface)
                NM_VPN_EDITOR_PLUGIN_CAPABILITY_IPV6);
 }
 
-#ifndef NM_OPENVPN_OLD
+#ifndef NM_VPN_OLD
 static NMVpnEditor *
 _call_editor_factory (gpointer factory,
                       NMVpnEditorPlugin *editor_plugin,
@@ -148,7 +148,7 @@ get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error)
        g_return_val_if_fail (!error || !*error, NULL);
 
        {
-#ifdef NM_OPENVPN_OLD
+#ifdef NM_VPN_OLD
                return openvpn_editor_new (connection, error);
 #else
                return nm_vpn_plugin_utils_load_editor (NM_PLUGIN_DIR"/libnm-vpn-plugin-openvpn-editor.so",
diff --git a/properties/nm-openvpn-editor.c b/properties/nm-openvpn-editor.c
index b3fd63b..2e09d2d 100644
--- a/properties/nm-openvpn-editor.c
+++ b/properties/nm-openvpn-editor.c
@@ -589,7 +589,7 @@ openvpn_editor_plugin_widget_class_init (OpenvpnEditorClass *req_class)
 
 /*****************************************************************************/
 
-#ifndef NM_OPENVPN_OLD
+#ifndef NM_VPN_OLD
 
 #include "nm-openvpn-editor-plugin.h"
 
diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
index 62a991a..c3eef5b 100644
--- a/properties/tests/Makefile.am
+++ b/properties/tests/Makefile.am
@@ -34,7 +34,7 @@ test_import_export_glib_SOURCES = \
        test-import-export.c
 
 test_import_export_glib_CPPFLAGS = \
-       -DNM_OPENVPN_OLD \
+       -DNM_VPN_OLD \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(LIBNM_GLIB_CFLAGS) \
diff --git a/properties/tests/test-import-export.c b/properties/tests/test-import-export.c
index cca4525..0adf554 100644
--- a/properties/tests/test-import-export.c
+++ b/properties/tests/test-import-export.c
@@ -1113,7 +1113,7 @@ test_route_import (void)
        /* IP4 setting */
        s_ip4 = nm_connection_get_setting_ip4_config (connection);
        g_assert (s_ip4);
-#ifdef NM_OPENVPN_OLD
+#ifdef NM_VPN_OLD
        {
                NMIP4Route *route;
                const char *expected_nh2   = "0.0.0.0";
diff --git a/shared/Makefile.am b/shared/Makefile.am
index 48dba99..1d6d9a2 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -30,7 +30,7 @@ libnm_openvpn_shared_la_SOURCES = \
     $(shared_sources)
 
 libnm_openvpn_shared_la_CPPFLAGS = \
-    -DNM_OPENVPN_OLD \
+    -DNM_VPN_OLD \
     $(LIBNM_GLIB_CFLAGS) \
     -I$(top_srcdir)/shared
 
diff --git a/shared/nm-default.h b/shared/nm-default.h
index 130be73..d0dd8ab 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -62,7 +62,7 @@
 
 /*****************************************************************************/
 
-#ifdef NM_OPENVPN_OLD
+#ifdef NM_VPN_OLD
 
 #define NM_VPN_LIBNM_COMPAT
 #include <nm-connection.h>
@@ -86,7 +86,7 @@
 #define OPENVPN_EDITOR_PLUGIN_ERROR_FILE_NOT_READABLE   NM_SETTING_VPN_ERROR_UNKNOWN
 #define OPENVPN_EDITOR_PLUGIN_ERROR_FILE_INVALID        NM_SETTING_VPN_ERROR_UNKNOWN
 
-#else /* !NM_OPENVPN_OLD */
+#else /* !NM_VPN_OLD */
 
 #include <NetworkManager.h>
 
@@ -98,17 +98,17 @@
 #define OPENVPN_EDITOR_PLUGIN_ERROR_FILE_NOT_READABLE   NM_CONNECTION_ERROR_FAILED
 #define OPENVPN_EDITOR_PLUGIN_ERROR_FILE_INVALID        NM_CONNECTION_ERROR_FAILED
 
-#endif /* NM_OPENVPN_OLD */
+#endif /* NM_VPN_OLD */
 
 /*****************************************************************************/
 
 #if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR
 
-#ifdef NM_OPENVPN_OLD
+#ifdef NM_VPN_OLD
 #include <nm-ui-utils.h>
-#else /* NM_OPENVPN_OLD */
+#else /* NM_VPN_OLD */
 #include <nma-ui-utils.h>
-#endif /* NM_OPENVPN_OLD */
+#endif /* NM_VPN_OLD */
 
 #endif /* NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR */