diff options
| author | Miao-chen Chou <mcchou@chromium.org> | 2020-10-30 17:52:54 -0700 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2020-11-02 09:53:53 -0800 |
| commit | e432fc73b2a6fdc933169317b63d2b8fc55c2d4b (patch) | |
| tree | 0458b3ed73c0362da0c43ab272cd88a1628835c0 /src/adv_monitor.c | |
| parent | cb3f3f518a1dc7b84eb24bf9874ee5dd932bf39e (diff) | |
| download | bluez-e432fc73b2a6fdc933169317b63d2b8fc55c2d4b.tar.gz | |
adv_monitor: Fix return type of RegisterMonitor() method
This modifies the D-Bus call return type to be asynchronous for
RegisterMonitor() method call.
The following test was performed:
- Enter bluetoothctl, exit the console and re-enter the console without
AlreadyExist error for RegisterMonitor() upon bring-up of the console.
Diffstat (limited to 'src/adv_monitor.c')
| -rw-r--r-- | src/adv_monitor.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/adv_monitor.c b/src/adv_monitor.c index 9d2a400a3..dbc3b2a92 100644 --- a/src/adv_monitor.c +++ b/src/adv_monitor.c @@ -694,6 +694,8 @@ static struct adv_monitor_app *app_create(DBusConnection *conn, app->monitors = queue_new(); + app->reg = dbus_message_ref(msg); + g_dbus_client_set_disconnect_watch(app->client, app_disconnect_cb, app); /* Note that any property changes on a monitor object would not affect @@ -705,8 +707,6 @@ static struct adv_monitor_app *app_create(DBusConnection *conn, g_dbus_client_set_ready_watch(app->client, app_ready_cb, app); - app->reg = dbus_message_ref(msg); - return app; } @@ -800,7 +800,7 @@ static DBusMessage *unregister_monitor(DBusConnection *conn, } static const GDBusMethodTable adv_monitor_methods[] = { - { GDBUS_EXPERIMENTAL_METHOD("RegisterMonitor", + { GDBUS_EXPERIMENTAL_ASYNC_METHOD("RegisterMonitor", GDBUS_ARGS({ "application", "o" }), NULL, register_monitor) }, { GDBUS_EXPERIMENTAL_ASYNC_METHOD("UnregisterMonitor", |