[evolution-data-server] Bug 794434 - [EWebDAVDiscover] The .well-known addresses not tried after first failure

[Milan Crha <mcrha src gnome org>]

commit a425a148e51fedafed22d3a5822315131c38a61e
Author: Milan Crha <mcrha redhat com>
Date:   Wed Mar 21 17:25:50 2018 +0100

    Bug 794434 - [EWebDAVDiscover] The .well-known addresses not tried after first failure

 src/libedataserver/e-webdav-discover.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/libedataserver/e-webdav-discover.c b/src/libedataserver/e-webdav-discover.c
index eb8addd..5bde7e2 100644
--- a/src/libedataserver/e-webdav-discover.c
+++ b/src/libedataserver/e-webdav-discover.c
@@ -710,7 +710,7 @@ e_webdav_discover_sources_sync (ESource *source,
 
                g_free (uri);
 
-               if (success && !wdd.calendars && (only_supports == E_WEBDAV_DISCOVER_SUPPORTS_NONE ||
+               if (!g_cancellable_is_cancelled (cancellable) && !wdd.calendars && (only_supports == 
E_WEBDAV_DISCOVER_SUPPORTS_NONE ||
                   (only_supports & (E_WEBDAV_DISCOVER_SUPPORTS_EVENTS | E_WEBDAV_DISCOVER_SUPPORTS_MEMOS | 
E_WEBDAV_DISCOVER_SUPPORTS_TASKS)) != 0) &&
                   (!soup_uri_get_path (soup_uri) || !strstr (soup_uri_get_path (soup_uri), 
"/.well-known/"))) {
                        gchar *saved_path;
@@ -733,7 +733,7 @@ e_webdav_discover_sources_sync (ESource *source,
                        g_free (saved_path);
                }
 
-               if (success && !wdd.addressbooks && (only_supports == E_WEBDAV_DISCOVER_SUPPORTS_NONE ||
+               if (!g_cancellable_is_cancelled (cancellable) && !wdd.addressbooks && (only_supports == 
E_WEBDAV_DISCOVER_SUPPORTS_NONE ||
                    (only_supports & (E_WEBDAV_DISCOVER_SUPPORTS_CONTACTS)) != 0) &&
                    (!soup_uri_get_path (soup_uri) || !strstr (soup_uri_get_path (soup_uri), 
"/.well-known/"))) {
                        gchar *saved_path;