Diff between 765fc36308c8d806a597bb9eae13bdff82e081d8 and 3ff1f6b5e8902c6e7c37db0e84cd284648b4d272

Changed Files

File Additions Deletions Status
gobex/gobex-transfer.c +2 -5 modified
gobex/gobex.c +10 -0 modified
gobex/gobex.h +3 -0 modified

Full Patch

diff --git a/gobex/gobex-transfer.c b/gobex/gobex-transfer.c
index d7707f9..4e1a6c0 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 e9a08fa..42175fc 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 7c47590..fd2b274 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,