[evolution-data-server/gnome-3-18] [IMAPx] Doesn't ask for password when a wrong is entered

[Milan Crha <mcrha src gnome org>]

commit 7ce14019da29bd9d05624c45fc0b3b74657a2b88
Author: Milan Crha <mcrha redhat com>
Date:   Thu Nov 19 10:46:34 2015 +0100

    [IMAPx] Doesn't ask for password when a wrong is entered

 camel/providers/imapx/camel-imapx-server.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index dc16060..d77901c 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -2935,11 +2935,14 @@ camel_imapx_server_authenticate_sync (CamelIMAPXServer *is,
                ic = camel_imapx_command_new (is, CAMEL_IMAPX_JOB_LOGIN, "LOGIN %s %s", user, password);
        }
 
-       if (!camel_imapx_server_process_command_sync (is, ic, _("Failed to authenticate"), cancellable, 
error))
+       if (!camel_imapx_server_process_command_sync (is, ic, _("Failed to authenticate"), cancellable, 
error) && (
+           !ic->status || ic->status->result != IMAPX_NO))
                result = CAMEL_AUTHENTICATION_ERROR;
        else if (ic->status->result == IMAPX_OK)
                result = CAMEL_AUTHENTICATION_ACCEPTED;
        else if (ic->status->result == IMAPX_NO) {
+               g_clear_error (error);
+
                if (camel_imapx_store_is_connecting_concurrent_connection (store)) {
                        /* At least one connection succeeded, probably max connection limit
                           set on the server had been reached, thus use special error code