* Fixes NB#102379, show the current account in the "Change folder" dialog

[modest] / src / modest-tny-account-store.c

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 47e6b81..20d1851 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -633,7 +633,10 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                                gchar *password;
                                password  = modest_account_mgr_get_server_account_password (priv->account_mgr,
                                                                                            server_account_name);
-                               if (!password || strlen(password) == 0)
+
+                               if (already_asked)
+                                       msg = g_strdup (_("mcen_ib_username_pw_incorrect"));
+                               else if (!password || strlen(password) == 0)
                                        msg = g_strdup_printf (_("emev_ni_ui_smtp_passwd_invalid"), 
                                                               tny_account_get_name (account),
                                                               tny_account_get_hostname (account));
@@ -1385,17 +1388,17 @@ modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection
        if (!server_account_name) {
                return NULL; /* No connection-specific SMTP server was specified for this connection. */
        }
-               
+
        TnyAccount* account = modest_tny_account_store_get_tny_account_by (self, 
                                                                           MODEST_TNY_ACCOUNT_STORE_QUERY_ID, 
                                                                           server_account_name);
 
        /* printf ("DEBUG: %s: account=%p\n", __FUNCTION__, account); */
-       g_free (server_account_name);   
+       g_free (server_account_name);
 
        /* Unref the get()ed object, as required by the tny_maemo_conic_device_get_iap() documentation. */
        g_object_unref (connection);
-       
+
        return account;
 #else
        return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */