OSDN Git Service

gobex: Add g_obex_abort
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Wed, 27 Aug 2014 14:16:06 +0000 (17:16 +0300)
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Fri, 29 Aug 2014 07:32:26 +0000 (10:32 +0300)
gobex/gobex-transfer.c
gobex/gobex.c
gobex/gobex.h

index d7707f9..4e1a6c0 100644 (file)
@@ -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);
index e9a08fa..42175fc 100644 (file)
@@ -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) {
index 7c47590..fd2b274 100644 (file)
@@ -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,