From 3ff1f6b5e8902c6e7c37db0e84cd284648b4d272 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Wed, 27 Aug 2014 17:16:06 +0300 Subject: gobex: Add g_obex_abort --- gobex/gobex-transfer.c | 7 ++----- gobex/gobex.c | 10 ++++++++++ gobex/gobex.h | 3 +++ 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'gobex') diff --git a/gobex/gobex-transfer.c b/gobex/gobex-transfer.c index d7707f996..4e1a6c042 100644 --- a/gobex/gobex-transfer.c +++ b/gobex/gobex-transfer.c @@ -152,11 +152,8 @@ static gssize put_get_data(void *buf, gsize len, gpointer user_data) goto done; } - req = g_obex_packet_new(G_OBEX_OP_ABORT, TRUE, G_OBEX_HDR_INVALID); - - transfer->req_id = g_obex_send_req(transfer->obex, req, -1, - transfer_abort_response, - transfer, &err); + transfer->req_id = g_obex_abort(transfer->obex, transfer_abort_response, + transfer, &err); done: if (err != NULL) { transfer_complete(transfer, err); diff --git a/gobex/gobex.c b/gobex/gobex.c index e9a08fa71..42175fcc0 100644 --- a/gobex/gobex.c +++ b/gobex/gobex.c @@ -1676,6 +1676,16 @@ guint g_obex_move(GObex *obex, const char *name, const char *dest, return g_obex_send_req(obex, req, -1, func, user_data, err); } +guint g_obex_abort(GObex *obex, GObexResponseFunc func, gpointer user_data, + GError **err) +{ + GObexPacket *req; + + req = g_obex_packet_new(G_OBEX_OP_ABORT, TRUE, G_OBEX_HDR_INVALID); + + return g_obex_send_req(obex, req, -1, func, user_data, err); +} + guint8 g_obex_errno_to_rsp(int err) { switch (err) { diff --git a/gobex/gobex.h b/gobex/gobex.h index 7c4759055..fd2b27412 100644 --- a/gobex/gobex.h +++ b/gobex/gobex.h @@ -95,6 +95,9 @@ guint g_obex_move(GObex *obex, const char *name, const char *dest, GObexResponseFunc func, gpointer user_data, GError **err); +guint g_obex_abort(GObex *obex, GObexResponseFunc func, gpointer user_data, + GError **err); + /* Transfer related high-level functions */ guint g_obex_put_req(GObex *obex, GObexDataProducer data_func, -- cgit v1.2.1