From 6fb9a7a84bbc9b08bd3228bd23fc3805a8429233 Mon Sep 17 00:00:00 2001 From: Mikel Astiz Date: Thu, 3 May 2012 10:28:28 +0200 Subject: [PATCH] obexd: Use new session callback style in modules The session API now provides the transfer object in the callback, so the modules can directly access the transfer object. --- obexd/client/ftp.c | 2 +- obexd/client/manager.c | 2 +- obexd/client/map.c | 2 +- obexd/client/pbap.c | 10 +++++----- obexd/client/sync.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/obexd/client/ftp.c b/obexd/client/ftp.c index 0cb3adc0f..86c2a3c5d 100644 --- a/obexd/client/ftp.c +++ b/obexd/client/ftp.c @@ -204,7 +204,7 @@ static void list_folder_callback(struct obc_session *session, reply = dbus_message_new_method_return(msg); - if (obc_session_get_contents(session, &contents, &size) < 0) + if (obc_transfer_get_contents(transfer, &contents, &size) < 0) goto done; dbus_message_iter_init_append(reply, &iter); diff --git a/obexd/client/manager.c b/obexd/client/manager.c index 820ef37ed..a46519fd9 100644 --- a/obexd/client/manager.c +++ b/obexd/client/manager.c @@ -468,7 +468,7 @@ static void capabilities_complete_callback(struct obc_session *session, goto done; } - perr = obc_session_get_contents(session, &contents, &size); + perr = obc_transfer_get_contents(transfer, &contents, &size); if (perr < 0) { DBusMessage *error = g_dbus_create_error(data->message, "org.openobex.Error.Failed", diff --git a/obexd/client/map.c b/obexd/client/map.c index 50d02c617..eb068346c 100644 --- a/obexd/client/map.c +++ b/obexd/client/map.c @@ -113,7 +113,7 @@ static void buffer_cb(struct obc_session *session, goto done; } - perr = obc_session_get_contents(session, &contents, &size); + perr = obc_transfer_get_contents(transfer, &contents, &size); if (perr < 0) { reply = g_dbus_create_error(map->msg, "org.openobex.Error.Failed", diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c index c43d8dd29..b178aff23 100644 --- a/obexd/client/pbap.c +++ b/obexd/client/pbap.c @@ -293,7 +293,7 @@ static void pbap_setpath_cb(struct obc_session *session, pending_request_free(request); } -static void read_return_apparam(struct obc_session *session, +static void read_return_apparam(struct obc_transfer *transfer, guint16 *phone_book_size, guint8 *new_missed_calls) { const struct apparam_hdr *hdr; @@ -302,7 +302,7 @@ static void read_return_apparam(struct obc_session *session, *phone_book_size = 0; *new_missed_calls = 0; - hdr = obc_session_get_params(session, &size); + hdr = obc_transfer_get_params(transfer, &size); if (hdr == NULL) return; @@ -357,7 +357,7 @@ static void pull_phonebook_callback(struct obc_session *session, goto send; } - perr = obc_session_get_contents(session, &contents, &size); + perr = obc_transfer_get_contents(transfer, &contents, &size); if (perr < 0) { reply = g_dbus_create_error(request->msg, "org.openobex.Error.Failed", @@ -397,7 +397,7 @@ static void phonebook_size_callback(struct obc_session *session, reply = dbus_message_new_method_return(request->msg); - read_return_apparam(session, &phone_book_size, &new_missed_calls); + read_return_apparam(transfer, &phone_book_size, &new_missed_calls); dbus_message_append_args(reply, DBUS_TYPE_UINT16, &phone_book_size, @@ -427,7 +427,7 @@ static void pull_vcard_listing_callback(struct obc_session *session, goto send; } - perr = obc_session_get_contents(session, &contents, &size); + perr = obc_transfer_get_contents(transfer, &contents, &size); if (perr < 0) { reply = g_dbus_create_error(request->msg, "org.openobex.Error.Failed", diff --git a/obexd/client/sync.c b/obexd/client/sync.c index c549040a0..c0b3800ef 100644 --- a/obexd/client/sync.c +++ b/obexd/client/sync.c @@ -101,7 +101,7 @@ static void sync_getphonebook_callback(struct obc_session *session, goto send; } - perr = obc_session_get_contents(session, &contents, &size); + perr = obc_transfer_get_contents(transfer, &contents, &size); if (perr < 0) { reply = g_dbus_create_error(sync->msg, "org.openobex.Error.Failed", -- 2.47.3