korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-12-03 09:04:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

obexd: Use pending request in UpdateInbox

Browse Source
This commit is contained in:
Christian Fetzer 2013-09-13 17:28:35 +02:00 committed by Luiz Augusto von Dentz
parent 1852ab4e7b
commit 0416930e7e
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
obexd/client/map.c
View File

@ -1559,21 +1559,21 @@ static void update_inbox_cb(struct obc_session *session,
struct obc_transfer *transfer,
GError *err, void *user_data)
{
struct map_data *map = user_data;
struct pending_request *request = user_data;
DBusMessage *reply;
if (err != NULL) {
reply = g_dbus_create_error(map->msg,
reply = g_dbus_create_error(request->msg,
ERROR_INTERFACE ".Failed",
"%s", err->message);
goto done;
}
reply = dbus_message_new_method_return(map->msg);
reply = dbus_message_new_method_return(request->msg);
done:
g_dbus_send_message(conn, reply);
dbus_message_unref(map->msg);
pending_request_free(request);
}
static DBusMessage *map_update_inbox(DBusConnection *connection,
@ -1584,6 +1584,7 @@ static DBusMessage *map_update_inbox(DBusConnection *connection,
char contents[2];
struct obc_transfer *transfer;
GError *err = NULL;
struct pending_request *request;
contents[0] = FILLER_BYTE;
contents[1] = '\0';
@ -1594,11 +1595,13 @@ static DBusMessage *map_update_inbox(DBusConnection *connection,
if (transfer == NULL)
goto fail;
if (!obc_session_queue(map->session, transfer, update_inbox_cb,
map, &err))
goto fail;
request = pending_request_new(map, message);
map->msg = dbus_message_ref(message);
if (!obc_session_queue(map->session, transfer, update_inbox_cb,
request, &err)) {
pending_request_free(request);
goto fail;
}
return NULL;