libnm: rename NetworkManager.h and NetworkManagerVPN.h

"NetworkManager.h"'s name (and non-standard capitalization) suggest
that it's some sort of high-level super-important header, but it's
really just low-level D-Bus stuff. Rename it to "nm-dbus-interface.h"
and likewise "NetworkManagerVPN.h" to "nm-vpn-dbus-interface.h"

6 files changed, 12 insertions, 12 deletions

diff --git a/libnm-core/Makefile.libnm-core b/libnm-core/Makefile.libnm-core
index 52e62c1e6a..b482e501b3 100644
--- a/libnm-core/Makefile.libnm-core
+++ b/libnm-core/Makefile.libnm-core
@@ -5,10 +5,9 @@
 core = $(top_srcdir)/libnm-core
 
 libnm_core_headers =				\
-	$(core)/NetworkManager.h		\
-	$(core)/NetworkManagerVPN.h		\
 	$(core)/nm-connection.h			\
 	$(core)/nm-core-enum-types.h		\
+	$(core)/nm-dbus-interface.h		\
 	$(core)/nm-setting-8021x.h		\
 	$(core)/nm-setting-adsl.h		\
 	$(core)/nm-setting-bluetooth.h		\
@@ -37,7 +36,8 @@ libnm_core_headers =				\
 	$(core)/nm-setting-wireless.h		\
 	$(core)/nm-setting.h			\
 	$(core)/nm-utils.h			\
-	$(core)/nm-version.h
+	$(core)/nm-version.h			\
+	$(core)/nm-vpn-dbus-interface.h
 
 libnm_core_private_headers =			\
 	$(core)/crypto.h			\
diff --git a/libnm-core/NetworkManager.h b/libnm-core/nm-dbus-interface.h
index 505de8130a..801382eff5 100644
--- a/libnm-core/NetworkManager.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -23,8 +23,8 @@
  * used by some external code that does not link to libnm.
  */
 
-#ifndef NETWORK_MANAGER_H
-#define NETWORK_MANAGER_H
+#ifndef NM_DBUS_INTERFACE_H
+#define NM_DBUS_INTERFACE_H
 
 #include "nm-version.h"
 
@@ -607,4 +607,4 @@ typedef enum /*< flags >*/ {
 	NM_SECRET_AGENT_CAPABILITY_LAST = NM_SECRET_AGENT_CAPABILITY_VPN_HINTS
 } NMSecretAgentCapabilities;
 
-#endif /* NETWORK_MANAGER_H */
+#endif /* NM_DBUS_INTERFACE_H */
diff --git a/libnm-core/nm-setting-olpc-mesh.c b/libnm-core/nm-setting-olpc-mesh.c
index 408f6833f5..e8cbaa4e3c 100644
--- a/libnm-core/nm-setting-olpc-mesh.c
+++ b/libnm-core/nm-setting-olpc-mesh.c
@@ -25,8 +25,8 @@
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
 
-#include "NetworkManager.h"
 #include "nm-setting-olpc-mesh.h"
+#include "nm-dbus-interface.h"
 #include "nm-param-spec-specialized.h"
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"
diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c
index b8135b7115..f3473f4635 100644
--- a/libnm-core/nm-setting-wireless.c
+++ b/libnm-core/nm-setting-wireless.c
@@ -26,8 +26,8 @@
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n.h>
 
-#include "NetworkManager.h"
 #include "nm-setting-wireless.h"
+#include "nm-dbus-interface.h"
 #include "nm-param-spec-specialized.h"
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"
diff --git a/libnm-core/nm-setting-wireless.h b/libnm-core/nm-setting-wireless.h
index aa7ab3e491..1efd55e0fb 100644
--- a/libnm-core/nm-setting-wireless.h
+++ b/libnm-core/nm-setting-wireless.h
@@ -23,9 +23,9 @@
 #ifndef NM_SETTING_WIRELESS_H
 #define NM_SETTING_WIRELESS_H
 
-#include <NetworkManager.h>
 #include <nm-setting.h>
 #include <nm-setting-wireless-security.h>
+#include <nm-dbus-interface.h>
 
 G_BEGIN_DECLS
 
diff --git a/libnm-core/NetworkManagerVPN.h b/libnm-core/nm-vpn-dbus-interface.h
index b109766cd0..c2cd7be437 100644
--- a/libnm-core/NetworkManagerVPN.h
+++ b/libnm-core/nm-vpn-dbus-interface.h
@@ -23,8 +23,8 @@
  * used by some external code that does not link to libnm.
  */
 
-#ifndef NETWORK_MANAGER_VPN_H
-#define NETWORK_MANAGER_VPN_H
+#ifndef NM_VPN_DBUS_INTERFACE_H
+#define NM_VPN_DBUS_INTERFACE_H
 
 /*
  * dbus services details
@@ -299,4 +299,4 @@ typedef enum {
 /* boolean: prevent this VPN connection from ever getting the default route */
 #define NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT "never-default"
 
-#endif /* NETWORK_MANAGER_VPN_H */
+#endif /* NM_VPN_DBUS_INTERFACE_H */