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"

diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c
index b1d11da..d48244f 100644 (file)
--- a/callouts/nm-dispatcher-utils.c
+++ b/callouts/nm-dispatcher-utils.c
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-dbus-glib-types.h>
 #include <nm-connection.h>
 #include <nm-setting-ip4-config.h>

diff --git a/examples/C/glib/add-connection-dbus-glib.c b/examples/C/glib/add-connection-dbus-glib.c
index 10468e7..f5aba07 100644 (file)
--- a/examples/C/glib/add-connection-dbus-glib.c
+++ b/examples/C/glib/add-connection-dbus-glib.c
@@ -33,7 +33,7 @@
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
 #include <nm-setting-ip4-config.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-utils.h>
 
 #define DBUS_TYPE_G_MAP_OF_VARIANT          (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
@@ -110,7 +110,7 @@ int main (int argc, char *argv[])
        /* Get system bus */
        bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
 
-       /* Create a D-Bus proxy; NM_DBUS_* defined in NetworkManager.h */
+       /* Create a D-Bus proxy; NM_DBUS_* defined in nm-dbus-interface.h */
        proxy = dbus_g_proxy_new_for_name (bus,
                                           NM_DBUS_SERVICE,
                                           NM_DBUS_PATH_SETTINGS,

diff --git a/examples/C/glib/get-active-connections-dbus-glib.c b/examples/C/glib/get-active-connections-dbus-glib.c
index e0faea7..b89875c 100644 (file)
--- a/examples/C/glib/get-active-connections-dbus-glib.c
+++ b/examples/C/glib/get-active-connections-dbus-glib.c
@@ -34,7 +34,7 @@
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
 #include <nm-setting-ip4-config.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-utils.h>
 
 #define DBUS_TYPE_G_MAP_OF_VARIANT          (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
@@ -205,7 +205,7 @@ int main (int argc, char *argv[])
        bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
 
        /* Create a D-Bus proxy to get the object properties from the NM Manager
-        * object.  NM_DBUS_* defines are from NetworkManager.h.
+        * object.  NM_DBUS_* defines are from nm-dbus-interface.h.
         */
        props_proxy = dbus_g_proxy_new_for_name (bus,
                                                 NM_DBUS_SERVICE,

diff --git a/examples/C/glib/get-ap-info-libnm.c b/examples/C/glib/get-ap-info-libnm.c
index 4c550ed..bc572ee 100644 (file)
--- a/examples/C/glib/get-ap-info-libnm.c
+++ b/examples/C/glib/get-ap-info-libnm.c
@@ -33,7 +33,7 @@
 #include <nm-device.h>
 #include <nm-device-wifi.h>
 #include <nm-access-point.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-utils.h>
 
 /* Convert flags to string */

diff --git a/examples/C/glib/list-connections-dbus-glib.c b/examples/C/glib/list-connections-dbus-glib.c
index 266cf19..4c13a53 100644 (file)
--- a/examples/C/glib/list-connections-dbus-glib.c
+++ b/examples/C/glib/list-connections-dbus-glib.c
@@ -29,7 +29,7 @@
 #include <dbus/dbus-glib.h>
 #include <stdio.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 
 #define DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH    (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH))
 
@@ -74,7 +74,7 @@ int main (int argc, char *argv[])
        /* Get system bus */
        bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
 
-       /* Create a D-Bus proxy; NM_DBUS_* defined in NetworkManager.h */
+       /* Create a D-Bus proxy; NM_DBUS_* defined in nm-dbus-interface.h */
        proxy = dbus_g_proxy_new_for_name (bus,
                                           NM_DBUS_SERVICE,
                                           NM_DBUS_PATH_SETTINGS,

diff --git a/examples/C/glib/list-connections-libnm.c b/examples/C/glib/list-connections-libnm.c
index a3ad2c5..5338c6f 100644 (file)
--- a/examples/C/glib/list-connections-libnm.c
+++ b/examples/C/glib/list-connections-libnm.c
@@ -31,7 +31,7 @@
 
 #include <nm-connection.h>
 #include <nm-setting-connection.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-utils.h>
 #include <nm-remote-settings.h>
 

diff --git a/examples/C/glib/monitor-nm-state-GDBus.c b/examples/C/glib/monitor-nm-state-GDBus.c
index 5420c3a..5131b8c 100644 (file)
--- a/examples/C/glib/monitor-nm-state-GDBus.c
+++ b/examples/C/glib/monitor-nm-state-GDBus.c
@@ -24,7 +24,7 @@
  * It uses GDBus and the libnm headers.
 
  * You don't need to have NetworkManager devel package installed. You can just
- * grab NetworkManager.h and put it in the path.
+ * grab nm-dbus-interface.h and put it in the path.
  *
  * Standalone compilation:
  *   gcc -Wall `pkg-config --libs --cflags glib-2.0 gio-2.0` `pkg-config --cflags libnm` monitor-nm-state-GDBus.c -o monitor-nm-state-GDBus
@@ -32,7 +32,7 @@
 
 #include <gio/gio.h>
 #include <string.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 
 static const char *
 nm_state_to_string (NMState state)

diff --git a/examples/C/qt/add-connection-wired.cpp b/examples/C/qt/add-connection-wired.cpp
index efcb107..fe790ec 100644 (file)
--- a/examples/C/qt/add-connection-wired.cpp
+++ b/examples/C/qt/add-connection-wired.cpp
@@ -31,7 +31,7 @@
 \r
 #include <QtCore/QDebug>\r
 \r
-#include "NetworkManager.h"\r
+#include "nm-dbus-interface.h"\r
 \r
 typedef QMap<QString, QMap<QString, QVariant> > Connection;\r
 Q_DECLARE_METATYPE(Connection)\r

diff --git a/examples/C/qt/change-ipv4-addresses.cpp b/examples/C/qt/change-ipv4-addresses.cpp
index 60f7159..8ca3dde 100644 (file)
--- a/examples/C/qt/change-ipv4-addresses.cpp
+++ b/examples/C/qt/change-ipv4-addresses.cpp
@@ -25,7 +25,7 @@
  * g++ -Wall `pkg-config --libs --cflags QtCore QtDBus QtNetwork` `pkg-config --cflags libnm` change-ipv4-addresses.cpp -o change-ipv4-addresses
  *
  * You don't need to have NetworkManager devel package installed; you can just
- * grab NetworkManager.h and put it in the path
+ * grab nm-dbus-interface.h and put it in the path
  */
 
 #include <QtDBus/QDBusConnection>
@@ -40,7 +40,7 @@
 
 #include "arpa/inet.h"
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 
 typedef QMap<QString, QMap<QString, QVariant> > Connection;
 Q_DECLARE_METATYPE(Connection)

diff --git a/examples/C/qt/list-connections.cpp b/examples/C/qt/list-connections.cpp
index a10754c..66f309c 100644 (file)
--- a/examples/C/qt/list-connections.cpp
+++ b/examples/C/qt/list-connections.cpp
@@ -28,7 +28,7 @@
 
 #include <QtCore/QDebug>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 
 
 void listConnections(QDBusInterface& interface) {

diff --git a/libnm-core/Makefile.libnm-core b/libnm-core/Makefile.libnm-core
index 52e62c1..b482e50 100644 (file)
--- 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
similarity index 99%
rename from libnm-core/NetworkManager.h
rename to libnm-core/nm-dbus-interface.h
index 505de81..801382e 100644 (file)
--- 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 408f683..e8cbaa4 100644 (file)
--- 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 b8135b7..f3473f4 100644 (file)
--- 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 aa7ab3e..1efd55e 100644 (file)
--- 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
similarity index 99%
rename from libnm-core/NetworkManagerVPN.h
rename to libnm-core/nm-vpn-dbus-interface.h
index b109766..c2cd7be 100644 (file)
--- 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 */

diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c
index c4b5bec..19d92d9 100644 (file)
--- a/libnm/nm-access-point.c
+++ b/libnm/nm-access-point.c
@@ -32,7 +32,7 @@
 #include <nm-utils.h>
 
 #include "nm-access-point.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types-private.h"
 #include "nm-object-private.h"
 

diff --git a/libnm/nm-access-point.h b/libnm/nm-access-point.h
index cc1e8f9..9717b43 100644 (file)
--- a/libnm/nm-access-point.h
+++ b/libnm/nm-access-point.h
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-connection.h>
 #include "nm-object.h"
 

diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c
index 1f008b1..6491cd2 100644 (file)
--- a/libnm/nm-active-connection.c
+++ b/libnm/nm-active-connection.c
@@ -21,7 +21,7 @@
 
 #include <string.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-active-connection.h"
 #include "nm-object-private.h"
 #include "nm-types-private.h"

diff --git a/libnm/nm-active-connection.h b/libnm/nm-active-connection.h
index 49b5d18..a66c30e 100644 (file)
--- a/libnm/nm-active-connection.h
+++ b/libnm/nm-active-connection.h
@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include "nm-object.h"
 #include <nm-connection.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include "nm-ip4-config.h"
 #include "nm-dhcp4-config.h"
 #include "nm-ip6-config.h"

diff --git a/libnm/nm-client.h b/libnm/nm-client.h
index 438ace9..830856d 100644 (file)
--- a/libnm/nm-client.h
+++ b/libnm/nm-client.h
@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 #include <dbus/dbus-glib.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include "nm-object.h"
 #include "nm-device.h"
 #include "nm-active-connection.h"

diff --git a/libnm/nm-dbus-helpers.c b/libnm/nm-dbus-helpers.c
index 2500431..f80cb37 100644 (file)
--- a/libnm/nm-dbus-helpers.c
+++ b/libnm/nm-dbus-helpers.c
@@ -24,7 +24,7 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include "nm-dbus-helpers-private.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 
 static dbus_int32_t priv_slot = -1;
 

diff --git a/libnm/nm-device-bt.h b/libnm/nm-device-bt.h
index 631cec8..f43d4e1 100644 (file)
--- a/libnm/nm-device-bt.h
+++ b/libnm/nm-device-bt.h
@@ -22,7 +22,7 @@
 #ifndef NM_DEVICE_BT_H
 #define NM_DEVICE_BT_H
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-device.h"
 
 G_BEGIN_DECLS

diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index b06ba15..de6a679 100644 (file)
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -24,7 +24,7 @@
 #include <glib/gi18n.h>
 #include <gudev/gudev.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-adsl.h"
 #include "nm-device-wifi.h"

diff --git a/libnm/nm-device.h b/libnm/nm-device.h
index d686115..072d646 100644 (file)
--- a/libnm/nm-device.h
+++ b/libnm/nm-device.h
@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include "nm-object.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-ip4-config.h"
 #include "nm-dhcp4-config.h"
 #include "nm-ip6-config.h"

diff --git a/libnm/nm-dhcp4-config.c b/libnm/nm-dhcp4-config.c
index 1ca16b3..d77f866 100644 (file)
--- a/libnm/nm-dhcp4-config.c
+++ b/libnm/nm-dhcp4-config.c
@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include "nm-dhcp4-config.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types-private.h"
 #include "nm-object-private.h"
 #include "nm-utils.h"

diff --git a/libnm/nm-dhcp6-config.c b/libnm/nm-dhcp6-config.c
index 18cbb79..63d766f 100644 (file)
--- a/libnm/nm-dhcp6-config.c
+++ b/libnm/nm-dhcp6-config.c
@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include "nm-dhcp6-config.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types-private.h"
 #include "nm-object-private.h"
 #include "nm-utils.h"

diff --git a/libnm/nm-ip4-config.c b/libnm/nm-ip4-config.c
index 5635cbd..298a219 100644 (file)
--- a/libnm/nm-ip4-config.c
+++ b/libnm/nm-ip4-config.c
@@ -23,7 +23,7 @@
 
 #include <nm-setting-ip4-config.h>
 #include "nm-ip4-config.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types-private.h"
 #include "nm-object-private.h"
 #include "nm-utils.h"

diff --git a/libnm/nm-ip6-config.c b/libnm/nm-ip6-config.c
index beb2b9c..7d34171 100644 (file)
--- a/libnm/nm-ip6-config.c
+++ b/libnm/nm-ip6-config.c
@@ -23,7 +23,7 @@
 
 #include <nm-setting-ip6-config.h>
 #include "nm-ip6-config.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types-private.h"
 #include "nm-object-private.h"
 #include "nm-utils.h"

diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index 390901f..f44bf6b 100644 (file)
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <nm-utils.h>
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-object.h"
 #include "nm-object-cache.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index fbe3eef..9806995 100644 (file)
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -23,7 +23,7 @@
 #include <gio/gio.h>
 #include <glib/gi18n.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-utils.h>
 #include <nm-setting-connection.h>
 #include "nm-remote-connection.h"

diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c
index 1fc80ef..185981a 100644 (file)
--- a/libnm/nm-remote-settings.c
+++ b/libnm/nm-remote-settings.c
@@ -20,7 +20,7 @@
  */
 
 #include <string.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-connection.h>
 
 #include "nm-dbus-glib-types.h"

diff --git a/libnm/nm-secret-agent.c b/libnm/nm-secret-agent.c
index 39c8626..705c780 100644 (file)
--- a/libnm/nm-secret-agent.c
+++ b/libnm/nm-secret-agent.c
@@ -23,7 +23,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 
 #include "nm-glib-compat.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-secret-agent.h"
 #include "nm-enum-types.h"
 #include "nm-dbus-helpers-private.h"

diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c
index 5325927..fc3d8c8 100644 (file)
--- a/libnm/nm-vpn-connection.c
+++ b/libnm/nm-vpn-connection.c
@@ -21,7 +21,7 @@
 
 #include <string.h>
 #include "nm-vpn-connection.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-utils.h"
 #include "nm-object-private.h"
 #include "nm-active-connection.h"

diff --git a/libnm/nm-vpn-connection.h b/libnm/nm-vpn-connection.h
index 3aac48c..d38ebcc 100644 (file)
--- a/libnm/nm-vpn-connection.h
+++ b/libnm/nm-vpn-connection.h
@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 #include "nm-active-connection.h"
-#include "NetworkManagerVPN.h"
+#include "nm-vpn-dbus-interface.h"
 
 G_BEGIN_DECLS
 

diff --git a/libnm/nm-vpn-plugin.h b/libnm/nm-vpn-plugin.h
index 055c4ab..46e69e7 100644 (file)
--- a/libnm/nm-vpn-plugin.h
+++ b/libnm/nm-vpn-plugin.h
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
-#include <NetworkManagerVPN.h>
+#include <nm-vpn-dbus-interface.h>
 #include <nm-connection.h>
 
 G_BEGIN_DECLS

diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c
index 5d4d2e2..da01554 100644 (file)
--- a/libnm/nm-wimax-nsp.c
+++ b/libnm/nm-wimax-nsp.c
@@ -28,7 +28,7 @@
 #include <nm-setting-wimax.h>
 
 #include "nm-wimax-nsp.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types-private.h"
 #include "nm-object-private.h"
 

diff --git a/libnm/nm-wimax-nsp.h b/libnm/nm-wimax-nsp.h
index 9858ae3..920bda6 100644 (file)
--- a/libnm/nm-wimax-nsp.h
+++ b/libnm/nm-wimax-nsp.h
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include "nm-object.h"
 
 G_BEGIN_DECLS

diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c
index 141705e..1fa5101 100644 (file)
--- a/libnm/tests/test-nm-client.c
+++ b/libnm/tests/test-nm-client.c
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <signal.h>
 
-#include <NetworkManager.h>
+#include "nm-dbus-interface.h"
 #include "nm-client.h"
 #include "nm-device-wifi.h"
 #include "nm-device-ethernet.h"

diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c
index 227fc62..0f99a6f 100644 (file)
--- a/libnm/tests/test-remote-settings-client.c
+++ b/libnm/tests/test-remote-settings-client.c
@@ -26,8 +26,7 @@
 #include <sys/types.h>
 #include <signal.h>
 
-#include <NetworkManager.h>
-
+#include <nm-dbus-interface.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
 #include <nm-utils.h>

diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c
index 8434d0c..bae66ea 100644 (file)
--- a/src/devices/bluetooth/nm-bluez-device.c
+++ b/src/devices/bluetooth/nm-bluez-device.c
@@ -26,7 +26,7 @@
 #include <net/ethernet.h>
 #include <netinet/ether.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-setting-bluetooth.h"
 
 #include "nm-bluez-common.h"

diff --git a/src/devices/bluetooth/nm-bluez4-adapter.c b/src/devices/bluetooth/nm-bluez4-adapter.c
index df4c3bb..7a2cdd6 100644 (file)
--- a/src/devices/bluetooth/nm-bluez4-adapter.c
+++ b/src/devices/bluetooth/nm-bluez4-adapter.c
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-dbus-manager.h"
 #include "nm-bluez4-adapter.h"
 #include "nm-bluez-device.h"

diff --git a/src/devices/nm-device-factory.h b/src/devices/nm-device-factory.h
index b0b7267..08d9743 100644 (file)
--- a/src/devices/nm-device-factory.h
+++ b/src/devices/nm-device-factory.h
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-device.h"
 
 /* WARNING: this file is private API between NetworkManager and its internal

diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index 95d6a5d..47519f5 100644 (file)
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -26,7 +26,7 @@
 #include <dbus/dbus-glib.h>
 #include <netinet/in.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types.h"
 #include "nm-connection.h"
 #include "nm-rfkill-manager.h"

diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c
index 6e8a0fc..e030c41 100644 (file)
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/devices/wifi/nm-device-olpc-mesh.c
@@ -57,7 +57,7 @@
 #include "nm-wifi-enum-types.h"
 
 /* This is a bug; but we can't really change API now... */
-#include "NetworkManagerVPN.h"
+#include "nm-vpn-dbus-interface.h"
 
 
 #include "nm-device-olpc-mesh-glue.h"

diff --git a/src/devices/wifi/nm-wifi-ap-utils.h b/src/devices/wifi/nm-wifi-ap-utils.h
index 992b839..a522f25 100644 (file)
--- a/src/devices/wifi/nm-wifi-ap-utils.h
+++ b/src/devices/wifi/nm-wifi-ap-utils.h
@@ -23,7 +23,7 @@
 
 #include <net/ethernet.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-connection.h>
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>

diff --git a/src/devices/wifi/nm-wifi-ap.h b/src/devices/wifi/nm-wifi-ap.h
index f51fa07..85de517 100644 (file)
--- a/src/devices/wifi/nm-wifi-ap.h
+++ b/src/devices/wifi/nm-wifi-ap.h
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-connection.h"
 
 #define NM_TYPE_AP            (nm_ap_get_type ())

diff --git a/src/devices/wimax/nm-wimax-nsp.c b/src/devices/wimax/nm-wimax-nsp.c
index c7e7249..aa4ca5f 100644 (file)
--- a/src/devices/wimax/nm-wimax-nsp.c
+++ b/src/devices/wimax/nm-wimax-nsp.c
@@ -20,7 +20,7 @@
  */
 
 #include "nm-wimax-nsp.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-dbus-manager.h"
 #include "nm-setting-wimax.h"
 #include "nm-wimax-nsp-glue.h"

diff --git a/src/main.c b/src/main.c
index f883689..d41472d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -40,7 +40,7 @@
 #include <sys/resource.h>
 
 #include "gsystem-local-alloc.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "NetworkManagerUtils.h"
 #include "nm-manager.h"
 #include "nm-linux-platform.h"

diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c
index c679e45..30e319b 100644 (file)
--- a/src/nm-active-connection.c
+++ b/src/nm-active-connection.c
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include "nm-types.h"
 #include "nm-active-connection.h"
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-logging.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-dbus-manager.h"

diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h
index 3c91750..a471fd1 100644 (file)
--- a/src/nm-connectivity.h
+++ b/src/nm-connectivity.h
@@ -25,7 +25,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-types.h"
 
 #define NM_TYPE_CONNECTIVITY            (nm_connectivity_get_type ())

diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c
index f9269b6..d6e4abf 100644 (file)
--- a/src/nm-dbus-manager.c
+++ b/src/nm-dbus-manager.c
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <errno.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-dbus-manager.h"
 #include "nm-glib-compat.h"
 #include "nm-properties-changed-signal.h"

diff --git a/src/nm-dhcp4-config.c b/src/nm-dhcp4-config.c
index 361ad5b..45cf5c5 100644 (file)
--- a/src/nm-dhcp4-config.c
+++ b/src/nm-dhcp4-config.c
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-dbus-manager.h"
 #include "nm-dhcp4-config.h"
 #include "nm-dhcp4-config-glue.h"

diff --git a/src/nm-dhcp6-config.c b/src/nm-dhcp6-config.c
index 55dac5d..6a644a9 100644 (file)
--- a/src/nm-dhcp6-config.c
+++ b/src/nm-dhcp6-config.c
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-dbus-manager.h"
 #include "nm-dhcp6-config.h"
 #include "nm-dhcp6-config-glue.h"

diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
index ecf3064..8d80ed8 100644 (file)
--- a/src/platform/nm-platform.h
+++ b/src/platform/nm-platform.h
@@ -28,7 +28,7 @@
 #include <linux/if.h>
 #include <linux/if_addr.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include "gsystem-local-alloc.h"
 #include "nm-types.h"
 

diff --git a/src/platform/wifi/wifi-utils-private.h b/src/platform/wifi/wifi-utils-private.h
index e760175..8c97b9c 100644 (file)
--- a/src/platform/wifi/wifi-utils-private.h
+++ b/src/platform/wifi/wifi-utils-private.h
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "wifi-utils.h"
 
 struct WifiData {

diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h
index 455e075..61ab1fd 100644 (file)
--- a/src/platform/wifi/wifi-utils.h
+++ b/src/platform/wifi/wifi-utils.h
@@ -25,7 +25,7 @@
 #include <net/ethernet.h>
 #include <glib.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 
 typedef struct WifiData WifiData;
 

diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index 6fe9cb5..4af3f5a 100644 (file)
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -41,7 +41,7 @@
 #endif
 #include <linux/if_ppp.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "NetworkManagerUtils.h"
 #include "nm-glib-compat.h"
 #include "nm-ppp-manager.h"

diff --git a/src/ppp-manager/nm-pppd-plugin.c b/src/ppp-manager/nm-pppd-plugin.c
index 0cea4e1..64de4b5 100644 (file)
--- a/src/ppp-manager/nm-pppd-plugin.c
+++ b/src/ppp-manager/nm-pppd-plugin.c
@@ -36,7 +36,7 @@
 #include <pppd/eui64.h>
 #include <pppd/ipv6cp.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-pppd-plugin.h"
 #include "nm-ppp-status.h"
 #include "nm-dbus-glib-types.h"

diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index 349299f..07e710e 100644 (file)
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -26,7 +26,7 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-logging.h"
 #include "nm-agent-manager.h"
 #include "nm-secret-agent.h"

diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c
index b60ccdb..a45db07 100644 (file)
--- a/src/settings/nm-secret-agent.c
+++ b/src/settings/nm-secret-agent.c
@@ -27,7 +27,7 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-secret-agent.h"
 #include "nm-dbus-manager.h"
 #include "nm-dbus-glib-types.h"

diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
index e8f6607..399393f 100644 (file)
--- a/src/settings/nm-settings-connection.c
+++ b/src/settings/nm-settings-connection.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-vpn.h>

diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index 3db4176..c88f822 100644 (file)
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -32,7 +32,7 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-connection.h>
 #include <nm-setting-8021x.h>
 #include <nm-setting-bluetooth.h>

diff --git a/src/settings/plugins/example/nm-example-connection.c b/src/settings/plugins/example/nm-example-connection.c
index e222682..8cbeeea 100644 (file)
--- a/src/settings/plugins/example/nm-example-connection.c
+++ b/src/settings/plugins/example/nm-example-connection.c
@@ -20,7 +20,7 @@
 
 #include <string.h>
 #include <glib/gstdio.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-setting-connection.h>
 #include <nm-utils.h>
 

diff --git a/src/settings/plugins/example/reader.c b/src/settings/plugins/example/reader.c
index 9a4ceca..23f37c7 100644 (file)
--- a/src/settings/plugins/example/reader.c
+++ b/src/settings/plugins/example/reader.c
@@ -22,7 +22,7 @@
 #include <glib.h>
 
 #include <nm-connection.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 
 #include "common.h"
 

diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
index c2b39ff..5d7d1db 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
+++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
@@ -24,7 +24,7 @@
 
 #include <glib/gstdio.h>
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
 #include <nm-setting-wireless.h>

diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h
index 47422b5..cc76d95 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h
+++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h
@@ -23,7 +23,7 @@
 
 G_BEGIN_DECLS
 
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-settings-connection.h>
 
 #define NM_TYPE_IFCFG_CONNECTION            (nm_ifcfg_connection_get_type ())

diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
index 1753c51..50fa59a 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/reader.c
+++ b/src/settings/plugins/ifcfg-rh/reader.c
@@ -35,7 +35,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <nm-connection.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-ip4-config.h>
 #include <nm-setting-vlan.h>

diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.c b/src/settings/plugins/ifnet/nm-ifnet-connection.c
index 478d6e3..2408d73 100644 (file)
--- a/src/settings/plugins/ifnet/nm-ifnet-connection.c
+++ b/src/settings/plugins/ifnet/nm-ifnet-connection.c
@@ -21,7 +21,7 @@
 
 #include <string.h>
 #include <glib/gstdio.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-utils.h>
 #include <nm-setting-wireless-security.h>
 #include <nm-settings-connection.h>

diff --git a/src/settings/plugins/ifnet/plugin.c b/src/settings/plugins/ifnet/plugin.c
index ab07b8d..d376bbf 100644 (file)
--- a/src/settings/plugins/ifnet/plugin.c
+++ b/src/settings/plugins/ifnet/plugin.c
@@ -29,7 +29,7 @@
 #include <nm-utils.h>
 #include <nm-setting-connection.h>
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-system-config-interface.h"
 #include "nm-logging.h"
 #include "nm-ifnet-connection.h"

diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
index db9fd27..6b48cac 100644 (file)
--- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
+++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <glib/gstdio.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-utils.h>
 #include <nm-setting-wireless-security.h>
 #include <nm-settings-connection.h>

diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c
index 91ed3e2..b3fe546 100644 (file)
--- a/src/settings/plugins/ifupdown/parser.c
+++ b/src/settings/plugins/ifupdown/parser.c
@@ -27,7 +27,7 @@
 #include <errno.h>
 
 #include <nm-connection.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-ip4-config.h>
 #include <nm-setting-ppp.h>

diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c
index dcae211..e5a21ee 100644 (file)
--- a/src/settings/plugins/ifupdown/plugin.c
+++ b/src/settings/plugins/ifupdown/plugin.c
@@ -36,7 +36,7 @@
 
 #include "interface_parser.h"
 
-#include "NetworkManager.h"
+#include "nm-dbus-interface.h"
 #include "nm-system-config-interface.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-wireless.h"

diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.c b/src/settings/plugins/keyfile/nm-keyfile-connection.c
index 4ef761c..3b89607 100644 (file)
--- a/src/settings/plugins/keyfile/nm-keyfile-connection.c
+++ b/src/settings/plugins/keyfile/nm-keyfile-connection.c
@@ -21,7 +21,7 @@
 
 #include <string.h>
 #include <glib/gstdio.h>
-#include <NetworkManager.h>
+#include <nm-dbus-interface.h>
 #include <nm-setting-connection.h>
 #include <nm-utils.h>
 

diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
index dde6d15..e2cf8dd 100644 (file)
--- a/src/vpn-manager/nm-vpn-connection.c
+++ b/src/vpn-manager/nm-vpn-connection.c
@@ -27,8 +27,8 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "NetworkManager.h"
-#include "NetworkManagerVPN.h"
+#include "nm-dbus-interface.h"
+#include "nm-vpn-dbus-interface.h"
 #include "nm-vpn-connection.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-vpn.h"

diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn-manager/nm-vpn-connection.h
index 10dee5a..209e274 100644 (file)
--- a/src/vpn-manager/nm-vpn-connection.h
+++ b/src/vpn-manager/nm-vpn-connection.h
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include "NetworkManagerVPN.h"
+#include "nm-vpn-dbus-interface.h"
 #include "nm-device.h"
 #include "nm-auth-subject.h"
 #include "nm-active-connection.h"

diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c
index 002a919..139a17a 100644 (file)
--- a/src/vpn-manager/nm-vpn-manager.c
+++ b/src/vpn-manager/nm-vpn-manager.c
@@ -27,7 +27,7 @@
 #include "nm-vpn-connection.h"
 #include "nm-setting-vpn.h"
 #include "nm-dbus-manager.h"
-#include "NetworkManagerVPN.h"
+#include "nm-vpn-dbus-interface.h"
 #include "nm-enum-types.h"
 #include "nm-logging.h"