projects
/
modest
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
967eb8e
)
Do not show the account settings dialog if the password has been already asked and...
author
Sergio Villar Senin
<svillar@igalia.com>
Tue, 8 Sep 2009 09:57:04 +0000
(11:57 +0200)
committer
Sergio Villar Senin
<svillar@igalia.com>
Tue, 8 Sep 2009 16:49:08 +0000
(18:49 +0200)
src/modest-tny-account-store.c
patch
|
blob
|
history
diff --git
a/src/modest-tny-account-store.c
b/src/modest-tny-account-store.c
index
f216937
..
8f72052
100644
(file)
--- 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) {
}
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 */
}
/* we don't have it yet. Get the password from the user */