Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

dbus: Use recently added l_dbus_name_acquire 

Use the backend-independent l_dbus_name_acquire.
This commit is contained in:
Andrew Zaborowski 2016-04-01 04:27:40 +02:00 committed by Denis Kenzior
parent 945b48bfc9
commit fb1adcae2a
1 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/dbus.c
View File

@ -170,31 +170,18 @@ void dbus_pending_reply(struct l_dbus_message **msg,
*msg = NULL;
}
static void request_name_callback(struct l_dbus_message *message,
void *user_data)
static void request_name_callback(struct l_dbus *dbus, bool success,
bool queued, void *user_data)
{
const char *error, *text;
uint32_t result;
if (l_dbus_message_get_error(message, &error, &text)) {
l_error("error=%s", error);
l_error("message=%s", text);
return;
}
if (!l_dbus_message_get_arguments(message, "u", &result))
return;
}
static void request_name_setup(struct l_dbus_message *message, void *user_data)
{
const char *name = "net.connman.iwd";
l_dbus_message_set_arguments(message, "su", name, 0);
if (!success)
l_error("Name request failed");
}
static void ready_callback(void *user_data)
{
l_dbus_name_acquire(g_dbus, "net.connman.iwd", false, false, true,
request_name_callback, NULL);
manager_init(g_dbus);
}
@ -241,12 +228,6 @@ bool dbus_init(bool enable_debug, bool use_kdbus)
l_dbus_set_ready_handler(g_dbus, ready_callback, g_dbus, NULL);
l_dbus_set_disconnect_handler(g_dbus, disconnect_callback, NULL, NULL);
l_dbus_method_call(g_dbus, "org.freedesktop.DBus",
"/org/freedesktop/DBus",
"org.freedesktop.DBus", "RequestName",
request_name_setup,
request_name_callback, NULL, NULL);
return true;
}