[network-manager-pptp/th/vpn-editor-split-bgo766623: 4/21] build/trivial: rename define NM_PPTP_OLD to NM_VPN_OLD



commit b9904b242f70b13f54dd4675a0f0a001751ca313
Author: Thomas Haller <thaller redhat com>
Date:   Wed May 18 13:30:25 2016 +0200

    build/trivial: rename define NM_PPTP_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/advanced-dialog.c |    4 ++--
 properties/nm-pptp.c         |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/properties/Makefile.am b/properties/Makefile.am
index fe12078..cf501db 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -34,7 +34,7 @@ libnm_vpn_plugin_pptp_la_CFLAGS =                       \
         $(LIBNM_CFLAGS)
 
 libnm_pptp_properties_la_CFLAGS =                       \
-        -DNM_PPTP_OLD                                   \
+        -DNM_VPN_OLD                                    \
         $(common_CFLAGS)                                \
         $(LIBNM_GLIB_CFLAGS)                            \
         $(LIBNM_GTK_CFLAGS)
diff --git a/properties/advanced-dialog.c b/properties/advanced-dialog.c
index f0a4ddb..a2b4d1a 100644
--- a/properties/advanced-dialog.c
+++ b/properties/advanced-dialog.c
@@ -35,12 +35,12 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#ifdef NM_PPTP_OLD
+#ifdef NM_VPN_OLD
 #define NM_VPN_LIBNM_COMPAT
 #include <nm-connection.h>
 #include <nm-setting-vpn.h>
 
-#else /* !NM_PPTP_OLD */
+#else /* !NM_VPN_OLD */
 #include <NetworkManager.h>
 #endif
 
diff --git a/properties/nm-pptp.c b/properties/nm-pptp.c
index 5743383..89d70c0 100644
--- a/properties/nm-pptp.c
+++ b/properties/nm-pptp.c
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#ifdef NM_PPTP_OLD
+#ifdef NM_VPN_OLD
 #define NM_VPN_LIBNM_COMPAT
 #include <nm-vpn-plugin-ui-interface.h>
 #include <nm-setting-vpn.h>
@@ -42,7 +42,7 @@
 #include <nm-setting-ip4-config.h>
 #include <nm-ui-utils.h>
 
-#else /* !NM_PPTP_OLD */
+#else /* !NM_VPN_OLD */
 
 #include <NetworkManager.h>
 #include <nma-ui-utils.h>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]