[maemo-commits] [maemo-commits] r8523 - in projects/connectivity/osso-gwobex/trunk: . debian src

[From: www-data at stage.maemo.org]

Author: jh
Date: 2006-12-01 13:08:37 +0200 (Fri, 01 Dec 2006)
New Revision: 8523

Modified:
   projects/connectivity/osso-gwobex/trunk/configure.ac
   projects/connectivity/osso-gwobex/trunk/debian/changelog
   projects/connectivity/osso-gwobex/trunk/src/obex-xfer.c
Log:
Don't set abort error if xfer_close caused the abort itself

Modified: projects/connectivity/osso-gwobex/trunk/configure.ac
===================================================================
--- projects/connectivity/osso-gwobex/trunk/configure.ac	2006-11-30 16:59:59 UTC (rev 8522)
+++ projects/connectivity/osso-gwobex/trunk/configure.ac	2006-12-01 11:08:37 UTC (rev 8523)
@@ -1,4 +1,4 @@
-AC_INIT([osso-gwobex],[0.53.1])
+AC_INIT([osso-gwobex],[0.54])
 
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)

Modified: projects/connectivity/osso-gwobex/trunk/debian/changelog
===================================================================
--- projects/connectivity/osso-gwobex/trunk/debian/changelog	2006-11-30 16:59:59 UTC (rev 8522)
+++ projects/connectivity/osso-gwobex/trunk/debian/changelog	2006-12-01 11:08:37 UTC (rev 8523)
@@ -1,8 +1,15 @@
+osso-gwobex (0.54) unstable; urgency=low
+
+  * Don't set abort error if xfer_close caused the abort itself.
+    Fixes: NB#48358
+
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Fri,  1 Dec 2006 13:15:38 +0200
+
 osso-gwobex (0.53.1) unstable; urgency=low
 
-  * Copyright disclaimer & license text cleanup.
+  * Copyright disclaimer & license text cleanup. Fixes: #NB40652
 
- -- Johan Hedberg <johan.hedberg at nokia.com>  Mon, 18 Sep 2006 13:42:01 +0300
+ -- Johan Hedberg <johan.hedberg at nokia.com>  Mon, 18 Sep 2006 16:52:10 +0300
 
 osso-gwobex (0.53) unstable; urgency=low
 

Modified: projects/connectivity/osso-gwobex/trunk/src/obex-xfer.c
===================================================================
--- projects/connectivity/osso-gwobex/trunk/src/obex-xfer.c	2006-11-30 16:59:59 UTC (rev 8522)
+++ projects/connectivity/osso-gwobex/trunk/src/obex-xfer.c	2006-12-01 11:08:37 UTC (rev 8523)
@@ -386,7 +386,7 @@
 }
 
 gboolean gw_obex_xfer_close(GwObexXfer *xfer, gint *err) {
-    gboolean ret = TRUE;
+    gboolean ret = TRUE, called_abort = FALSE;
     struct gw_obex *ctx = xfer->ctx;
 
     /* If previous close() failed, just signal success so caller can continue */
@@ -397,8 +397,10 @@
 
     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) {
@@ -421,7 +423,8 @@
         }
     }
 
-    if (gw_obex_set_error(ctx)) {
+    if (gw_obex_set_error(ctx)
+            && !(called_abort && ctx->error == GW_OBEX_ERROR_ABORT)) {
         gw_obex_get_error(ctx, err);
         ret = FALSE;
     }