diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-19 13:48:39 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-19 13:48:39 +0000 |
| commit | 3f0c72322c19f6e0629c440f6036a836938468ad (patch) | |
| tree | 1aae5a3d447560c82225f77da227ec5b81ccfa0d /daemon/adapter.c | |
| parent | d6f0c6dcc0a7e43176ffaaa56fd4804bbba402f5 (diff) | |
Update manager interaction with adapter and service framework
Diffstat (limited to 'daemon/adapter.c')
| -rw-r--r-- | daemon/adapter.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/daemon/adapter.c b/daemon/adapter.c index 12837507..e4192f96 100644 --- a/daemon/adapter.c +++ b/daemon/adapter.c @@ -38,7 +38,8 @@ static DBusConnection *connection = NULL; -DBusMessage *adapter_list(DBusMessage *msg) +DBusHandlerResult manager_list_adapters(DBusConnection *conn, + DBusMessage *msg, void *data) { DBusMessage *reply; DBusMessageIter iter, array; @@ -46,7 +47,7 @@ DBusMessage *adapter_list(DBusMessage *msg) reply = dbus_message_new_method_return(msg); if (!reply) - return NULL; + return DBUS_HANDLER_RESULT_NEED_MEMORY; dbus_message_iter_init_append(reply, &iter); @@ -57,10 +58,11 @@ DBusMessage *adapter_list(DBusMessage *msg) dbus_message_iter_close_container(&iter, &array); - return reply; + return dbus_connection_send_and_unref(conn, reply); } -DBusMessage *adapter_find(DBusMessage *msg) +DBusHandlerResult manager_find_adapter(DBusConnection *conn, + DBusMessage *msg, void *data) { DBusMessage *reply; const char *pattern; @@ -73,27 +75,28 @@ DBusMessage *adapter_find(DBusMessage *msg) reply = dbus_message_new_method_return(msg); if (!reply) - return NULL; + return DBUS_HANDLER_RESULT_NEED_MEMORY; dbus_message_append_args(reply, DBUS_TYPE_STRING, &ptr, DBUS_TYPE_INVALID); - return reply; + return dbus_connection_send_and_unref(conn, reply); } -DBusMessage *adapter_default(DBusMessage *msg) +DBusHandlerResult manager_default_adapter(DBusConnection *conn, + DBusMessage *msg, void *data) { DBusMessage *reply; const char path[] = "/org/bluez/hci0", *ptr = path; reply = dbus_message_new_method_return(msg); if (!reply) - return NULL; + return DBUS_HANDLER_RESULT_NEED_MEMORY; dbus_message_append_args(reply, DBUS_TYPE_STRING, &ptr, DBUS_TYPE_INVALID); - return reply; + return dbus_connection_send_and_unref(conn, reply); } int adapter_init(DBusConnection *conn) |