Commit 972e0d28 authored by Lubomir Rintel's avatar Lubomir Rintel 🥕

all: rename the introspection data to use the interface paths in names

This makes it easier to install the files with proper names.
Also, it makes the makefile rules slightly simpler.

Lastly, the documentation is now generated into docs/api, which makes it
possible to get rid of the awkward relative file names in docbook.
parent 0ce7da1e
......@@ -87,6 +87,8 @@ test-*.trs
/docs/api/NetworkManager.signals
/docs/api/NetworkManager.types
/docs/api/dbus-org.freedesktop.NetworkManager*.xml
/docs/libnm-glib/*.stamp
/docs/libnm-glib/html/
/docs/libnm-glib/tmpl/
......@@ -141,9 +143,7 @@ test-*.trs
/shared/nm-version-macros.h
/introspection/nmdbus-*.c
/introspection/nmdbus-*.h
/introspection/nmdbus-*.xml
/introspection/org.freedesktop.NetworkManager*.[ch]
/libgsystem/
......@@ -272,7 +272,6 @@ test-*.trs
/vapi/*.vapi
# The following names are no longer present on this branch,
# but they were on older versions. Thus keep ignoring them
# otherwise when switching branches these untracked files show
......@@ -297,3 +296,6 @@ test-*.trs
/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
/src/settings/plugins/ifnet/tests/check_ifnet
/src/supplicant-manager/tests/test-supplicant-config
/introspection/nmdbus-*.c
/introspection/nmdbus-*.h
/introspection/nmdbus-*.xml
This diff is collapsed.
......@@ -40,40 +40,40 @@ MKHTML_OPTIONS=--path="$(abs_srcdir)"
# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
content_files = \
$(top_builddir)/introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml \
$(top_builddir)/introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml \
$(top_builddir)/introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml \
$(top_builddir)/introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml \
$(top_builddir)/introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml \
$(top_builddir)/introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml \
$(top_builddir)/introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml \
$(top_builddir)/introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml \
$(top_builddir)/introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml \
$(top_builddir)/introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml \
$(top_builddir)/introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
$(top_builddir)/introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml \
$(top_builddir)/introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml \
$(top_builddir)/introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml \
$(top_builddir)/introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml \
$(top_builddir)/introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml \
$(top_builddir)/introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml \
$(top_builddir)/introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml \
$(top_builddir)/introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml \
$(top_builddir)/introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml \
$(top_builddir)/introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
$(top_builddir)/introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml \
$(top_builddir)/introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml \
$(top_builddir)/introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
$(top_builddir)/introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml \
$(top_builddir)/introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml \
$(top_builddir)/introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml \
$(top_builddir)/introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml \
$(top_builddir)/introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml \
$(top_builddir)/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \
$(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
$(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
$(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
$(top_builddir)/introspection/nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml \
dbus-org.freedesktop.NetworkManager.AccessPoint.xml \
dbus-org.freedesktop.NetworkManager.Connection.Active.xml \
dbus-org.freedesktop.NetworkManager.Device.Team.xml \
dbus-org.freedesktop.NetworkManager.DHCP6Config.xml \
dbus-org.freedesktop.NetworkManager.Device.Wireless.xml \
dbus-org.freedesktop.NetworkManager.xml \
dbus-org.freedesktop.NetworkManager.VPN.Connection.xml \
dbus-org.freedesktop.NetworkManager.SecretAgent.xml \
dbus-org.freedesktop.NetworkManager.Device.xml \
dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml \
dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml \
dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml \
dbus-org.freedesktop.NetworkManager.Settings.Connection.xml \
dbus-org.freedesktop.NetworkManager.Device.Bond.xml \
dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml \
dbus-org.freedesktop.NetworkManager.PPP.xml \
dbus-org.freedesktop.NetworkManager.Device.Vlan.xml \
dbus-org.freedesktop.NetworkManager.Device.Adsl.xml \
dbus-org.freedesktop.NetworkManager.AgentManager.xml \
dbus-org.freedesktop.NetworkManager.Device.WiMax.xml \
dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml \
dbus-org.freedesktop.NetworkManager.Device.Tun.xml \
dbus-org.freedesktop.NetworkManager.Device.Bridge.xml \
dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml \
dbus-org.freedesktop.NetworkManager.DHCP4Config.xml \
dbus-org.freedesktop.NetworkManager.Device.Generic.xml \
dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml \
dbus-org.freedesktop.NetworkManager.Device.Modem.xml \
dbus-org.freedesktop.NetworkManager.IP6Config.xml \
dbus-org.freedesktop.NetworkManager.Device.Veth.xml \
dbus-org.freedesktop.NetworkManager.Settings.xml \
dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
dbus-org.freedesktop.NetworkManager.IP4Config.xml \
dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
$(top_builddir)/libnm-core/nm-dbus-types.xml \
$(top_builddir)/libnm-core/nm-vpn-dbus-types.xml \
$(top_builddir)/man/nmcli.xml \
......
......@@ -65,40 +65,40 @@
<title>Interfaces</title>
<!-- TODO: Split me into chapters about daemon, vpn plugins, dispatcher and the secret agent.
Then describe the daemon's singletons and object hierarchy. -->
<xi:include href="../../introspection/nmdbus-manager-org.freedesktop.NetworkManager.xml"/>
<xi:include href="../../introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml"/>
<xi:include href="../../introspection/nmdbus-agent-manager-org.freedesktop.NetworkManager.AgentManager.xml"/>
<xi:include href="../../introspection/nmdbus-access-point-org.freedesktop.NetworkManager.AccessPoint.xml"/>
<xi:include href="../../introspection/nmdbus-ppp-manager-org.freedesktop.NetworkManager.PPP.xml"/>
<xi:include href="../../introspection/nmdbus-settings-connection-org.freedesktop.NetworkManager.Settings.Connection.xml"/>
<xi:include href="../../introspection/nmdbus-vpn-connection-org.freedesktop.NetworkManager.VPN.Connection.xml"/>
<xi:include href="../../introspection/nmdbus-active-connection-org.freedesktop.NetworkManager.Connection.Active.xml"/>
<xi:include href="../../introspection/nmdbus-device-org.freedesktop.NetworkManager.Device.xml"/>
<xi:include href="../../introspection/nmdbus-device-adsl-org.freedesktop.NetworkManager.Device.Adsl.xml"/>
<xi:include href="../../introspection/nmdbus-device-bond-org.freedesktop.NetworkManager.Device.Bond.xml"/>
<xi:include href="../../introspection/nmdbus-device-bridge-org.freedesktop.NetworkManager.Device.Bridge.xml"/>
<xi:include href="../../introspection/nmdbus-device-bt-org.freedesktop.NetworkManager.Device.Bluetooth.xml"/>
<xi:include href="../../introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml"/>
<xi:include href="../../introspection/nmdbus-device-generic-org.freedesktop.NetworkManager.Device.Generic.xml"/>
<xi:include href="../../introspection/nmdbus-device-infiniband-org.freedesktop.NetworkManager.Device.Infiniband.xml"/>
<xi:include href="../../introspection/nmdbus-device-ip-tunnel-org.freedesktop.NetworkManager.Device.IPTunnel.xml"/>
<xi:include href="../../introspection/nmdbus-device-macvlan-org.freedesktop.NetworkManager.Device.Macvlan.xml"/>
<xi:include href="../../introspection/nmdbus-device-modem-org.freedesktop.NetworkManager.Device.Modem.xml"/>
<xi:include href="../../introspection/nmdbus-device-olpc-mesh-org.freedesktop.NetworkManager.Device.OlpcMesh.xml"/>
<xi:include href="../../introspection/nmdbus-device-team-org.freedesktop.NetworkManager.Device.Team.xml"/>
<xi:include href="../../introspection/nmdbus-device-tun-org.freedesktop.NetworkManager.Device.Tun.xml"/>
<xi:include href="../../introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml"/>
<xi:include href="../../introspection/nmdbus-device-vlan-org.freedesktop.NetworkManager.Device.Vlan.xml"/>
<xi:include href="../../introspection/nmdbus-device-vxlan-org.freedesktop.NetworkManager.Device.Vxlan.xml"/>
<xi:include href="../../introspection/nmdbus-device-wifi-org.freedesktop.NetworkManager.Device.Wireless.xml"/>
<xi:include href="../../introspection/nmdbus-device-wimax-org.freedesktop.NetworkManager.Device.WiMax.xml"/>
<xi:include href="../../introspection/nmdbus-dhcp4-config-org.freedesktop.NetworkManager.DHCP4Config.xml"/>
<xi:include href="../../introspection/nmdbus-dhcp6-config-org.freedesktop.NetworkManager.DHCP6Config.xml"/>
<xi:include href="../../introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml"/>
<xi:include href="../../introspection/nmdbus-ip6-config-org.freedesktop.NetworkManager.IP6Config.xml"/>
<xi:include href="../../introspection/nmdbus-vpn-plugin-org.freedesktop.NetworkManager.VPN.Plugin.xml"/>
<xi:include href="../../introspection/nmdbus-secret-agent-org.freedesktop.NetworkManager.SecretAgent.xml"/>
<xi:include href="../../introspection/nmdbus-device-statistics-org.freedesktop.NetworkManager.Device.Statistics.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Settings.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.AgentManager.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.AccessPoint.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.PPP.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Settings.Connection.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.VPN.Connection.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Connection.Active.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Adsl.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bond.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bridge.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wired.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Generic.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Modem.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Team.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Tun.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Veth.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Vlan.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wireless.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.WiMax.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.DHCP4Config.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.DHCP6Config.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.IP4Config.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.IP6Config.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.SecretAgent.xml"/>
<xi:include href="dbus-org.freedesktop.NetworkManager.Device.Statistics.xml"/>
</section>
<section id="dbus-types">
<title>Types</title>
......
......@@ -37,12 +37,12 @@
#include "nm-wimax-nsp.h"
#include "nm-object-private.h"
#include "nmdbus-manager.h"
#include "nmdbus-device-wifi.h"
#include "nmdbus-device.h"
#include "nmdbus-settings.h"
#include "nmdbus-settings-connection.h"
#include "nmdbus-vpn-connection.h"
#include "introspection/org.freedesktop.NetworkManager.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Wireless.h"
#include "introspection/org.freedesktop.NetworkManager.Device.h"
#include "introspection/org.freedesktop.NetworkManager.Settings.h"
#include "introspection/org.freedesktop.NetworkManager.Settings.Connection.h"
#include "introspection/org.freedesktop.NetworkManager.VPN.Connection.h"
#include "nm-access-point.h"
#include "nm-active-connection.h"
......
......@@ -35,7 +35,7 @@
#include "nm-core-internal.h"
#include "nm-dbus-helpers.h"
#include "nmdbus-device-wifi.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Wireless.h"
G_DEFINE_TYPE (NMDeviceWifi, nm_device_wifi, NM_TYPE_DEVICE)
......
......@@ -41,7 +41,7 @@
#include "nm-device-tun.h"
#include "nm-setting-connection.h"
#include "nmdbus-device.h"
#include "introspection/org.freedesktop.NetworkManager.Device.h"
static gboolean connection_compatible (NMDevice *device, NMConnection *connection, GError **error);
static NMLldpNeighbor *nm_lldp_neighbor_dup (NMLldpNeighbor *neighbor);
......
......@@ -35,7 +35,7 @@
#include "nm-vpn-connection.h"
#include "nm-dbus-helpers.h"
#include "nmdbus-manager.h"
#include "introspection/org.freedesktop.NetworkManager.h"
void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);
......
......@@ -33,7 +33,7 @@
#include "nm-object-private.h"
#include "nm-dbus-helpers.h"
#include "nmdbus-settings-connection.h"
#include "introspection/org.freedesktop.NetworkManager.Settings.Connection.h"
static void nm_remote_connection_connection_iface_init (NMConnectionInterface *iface);
static void nm_remote_connection_initable_iface_init (GInitableIface *iface);
......
......@@ -35,7 +35,7 @@
#include "nm-dbus-helpers.h"
#include "nm-core-internal.h"
#include "nmdbus-settings.h"
#include "introspection/org.freedesktop.NetworkManager.Settings.h"
G_DEFINE_TYPE (NMRemoteSettings, nm_remote_settings, NM_TYPE_OBJECT)
......
......@@ -29,8 +29,8 @@
#include "nm-simple-connection.h"
#include "nm-core-internal.h"
#include "nmdbus-secret-agent.h"
#include "nmdbus-agent-manager.h"
#include "introspection/org.freedesktop.NetworkManager.SecretAgent.h"
#include "introspection/org.freedesktop.NetworkManager.AgentManager.h"
static void nm_secret_agent_old_initable_iface_init (GInitableIface *iface);
static void nm_secret_agent_old_async_initable_iface_init (GAsyncInitableIface *iface);
......
......@@ -30,7 +30,7 @@
#include "nm-active-connection.h"
#include "nm-dbus-helpers.h"
#include "nmdbus-vpn-connection.h"
#include "introspection/org.freedesktop.NetworkManager.VPN.Connection.h"
G_DEFINE_TYPE (NMVpnConnection, nm_vpn_connection, NM_TYPE_ACTIVE_CONNECTION)
......
......@@ -34,7 +34,7 @@
#include "nm-core-internal.h"
#include "nm-simple-connection.h"
#include "nmdbus-vpn-plugin.h"
#include "introspection/org.freedesktop.NetworkManager.VPN.Plugin.h"
#define NM_VPN_PLUGIN_OLD_QUIT_TIMER 180
......
......@@ -34,7 +34,7 @@
#include "nm-core-internal.h"
#include "nm-simple-connection.h"
#include "nmdbus-vpn-plugin.h"
#include "introspection/org.freedesktop.NetworkManager.VPN.Plugin.h"
#define NM_VPN_SERVICE_PLUGIN_QUIT_TIMER 180
......
......@@ -39,7 +39,7 @@
#include "nm-setting-adsl.h"
#include "nm-utils.h"
#include "nmdbus-device-adsl.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Adsl.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF (NMDeviceAdsl);
......
......@@ -40,7 +40,7 @@
#include "nm-bt-error.h"
#include "platform/nm-platform.h"
#include "nmdbus-device-bt.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Bluetooth.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceBt);
......
......@@ -32,7 +32,7 @@
#include "nm-core-internal.h"
#include "nm-ip4-config.h"
#include "nmdbus-device-bond.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Bond.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceBond);
......
......@@ -30,7 +30,7 @@
#include "nm-device-factory.h"
#include "nm-core-internal.h"
#include "nmdbus-device-bridge.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Bridge.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceBridge);
......
......@@ -51,7 +51,7 @@
#include "nm-core-internal.h"
#include "NetworkManagerUtils.h"
#include "nmdbus-device-ethernet.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Wired.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceEthernet);
......
......@@ -26,7 +26,7 @@
#include "platform/nm-platform.h"
#include "nm-core-internal.h"
#include "nmdbus-device-generic.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Generic.h"
/*****************************************************************************/
......
......@@ -32,7 +32,7 @@
#include "nm-device-factory.h"
#include "nm-core-internal.h"
#include "nmdbus-device-infiniband.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Infiniband.h"
#define NM_DEVICE_INFINIBAND_IS_PARTITION "is-partition"
......
......@@ -37,7 +37,7 @@
#include "nm-act-request.h"
#include "nm-ip4-config.h"
#include "nmdbus-device-ip-tunnel.h"
#include "introspection/org.freedesktop.NetworkManager.Device.IPTunnel.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceIPTunnel);
......
......@@ -36,7 +36,7 @@
#include "nm-ip4-config.h"
#include "nm-utils.h"
#include "nmdbus-device-macvlan.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Macvlan.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceMacvlan);
......
......@@ -34,7 +34,7 @@
#include "nm-setting-tun.h"
#include "nm-core-internal.h"
#include "nmdbus-device-tun.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Tun.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceTun);
......
......@@ -33,7 +33,7 @@
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#include "nmdbus-device-veth.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Veth.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceVeth);
......
......@@ -37,7 +37,7 @@
#include "nm-core-internal.h"
#include "platform/nmp-object.h"
#include "nmdbus-device-vlan.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Vlan.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceVlan);
......
......@@ -35,7 +35,7 @@
#include "nm-act-request.h"
#include "nm-ip4-config.h"
#include "nmdbus-device-vxlan.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Vxlan.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceVxlan);
......
......@@ -70,8 +70,8 @@
#include "nm-device-logging.h"
_LOG_DECLARE_SELF (NMDevice);
#include "nmdbus-device.h"
#include "nmdbus-device-statistics.h"
#include "introspection/org.freedesktop.NetworkManager.Device.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Statistics.h"
G_DEFINE_ABSTRACT_TYPE (NMDevice, nm_device, NM_TYPE_EXPORTED_OBJECT)
......
......@@ -36,7 +36,7 @@
#include "nm-ip4-config.h"
#include "nm-dbus-compat.h"
#include "nmdbus-device-team.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Team.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceTeam);
......
......@@ -51,7 +51,7 @@
/* This is a bug; but we can't really change API now... */
#include "nm-vpn-dbus-interface.h"
#include "nmdbus-device-olpc-mesh.h"
#include "introspection/org.freedesktop.NetworkManager.Device.OlpcMesh.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceOlpcMesh);
......
......@@ -51,7 +51,7 @@
#include "nm-core-internal.h"
#include "nm-config.h"
#include "nmdbus-device-wifi.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Wireless.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceWifi);
......
......@@ -32,7 +32,7 @@
#include "nm-setting-wireless.h"
#include "nmdbus-access-point.h"
#include "introspection/org.freedesktop.NetworkManager.AccessPoint.h"
#define PROTO_WPA "wpa"
#define PROTO_RSN "rsn"
......
......@@ -32,7 +32,7 @@
#include "NetworkManagerUtils.h"
#include "nm-core-internal.h"
#include "nmdbus-device-modem.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Modem.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceModem);
......
......@@ -32,7 +32,7 @@
#include "NetworkManagerUtils.h"
#include "nm-core-internal.h"
#include "nmdbus-active-connection.h"
#include "introspection/org.freedesktop.NetworkManager.Connection.Active.h"
typedef struct _NMActiveConnectionPrivate {
NMSettingsConnection *settings_connection;
......
......@@ -33,7 +33,7 @@
#include "settings/nm-settings-connection.h"
#include "nm-simple-connection.h"
#include "nm-utils.h"
#include "nmdbus-checkpoint.h"
#include "introspection/org.freedesktop.NetworkManager.Checkpoint.h"
/*****************************************************************************/
......
......@@ -28,7 +28,7 @@
#include "nm-utils.h"
#include "nm-exported-object.h"
#include "nmdbus-dhcp4-config.h"
#include "introspection/org.freedesktop.NetworkManager.DHCP4Config.h"
/*****************************************************************************/
......
......@@ -28,7 +28,7 @@
#include "nm-utils.h"
#include "nm-exported-object.h"
#include "nmdbus-dhcp6-config.h"
#include "introspection/org.freedesktop.NetworkManager.DHCP6Config.h"
/*****************************************************************************/
......
......@@ -29,7 +29,7 @@
#include "devices/nm-device.h"
#include "nm-active-connection.h"
#include "nmdbus-device-statistics.h"
#include "introspection/org.freedesktop.NetworkManager.Device.Statistics.h"
#if NM_MORE_ASSERTS >= 2
#define _ASSERT_NO_EARLY_EXPORT
......
......@@ -33,7 +33,7 @@
#include "nm-route-manager.h"
#include "nm-core-internal.h"
#include "nmdbus-ip4-config.h"
#include "introspection/org.freedesktop.NetworkManager.IP4Config.h"
typedef struct {
gboolean never_default;
......
......@@ -33,7 +33,7 @@
#include "nm-core-internal.h"
#include "NetworkManagerUtils.h"
#include "nmdbus-ip6-config.h"
#include "introspection/org.freedesktop.NetworkManager.IP6Config.h"
typedef struct {
gboolean never_default;
......
......@@ -56,8 +56,8 @@
#include "nm-checkpoint-manager.h"
#include "NetworkManagerUtils.h"
#include "nmdbus-manager.h"
#include "nmdbus-device.h"
#include "introspection/org.freedesktop.NetworkManager.h"
#include "introspection/org.freedesktop.NetworkManager.Device.h"
static gboolean add_device (NMManager *self, NMDevice *device, GError **error);
......
......@@ -52,7 +52,7 @@
#include "nm-pppd-plugin.h"
#include "nm-ppp-status.h"
#include "nmdbus-ppp-manager.h"
#include "introspection/org.freedesktop.NetworkManager.PPP.h"
#define NM_PPPD_PLUGIN PPPD_PLUGIN_DIR "/nm-pppd-plugin.so"
#define PPP_MANAGER_SECRET_TRIES "ppp-manager-secret-tries"
......
......@@ -37,7 +37,7 @@
#include "NetworkManagerUtils.h"
#include "nm-core-internal.h"
#include "nmdbus-agent-manager.h"
#include "introspection/org.freedesktop.NetworkManager.AgentManager.h"
/*****************************************************************************/
......
......@@ -31,7 +31,7 @@
#include "nm-simple-connection.h"
#include "NetworkManagerUtils.h"
#include "nmdbus-secret-agent.h"
#include "introspection/org.freedesktop.NetworkManager.SecretAgent.h"
/*****************************************************************************/
......
......@@ -37,7 +37,7 @@
#include "nm-core-internal.h"
#include "nm-audit-manager.h"
#include "nmdbus-settings-connection.h"
#include "introspection/org.freedesktop.NetworkManager.Settings.Connection.h"
#define SETTINGS_TIMESTAMPS_FILE NMSTATEDIR "/timestamps"
#define SETTINGS_SEEN_BSSIDS_FILE NMSTATEDIR "/seen-bssids"
......
......@@ -77,7 +77,7 @@
#include "nm-dispatcher.h"
#include "nm-inotify-helper.h"
#include "nmdbus-settings.h"
#include "introspection/org.freedesktop.NetworkManager.Settings.h"
/*****************************************************************************/
......
......@@ -51,7 +51,7 @@
#include "nm-vpn-manager.h"
#include "dns/nm-dns-manager.h"
#include "nmdbus-vpn-connection.h"
#include "introspection/org.freedesktop.NetworkManager.VPN.Connection.h"
typedef enum {
/* Only system secrets */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment