shared,all: add and use DBUS_INTERFACE_OBJECT_MANAGER define

This commit is contained in:
Thomas Haller 2019-08-11 13:38:59 +02:00
parent e688e70b37
commit c73b5c1be0
4 changed files with 5 additions and 3 deletions

View file

@ -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).

View file

@ -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"

View file

@ -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);

View file

@ -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",