[network-manager-vpnc/th/vpn-editor-split-bgo766170: 3/20] build: rename define "NM_VPNC_OLD" to "NM_VPN_OLD"

[Thomas Haller <thaller src gnome org>]

commit cba017706a15ece563ccfd613cb2d63c972d04e2
Author: Thomas Haller <thaller redhat com>
Date:   Mon May 9 13:37:53 2016 +0200

    build: rename define "NM_VPNC_OLD" to "NM_VPN_OLD"
    
    nm-vpnc and nm-openvpn projects are very similar. One difference is
    the name of this define.
    
    Rename it, so that the projects show less differences.

 properties/Makefile.am |    2 +-
 properties/nm-vpnc.c   |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 82ce18b..50ecc3c 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -32,7 +32,7 @@ libnm_vpn_plugin_vpnc_la_CFLAGS = \
        $(LIBNMA_CFLAGS)
 
 libnm_vpnc_properties_la_CFLAGS = \
-       -DNM_VPNC_OLD \
+       -DNM_VPN_OLD \
        $(common_CFLAGS) \
        $(LIBNM_GLIB_CFLAGS) \
        $(LIBNM_GTK_CFLAGS)
diff --git a/properties/nm-vpnc.c b/properties/nm-vpnc.c
index db4d66c..aee5f8b 100644
--- a/properties/nm-vpnc.c
+++ b/properties/nm-vpnc.c
@@ -39,7 +39,7 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#ifdef NM_VPNC_OLD
+#ifdef NM_VPN_OLD
 #define NM_VPN_LIBNM_COMPAT
 
 #include <nm-setting-vpn.h>
@@ -61,7 +61,7 @@
 #define VPNC_PLUGIN_UI_ERROR_FAILED           NM_SETTING_VPN_ERROR_UNKNOWN
 #define VPNC_PLUGIN_UI_ERROR_INVALID_PROPERTY NM_SETTING_VPN_ERROR_INVALID_PROPERTY
 
-#else /* !NM_VPNC_OLD */
+#else /* !NM_VPN_OLD */
 
 #include <NetworkManager.h>
 #include <nma-ui-utils.h>
@@ -1103,7 +1103,7 @@ add_routes (NMSettingIPConfig *s_ip4, const char *routelist)
        for (i = 0; substrs[i] != NULL; i++) {
                char *p, *str_route;
                long int prefix = 32;
-#ifdef NM_VPNC_OLD
+#ifdef NM_VPN_OLD
                struct in_addr tmp;
 #else
                NMIPRoute *route;
@@ -1125,7 +1125,7 @@ add_routes (NMSettingIPConfig *s_ip4, const char *routelist)
                }
                *p = '\0';
 
-#ifdef NM_VPNC_OLD
+#ifdef NM_VPN_OLD
                if (inet_pton (AF_INET, str_route, &tmp) > 0) {
                        NMIP4Route *route = nm_ip4_route_new ();
 
@@ -1710,7 +1710,7 @@ export (NMVpnEditorPlugin *plugin,
                int i;
 
                for (i = 0; i < nm_setting_ip_config_get_num_routes (s_ip4); i++) {
-#ifdef NM_VPNC_OLD
+#ifdef NM_VPN_OLD
                        NMIP4Route *route = nm_setting_ip_config_get_route (s_ip4, i);
                        char str_addr[INET_ADDRSTRLEN + 1];
                        struct in_addr num_addr;
@@ -1720,7 +1720,7 @@ export (NMVpnEditorPlugin *plugin,
 
                        if (routes_count)
                                g_string_append_c (routes, ' ');
-#ifdef NM_VPNC_OLD
+#ifdef NM_VPN_OLD
                        num_addr.s_addr = nm_ip4_route_get_dest (route);
                        if (inet_ntop (AF_INET, &num_addr, &str_addr[0], INET_ADDRSTRLEN + 1))
                                g_string_append_printf (routes, "%s/%d", str_addr, nm_ip4_route_get_prefix 
(route));