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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Mikel,

On Tue, Feb 21, 2012 at 10:46 AM, Mikel Astiz <mikel.astiz.oss@xxxxxxxxx> wrote:
> From: Mikel Astiz <mikel.astiz@xxxxxxxxxxxx>
>
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux