Thread (18 messages) flat view 18 messages, 2 authors, 2012-02-21

Re: [PATCH obexd 8/9] client: allow cancelling queued transfers

From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date: 2012-02-21 11:56:07

Hi Mikel,

On Tue, Feb 21, 2012 at 10:46 AM, Mikel Astiz [off-list ref] wrote:
quoted hunk ↗ jump to hunk
From: Mikel Astiz <redacted>

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
Looks, but this is a fix please update the commit message to make it clear.

-- 
Luiz Augusto von Dentz
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help