[network-manager-openvpn/th/vpn-editor-split-bgo765732: 6/13] build: don't directly include nm-connection.h/NetworkManager.h

[Thomas Haller <thaller src gnome org>]

commit a8f740021d31cda5f2b948cf21a8ed47e230ed92
Author: Thomas Haller <thaller redhat com>
Date:   Thu Apr 28 19:25:04 2016 +0200

    build: don't directly include nm-connection.h/NetworkManager.h
    
    We already get that via nm-default.h.

 properties/auth-helpers.h  |    7 -------
 properties/import-export.h |    6 ------
 shared/nm-default.h        |    1 +
 3 files changed, 1 insertions(+), 13 deletions(-)
---
diff --git a/properties/auth-helpers.h b/properties/auth-helpers.h
index 13d8dcf..0e53ded 100644
--- a/properties/auth-helpers.h
+++ b/properties/auth-helpers.h
@@ -24,13 +24,6 @@
 
 #include <gtk/gtk.h>
 
-#ifdef NM_OPENVPN_OLD
-#include <nm-connection.h>
-#include <nm-setting-vpn.h>
-#else /* !NM_OPENVPN_OLD */
-#include <NetworkManager.h>
-#endif
-
 typedef void (*ChangedCallback) (GtkWidget *widget, gpointer user_data);
 
 void tls_pw_init_auth_widget (GtkBuilder *builder,
diff --git a/properties/import-export.h b/properties/import-export.h
index fb8d921..06b92a8 100644
--- a/properties/import-export.h
+++ b/properties/import-export.h
@@ -22,12 +22,6 @@
 #ifndef _IMPORT_EXPORT_H_
 #define _IMPORT_EXPORT_H_
 
-#ifdef NM_OPENVPN_OLD
-#include <nm-connection.h>
-#else /* !NM_OPENVPN_OLD */
-#include <NetworkManager.h>
-#endif
-
 extern const char *_nmovpn_test_temp_path;
 
 gboolean _nmovpn_test_args_parse_line (const char *line,
diff --git a/shared/nm-default.h b/shared/nm-default.h
index c54b556..058dc14 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -62,6 +62,7 @@
 #ifdef NM_OPENVPN_OLD
 
 #define NM_VPN_LIBNM_COMPAT
+#include <nm-connection.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-8021x.h>
 #include <nm-setting-ip4-config.h>