[maemo-commits] [maemo-commits] r15362 - projects/connectivity/osso-gwobex/trunk/src

[From: subversion at stage.maemo.org]

Author: jh
Date: 2008-04-08 14:29:21 +0300 (Tue, 08 Apr 2008)
New Revision: 15362

Modified:
   projects/connectivity/osso-gwobex/trunk/src/obex-xfer.c
Log:
xfer_close shouldn't report error in the abort case

Modified: projects/connectivity/osso-gwobex/trunk/src/obex-xfer.c
===================================================================
--- projects/connectivity/osso-gwobex/trunk/src/obex-xfer.c	2008-04-08 11:05:54 UTC (rev 15361)
+++ projects/connectivity/osso-gwobex/trunk/src/obex-xfer.c	2008-04-08 11:29:21 UTC (rev 15362)
@@ -388,7 +388,7 @@
 }
 
 gboolean gw_obex_xfer_close(GwObexXfer *xfer, gint *err) {
-    gboolean ret = TRUE, called_abort = FALSE;
+    gboolean ret = TRUE;
     struct gw_obex *ctx = xfer->ctx;
 
     /* If previous close() failed, just signal success so caller can continue */
@@ -399,10 +399,8 @@
 
     xfer->close = TRUE;
 
-    if (ctx->obex_op == OBEX_CMD_GET && !ctx->done) {
+    if (ctx->obex_op == OBEX_CMD_GET && !ctx->done)
         gw_obex_xfer_do_abort(xfer);
-        called_abort = TRUE;
-    }
 
     if (ctx->obex_op == OBEX_CMD_PUT) {
         if (xfer->object) {
@@ -425,8 +423,9 @@
         }
     }
 
-    if (gw_obex_set_error(ctx)
-            && !(called_abort && ctx->error == GW_OBEX_ERROR_ABORT)) {
+    /* Check for error but ignore ERROR_ABORT since we can still do a proper
+     * xfer_close() in that case */
+    if (gw_obex_set_error(ctx) && ctx->error != GW_OBEX_ERROR_ABORT) {
         gw_obex_get_error(ctx, err);
         ret = FALSE;
     }