Commit 3ddce748 authored by Dan Winship's avatar Dan Winship

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"
parent 258e74eb
......@@ -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>
......
......@@ -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,
......
......@@ -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,
......
......@@ -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 */
......
......@@ -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,
......
......@@ -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>
......
......@@ -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)
......
......@@ -31,7 +31,7 @@
#include <QtCore/QDebug>
#include "NetworkManager.h"
#include "nm-dbus-interface.h"
typedef QMap<QString, QMap<QString, QVariant> > Connection;
Q_DECLARE_METATYPE(Connection)
......
......@@ -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)
......
......@@ -28,7 +28,7 @@
#include <QtCore/QDebug>
#include "NetworkManager.h"
#include "nm-dbus-interface.h"
void listConnections(QDBusInterface& interface) {
......
......@@ -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 \
......
......@@ -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 */
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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 */
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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;
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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>
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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>
......
......@@ -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 ())
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 ())
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -23,7 +23,7 @@
#include <glib.h>
#include "NetworkManager.h"
#include "nm-dbus-interface.h"
#include "wifi-utils.h"
struct WifiData {
......
......@@ -25,7 +25,7 @@
#include <net/ethernet.h>
#include <glib.h>
#include "NetworkManager.h"
#include "nm-dbus-interface.h"
typedef struct WifiData WifiData;
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -22,7 +22,7 @@
#include <glib.h>
#include <nm-connection.h>
#include <NetworkManager.h>
#include <nm-dbus-interface.h>
#include "common.h"
......
......@@ -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>
......
......@@ -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 ())
......
......@@ -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>
......