Merged fix for bug 86984 from revision 5220

pmo-diablo-r5325

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 4b8d3cf..bb88b85 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -572,7 +572,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
        /* Get a reference to myself */
        self = MODEST_TNY_ACCOUNT_STORE (g_object_get_data (G_OBJECT(account), "account_store"));
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
+       
        /* Ensure that we still have this account. It could happen
           that a set_online was requested *before* removing an
           account, and due to tinymail emits the get_password
@@ -1160,7 +1160,7 @@ modest_tny_account_store_alert (TnyAccountStore *self,
        if (error->code == TNY_SERVICE_ERROR_CERTIFICATE)
                retval = modest_platform_run_certificate_confirmation_dialog (server_name,
                                                                              error->message);
-       else {
+       else if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE) {
                modest_platform_run_information_dialog (NULL, prompt, TRUE);
 
                /* Show the account dialog if it was wrong */