diff options
Diffstat (limited to 'daemon/manager.c')
| -rw-r--r-- | daemon/manager.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/daemon/manager.c b/daemon/manager.c index 29a4947e..c919dc28 100644 --- a/daemon/manager.c +++ b/daemon/manager.c @@ -31,6 +31,7 @@ #include "logging.h" #include "system.h" +#include "service.h" #include "manager.h" #define MANAGER_INTERFACE "org.bluez.Manager" @@ -95,20 +96,12 @@ static DBusHandlerResult default_adapter(DBusConnection *conn, static DBusHandlerResult list_services(DBusConnection *conn, DBusMessage *msg, void *data) { - DBusMessageIter iter, array; DBusMessage *reply; - reply = dbus_message_new_method_return(msg); + reply = service_list(msg); if (!reply) return DBUS_HANDLER_RESULT_NEED_MEMORY; - dbus_message_iter_init_append(reply, &iter); - - dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, - DBUS_TYPE_STRING_AS_STRING, &array); - - dbus_message_iter_close_container(&iter, &array); - return dbus_connection_send_and_unref(conn, reply); } @@ -117,12 +110,10 @@ static DBusHandlerResult find_service(DBusConnection *conn, { DBusMessage *reply; - reply = dbus_message_new_method_return(msg); + reply = service_find(msg); if (!reply) return DBUS_HANDLER_RESULT_NEED_MEMORY; - dbus_message_append_args(reply, DBUS_TYPE_INVALID); - return dbus_connection_send_and_unref(conn, reply); } @@ -131,12 +122,10 @@ static DBusHandlerResult activate_service(DBusConnection *conn, { DBusMessage *reply; - reply = dbus_message_new_method_return(msg); + reply = service_activate(msg); if (!reply) return DBUS_HANDLER_RESULT_NEED_MEMORY; - dbus_message_append_args(reply, DBUS_TYPE_INVALID); - return dbus_connection_send_and_unref(conn, reply); } |