[evolution-data-server/gnome-3-30] I#36 - Asks for password after going online, even it's stored

[Milan Crha <mcrha src gnome org>]

commit 95b02bc37e207af84d36ea88dc06988b8c921b55
Author: Milan Crha <mcrha redhat com>
Date:   Thu Sep 27 10:47:56 2018 +0200

    I#36 - Asks for password after going online, even it's stored
    
    Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/36

 src/libebackend/e-backend.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/src/libebackend/e-backend.c b/src/libebackend/e-backend.c
index bd7203592..d207d09f2 100644
--- a/src/libebackend/e-backend.c
+++ b/src/libebackend/e-backend.c
@@ -368,7 +368,8 @@ backend_source_authenticate_thread (gpointer user_data)
                &certificate_pem, &certificate_errors, thread_data->cancellable, &local_error);
 
        empty_crendetials = auth_result == E_SOURCE_AUTHENTICATION_REQUIRED &&
-               (!thread_data->credentials || !e_named_parameters_count (thread_data->credentials));
+               (!thread_data->credentials || !e_named_parameters_count (thread_data->credentials)) &&
+               !g_cancellable_is_cancelled (thread_data->cancellable);
 
        if (empty_crendetials && thread_data->backend->priv->tried_with_empty_credentials) {
                /* When tried repeatedly with empty credentials and both resulted in 'REQUIRED',