Diff between d393673986f27c5c335255352e9fc058c40fd96f and c9f3b81d07cd25e6fbab62278ee21895fe077b68

Changed Files

File Additions Deletions Status
gobex/gobex-transfer.c +4 -1 modified

Full Patch

diff --git a/gobex/gobex-transfer.c b/gobex/gobex-transfer.c
index 4203fec..b815d60 100644
--- a/gobex/gobex-transfer.c
+++ b/gobex/gobex-transfer.c
@@ -644,7 +644,10 @@ gboolean g_obex_cancel_transfer(guint id, GObexFunc complete_func,
 	transfer->complete_func = complete_func;
 	transfer->user_data = user_data;
 
-	ret = g_obex_pending_req_abort(transfer->obex, NULL);
+	if (transfer->req_id == 0)
+		goto done;
+
+	ret = g_obex_cancel_req(transfer->obex, transfer->req_id, FALSE);
 	if (ret)
 		return TRUE;