Commit a1f37964 authored by Thomas Haller's avatar Thomas Haller

core: rename "nm-bus-manager.h" to "nm-dbus-manager.h"

The next commit will completely rework NMBusManager and replace
NMExportedObject by a new type NMDBusObject.

Originally, NMDBusObject was added along NMExportedObject to ease
the rework and have compilable, intermediate stages of refactoring. Now,
I think the new name is better, because NMDBusObject is very strongly related
to the bus manager and the old name NMExportedObject didn't make that
clear.

I also slighly prefer the name NMDBusObject over NMBusObject, hence
for consistancy, also rename NMBusManager to NMDBusManager.

This commit only renames the file for a nicer diff in the next commit.
It does not actually update the type name in sources. That will be done
later.
parent 8b75f10e
......@@ -1589,8 +1589,8 @@ src_libNetworkManager_la_SOURCES = \
src/nm-active-connection.h \
src/nm-audit-manager.c \
src/nm-audit-manager.h \
src/nm-bus-manager.c \
src/nm-bus-manager.h \
src/nm-dbus-manager.c \
src/nm-dbus-manager.h \
src/nm-config.c \
src/nm-config.h \
src/nm-config-data.c \
......
......@@ -33,7 +33,7 @@
#include "nm-dhcp-client.h"
#include "nm-dhcp-manager.h"
#include "nm-core-internal.h"
#include "nm-bus-manager.h"
#include "nm-dbus-manager.h"
#include "NetworkManagerUtils.h"
#define PRIV_SOCK_PATH NMRUNDIR "/private-dhcp"
......
......@@ -35,7 +35,7 @@
#include "nm-utils.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"
#include "nm-bus-manager.h"
#include "nm-dbus-manager.h"
#include "NetworkManagerUtils.h"
#define PIDFILE NMRUNDIR "/dnsmasq.pid"
......
......@@ -37,7 +37,7 @@
#include "nm-utils.h"
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"
#include "nm-bus-manager.h"
#include "nm-dbus-manager.h"
#include "nm-manager.h"
#include "nm-setting-connection.h"
#include "devices/nm-device.h"
......
......@@ -39,7 +39,7 @@
#include "NetworkManagerUtils.h"
#include "nm-manager.h"
#include "platform/nm-linux-platform.h"
#include "nm-bus-manager.h"
#include "nm-dbus-manager.h"
#include "devices/nm-device.h"
#include "dhcp/nm-dhcp-manager.h"
#include "nm-config.h"
......
......@@ -145,7 +145,7 @@ sources = files(
'nm-auth-manager.c',
'nm-auth-subject.c',
'nm-auth-utils.c',
'nm-bus-manager.c',
'nm-dbus-manager.c',
'nm-checkpoint.c',
'nm-checkpoint-manager.c',
'nm-config.c',
......
......@@ -33,7 +33,7 @@
#include <string.h>
#include <stdlib.h>
#include "nm-bus-manager.h"
#include "nm-dbus-manager.h"
#include "NetworkManagerUtils.h"
enum {
......
......@@ -21,7 +21,7 @@
#include "nm-default.h"
#include "nm-bus-manager.h"
#include "nm-dbus-manager.h"
#include <unistd.h>
#include <sys/stat.h>
......
......@@ -25,7 +25,7 @@
#include <stdarg.h>
#include <string.h>
#include "nm-bus-manager.h"
#include "nm-dbus-manager.h"
#include "devices/nm-device.h"
#include "nm-active-connection.h"
......
......@@ -597,7 +597,7 @@ const NMDhcpClientFactory *const _nm_dhcp_manager_factories[4] = {
#include "nm-config.h"
#include "devices/nm-device.h"
#include "nm-active-connection.h"
#include "nm-bus-manager.h"
#include "nm-dbus-manager.h"
void
nm_main_config_reload (int signal)
......
......@@ -30,7 +30,7 @@
#include <unistd.h>
#include "nm-common-macros.h"
#include "nm-bus-manager.h"
#include "nm-dbus-manager.h"
#include "vpn/nm-vpn-manager.h"
#include "devices/nm-device.h"
#include "devices/nm-device-generic.h"
......
......@@ -31,7 +31,7 @@
#include "nm-auth-utils.h"
#include "nm-setting-vpn.h"
#include "nm-auth-manager.h"
#include "nm-bus-manager.h"
#include "nm-dbus-manager.h"
#include "nm-session-monitor.h"
#include "nm-simple-connection.h"
#include "NetworkManagerUtils.h"
......
......@@ -26,8 +26,8 @@
#include <pwd.h>
#include "nm-dbus-interface.h"
#include "nm-dbus-manager.h"
#include "nm-core-internal.h"
#include "nm-bus-manager.h"
#include "nm-auth-subject.h"
#include "nm-simple-connection.h"
#include "NetworkManagerUtils.h"
......
......@@ -65,7 +65,7 @@
#include "devices/nm-device-ethernet.h"
#include "nm-settings-connection.h"
#include "nm-settings-plugin.h"
#include "nm-bus-manager.h"
#include "nm-dbus-manager.h"
#include "nm-auth-utils.h"
#include "nm-auth-subject.h"
#include "nm-session-monitor.h"
......
......@@ -25,7 +25,7 @@
#include "nm-config.h"
#include "nm-test-device.h"
#include "platform/nm-fake-platform.h"
#include "nm-bus-manager.h"
#include "nm-dbus-manager.h"
#include "nm-connectivity.h"
#include "nm-test-utils-core.h"
......
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