[evolution-data-server] Bug 782799 - On The Web calendar update incorrectly cancelled

[Milan Crha <mcrha src gnome org>]

commit fe58564bb94db246ecbe8d9bd9b918428bf1cd53
Author: Milan Crha <mcrha redhat com>
Date:   Fri May 19 13:08:24 2017 +0200

    Bug 782799 - On The Web calendar update incorrectly cancelled

 src/calendar/backends/http/e-cal-backend-http.c |    6 +++---
 src/libebackend/e-cache.c                       |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/calendar/backends/http/e-cal-backend-http.c b/src/calendar/backends/http/e-cal-backend-http.c
index 67b4cc5..113e378 100644
--- a/src/calendar/backends/http/e-cal-backend-http.c
+++ b/src/calendar/backends/http/e-cal-backend-http.c
@@ -227,12 +227,12 @@ ecb_http_disconnect_sync (ECalMetaBackend *meta_backend,
 
        cbhttp = E_CAL_BACKEND_HTTP (meta_backend);
 
-       if (cbhttp->priv->session)
-               soup_session_abort (SOUP_SESSION (cbhttp->priv->session));
-
        g_clear_object (&cbhttp->priv->input_stream);
        g_clear_object (&cbhttp->priv->request);
 
+       if (cbhttp->priv->session)
+               soup_session_abort (SOUP_SESSION (cbhttp->priv->session));
+
        if (cbhttp->priv->components) {
                g_hash_table_destroy (cbhttp->priv->components);
                cbhttp->priv->components = NULL;
diff --git a/src/libebackend/e-cache.c b/src/libebackend/e-cache.c
index 4060e99..e36808d 100644
--- a/src/libebackend/e-cache.c
+++ b/src/libebackend/e-cache.c
@@ -507,7 +507,7 @@ e_cache_column_info_free (gpointer info)
        G_STMT_START { \
                if (code == SQLITE_CONSTRAINT) { \
                        g_set_error_literal (error, E_CACHE_ERROR, E_CACHE_ERROR_CONSTRAINT, message); \
-               } else if (code == SQLITE_ABORT) { \
+               } else if (code == SQLITE_ABORT || code == SQLITE_INTERRUPT) { \
                        g_set_error (error, G_IO_ERROR, G_IO_ERROR_CANCELLED, "Operation cancelled: %s", 
message); \
                } else { \
                        g_set_error (error, E_CACHE_ERROR, E_CACHE_ERROR_ENGINE, \