From: Mikel Astiz <mikel.astiz.oss@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Mikel Astiz <mikel.astiz@bmw-carit.de>
Subject: [PATCH obexd 8/9] client: allow cancelling queued transfers
Date: Tue, 21 Feb 2012 09:46:22 +0100 [thread overview]
Message-ID: <1329813983-26707-9-git-send-email-mikel.astiz.oss@gmail.com> (raw)
In-Reply-To: <1329813983-26707-1-git-send-email-mikel.astiz.oss@gmail.com>
From: Mikel Astiz <mikel.astiz@bmw-carit.de>
The Cancel() method in the D-Bus api should also abort queued transfers,
which should just be removed from the queue.
---
client/transfer.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/client/transfer.c b/client/transfer.c
index 2cf5786..f380cb7 100644
--- a/client/transfer.c
+++ b/client/transfer.c
@@ -143,11 +143,15 @@ static void obc_transfer_abort(struct obc_transfer *transfer)
{
struct transfer_callback *callback = transfer->callback;
- if (transfer->xfer == 0)
- return;
+ if (transfer->xfer != 0) {
+ g_obex_cancel_transfer(transfer->xfer);
+ transfer->xfer = 0;
+ }
- g_obex_cancel_transfer(transfer->xfer);
- transfer->xfer = 0;
+ if (transfer->obex != NULL) {
+ g_obex_unref(transfer->obex);
+ transfer->obex = NULL;
+ }
if (callback) {
GError *err;
--
1.7.6.5
next prev parent reply other threads:[~2012-02-21 8:46 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-21 8:46 [PATCH obexd 0/9] Transfer cancelation Mikel Astiz
2012-02-21 8:46 ` [PATCH obexd 1/9] gobex: fix callback remove when canceling transfer Mikel Astiz
2012-02-21 11:02 ` Luiz Augusto von Dentz
2012-02-21 11:16 ` Luiz Augusto von Dentz
2012-02-21 8:46 ` [PATCH obexd 2/9] client: fix obc_session_get_buffer Mikel Astiz
2012-02-21 11:07 ` Luiz Augusto von Dentz
2012-02-21 8:46 ` [PATCH obexd 3/9] client: deny cancel when no agent present Mikel Astiz
2012-02-21 11:12 ` Luiz Augusto von Dentz
2012-02-21 8:46 ` [PATCH obexd 4/9] client: remove unnecessary code Mikel Astiz
2012-02-21 11:27 ` Luiz Augusto von Dentz
2012-02-21 8:46 ` [PATCH obexd 5/9] client: process transfer queue only if none active Mikel Astiz
2012-02-21 8:46 ` [PATCH obexd 6/9] client: terminate queued transfers properly Mikel Astiz
2012-02-21 11:40 ` Luiz Augusto von Dentz
2012-02-21 8:46 ` [PATCH obexd 7/9] client: expose obc_transfer_set_callback Mikel Astiz
2012-02-21 11:51 ` Luiz Augusto von Dentz
2012-02-21 8:46 ` Mikel Astiz [this message]
2012-02-21 11:56 ` [PATCH obexd 8/9] client: allow cancelling queued transfers Luiz Augusto von Dentz
2012-02-21 8:46 ` [PATCH obexd 9/9] client: make sure callback does not match size Mikel Astiz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329813983-26707-9-git-send-email-mikel.astiz.oss@gmail.com \
--to=mikel.astiz.oss@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=mikel.astiz@bmw-carit.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).