[network-manager-openvpn/th/cleanup-bgo790612: 3/11] properties: move include of "nma-cert-chooser.h" to default header

[Thomas Haller <thaller src gnome org>]

commit eb00fb2147a867e47fa8e5704e7ab8833c7406f9
Author: Thomas Haller <thaller redhat com>
Date:   Fri Nov 17 14:54:20 2017 +0100

    properties: move include of "nma-cert-chooser.h" to default header
    
    Compatibility tweaks should be done at one place, by "nm-default.h".

 properties/auth-helpers.c |    6 ------
 shared/nm-default.h       |    4 +++-
 2 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
index 16ff6e5..21c965c 100644
--- a/properties/auth-helpers.c
+++ b/properties/auth-helpers.c
@@ -33,12 +33,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#ifdef NM_VPN_OLD
-#include <nm-cert-chooser.h>
-#else
-#include <nma-cert-chooser.h>
-#endif
-
 #include "utils.h"
 #include "nm-utils/nm-shared-utils.h"
 
diff --git a/shared/nm-default.h b/shared/nm-default.h
index 4aeb62f..620c82e 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -90,7 +90,7 @@
 
 #define _nm_utils_is_valid_iface_name(n)            nm_utils_iface_valid_name(n)
 
-#else /* !NM_VPN_OLD */
+#else /* NM_VPN_OLD */
 
 #include <NetworkManager.h>
 
@@ -112,8 +112,10 @@
 
 #ifdef NM_VPN_OLD
 #include <nm-ui-utils.h>
+#include <nm-cert-chooser.h>
 #else /* NM_VPN_OLD */
 #include <nma-ui-utils.h>
+#include <nma-cert-chooser.h>
 #endif /* NM_VPN_OLD */
 
 #endif /* NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR */