diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-08-11 13:38:59 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-09-22 16:05:50 +0200 |
| commit | c73b5c1be0c683f234ce7e4b2cdcefa1882e6262 (patch) | |
| tree | 75339af7e624cecefaa720e361b2814f406a711f | |
| parent | e688e70b372a2661dcad17d277ca7233ffad4f6d (diff) | |
| download | NetworkManager-c73b5c1be0c683f234ce7e4b2cdcefa1882e6262.tar.gz | |
shared,all: add and use DBUS_INTERFACE_OBJECT_MANAGER define
| -rw-r--r-- | shared/nm-std-aux/nm-dbus-compat.h | 2 | ||||
| -rw-r--r-- | src/devices/bluetooth/nm-bluez-common.h | 1 | ||||
| -rw-r--r-- | src/devices/bluetooth/nm-bluez5-manager.c | 3 | ||||
| -rw-r--r-- | src/nm-dbus-manager.c | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/shared/nm-std-aux/nm-dbus-compat.h b/shared/nm-std-aux/nm-dbus-compat.h index 263584d27b..b04d145474 100644 --- a/shared/nm-std-aux/nm-dbus-compat.h +++ b/shared/nm-std-aux/nm-dbus-compat.h @@ -31,6 +31,8 @@ /** The interface supported by most dbus peers */ #define DBUS_INTERFACE_PEER "org.freedesktop.DBus.Peer" +#define DBUS_INTERFACE_OBJECT_MANAGER "org.freedesktop.DBus.ObjectManager" + /** This is a special interface whose methods can only be invoked * by the local implementation (messages from remote apps aren't * allowed to specify this interface). diff --git a/src/devices/bluetooth/nm-bluez-common.h b/src/devices/bluetooth/nm-bluez-common.h index 80bbb9d9c6..0289da0fe1 100644 --- a/src/devices/bluetooth/nm-bluez-common.h +++ b/src/devices/bluetooth/nm-bluez-common.h @@ -13,7 +13,6 @@ #define NM_BLUEZ_SERVICE "org.bluez" #define NM_BLUEZ_MANAGER_PATH "/" -#define NM_OBJECT_MANAGER_INTERFACE "org.freedesktop.DBus.ObjectManager" #define NM_BLUEZ5_ADAPTER_INTERFACE "org.bluez.Adapter1" #define NM_BLUEZ5_DEVICE_INTERFACE "org.bluez.Device1" diff --git a/src/devices/bluetooth/nm-bluez5-manager.c b/src/devices/bluetooth/nm-bluez5-manager.c index 7ac7e4c99a..9ede4d709e 100644 --- a/src/devices/bluetooth/nm-bluez5-manager.c +++ b/src/devices/bluetooth/nm-bluez5-manager.c @@ -15,6 +15,7 @@ #include "nm-core-internal.h" +#include "nm-std-aux/nm-dbus-compat.h" #include "c-list/src/c-list.h" #include "nm-bluez-device.h" #include "nm-bluez-common.h" @@ -469,7 +470,7 @@ bluez_connect (NMBluez5Manager *self) NULL, NM_BLUEZ_SERVICE, NM_BLUEZ_MANAGER_PATH, - NM_OBJECT_MANAGER_INTERFACE, + DBUS_INTERFACE_OBJECT_MANAGER, NULL, (GAsyncReadyCallback) on_proxy_acquired, self); diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c index 7eee251dd0..f5cbe066fe 100644 --- a/src/nm-dbus-manager.c +++ b/src/nm-dbus-manager.c @@ -1449,7 +1449,7 @@ static const GDBusSignalInfo signal_info_objmgr_interfaces_removed = NM_DEFINE_G ); static const GDBusInterfaceInfo interface_info_objmgr = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT ( - "org.freedesktop.DBus.ObjectManager", + DBUS_INTERFACE_OBJECT_MANAGER, .methods = NM_DEFINE_GDBUS_METHOD_INFOS ( NM_DEFINE_GDBUS_METHOD_INFO ( "GetManagedObjects", |