From: Sergio Villar Senin <svillar@igalia.com>
Date: Tue, 8 Sep 2009 09:57:04 +0000 (+0200)
Subject: Do not show the account settings dialog if the password has been already asked and... 
X-Git-Tag: 3.0.17-rc51~3
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=c5ee8ba98ba1de8845bf548ad365ac0b0859616d;hp=967eb8e0d5a8246994967b628cb43da3ced86d89

Do not show the account settings dialog if the password has been already asked and is not in our cache
---

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index f216937..8f72052 100644
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -689,13 +689,18 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
 		}
 
 		if (settings_have_password) {
-			/* The password must be wrong, so show the account settings dialog so it can be corrected: */
-			show_wrong_password_dialog (account, TRUE);
+			if (pwd) {
+				/* The password must be wrong, so show the account settings dialog so it can be corrected: */
+				show_wrong_password_dialog (account, TRUE);
 
-			if (cancel)
-				*cancel = TRUE;
+				if (cancel)
+					*cancel = TRUE;
 
-			return NULL;
+				return NULL;
+			} else {
+				/* Get the password from the account settings */
+				return modest_account_mgr_get_server_account_password (priv->account_mgr, server_account_name);
+			}
 		}
 
 		/* we don't have it yet. Get the password from the user */