summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2006-02-12 07:27:40 +0000
committerMarcel Holtmann <marcel@holtmann.org>2006-02-12 07:27:40 +0000
commitcbc3a571dbde7ff64b21b1f7e24be9deff29b652 (patch)
tree4eca5fe060fbb1c9c8ef8eb1d9eb9c26e9903aca
parent8586fc0c0dc8d6fe219f7eb7a697f359827b39a0 (diff)
Use ListDevices instead of DeviceList
-rw-r--r--hcid/dbus-manager.c4
-rw-r--r--hcid/dbus.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/hcid/dbus-manager.c b/hcid/dbus-manager.c
index dfb00022..4b2ad99e 100644
--- a/hcid/dbus-manager.c
+++ b/hcid/dbus-manager.c
@@ -39,7 +39,7 @@
#include "hcid.h"
#include "dbus.h"
-static DBusMessage* handle_mgr_device_list_req(DBusMessage *msg, void *data)
+static DBusMessage* handle_mgr_list_devices_req(DBusMessage *msg, void *data)
{
DBusMessageIter iter;
DBusMessageIter array_iter;
@@ -132,7 +132,7 @@ static DBusMessage* handle_mgr_default_device_req(DBusMessage *msg, void *data)
}
static const struct service_data mgr_services[] = {
- { MGR_DEVICE_LIST, handle_mgr_device_list_req, MGR_DEVICE_LIST_SIGNATURE },
+ { MGR_LIST_DEVICES, handle_mgr_list_devices_req, MGR_LIST_DEVICES_SIGNATURE },
{ MGR_DEFAULT_DEVICE, handle_mgr_default_device_req, MGR_DEFAULT_DEVICE_SIGNATURE },
{ NULL, NULL, NULL }
};
diff --git a/hcid/dbus.h b/hcid/dbus.h
index 913733f7..373976dc 100644
--- a/hcid/dbus.h
+++ b/hcid/dbus.h
@@ -86,7 +86,7 @@ int get_default_dev_id(void);
BlueZ D-Bus Manager service definitions "/org/bluez/Manager"
*========================================================================*/
-#define MGR_DEVICE_LIST "DeviceList"
+#define MGR_LIST_DEVICES "ListDevices"
#define MGR_DEFAULT_DEVICE "DefaultDevice"
/* Signals sent in the Manager path */
@@ -94,7 +94,7 @@ int get_default_dev_id(void);
#define BLUEZ_MGR_DEV_REMOVED "DeviceRemoved"
/* Manager Signatures */
-#define MGR_DEVICE_LIST_SIGNATURE __END_SIG__
+#define MGR_LIST_DEVICES_SIGNATURE __END_SIG__
#define MGR_DEFAULT_DEVICE_SIGNATURE __END_SIG__
#define MGR_REPLY_DEVICE_LIST_SIGNATURE DBUS_TYPE_ARRAY_AS_STRING \