summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2016-01-05 14:44:23 -0300
committerPatrik Flykt <patrik.flykt@linux.intel.com>2016-07-14 13:22:03 +0300
commit06c0fd1bc5122358e910ae50972aa348b5d12ecf (patch)
tree632b6a231ff87b0c41e5f1072164fd28bd2d76aa
parent00e7aaf5a4f6c9d6ce1f17ea4687e4edd17a1045 (diff)
downloadconnman-06c0fd1bc5122358e910ae50972aa348b5d12ecf.tar.gz
gdbus/client: Always call ready callback
Call ready callback regardless of the reply to GetManagedObjects since otherwise the user code will be left waiting forever when in fact no proxy will be created.
-rw-r--r--gdbus/client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gdbus/client.c b/gdbus/client.c
index 48711ae8..068e778c 100644
--- a/gdbus/client.c
+++ b/gdbus/client.c
@@ -1073,9 +1073,6 @@ static void parse_managed_objects(GDBusClient *client, DBusMessage *msg)
dbus_message_iter_next(&dict);
}
-
- if (client->ready)
- client->ready(client, client->ready_data);
}
static void get_managed_objects_reply(DBusPendingCall *call, void *user_data)
@@ -1096,6 +1093,9 @@ static void get_managed_objects_reply(DBusPendingCall *call, void *user_data)
parse_managed_objects(client, reply);
done:
+ if (client->ready)
+ client->ready(client, client->ready_data);
+
dbus_message_unref(reply);
dbus_pending_call_unref(client->get_objects_call);