* Fixes NB#99400, do not dimm Send&Receive if there is 1 account

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

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 4d88938..af2598f 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -40,7 +40,7 @@
 #include <tny-camel-transport-account.h>
 #include <tny-camel-imap-store-account.h>
 #include <tny-camel-pop-store-account.h>
-
+#include "modest-text-utils.h"
 #include <modest-runtime.h>
 #include <modest-marshal.h>
 #include <modest-protocol-registry.h>
@@ -676,7 +676,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc
                                                                                             server_account_name);
                        /* If the login has ever succeeded then show a specific message */
                        if (username_known)
-                               msg = dgettext ("hildon-common-strings", "ecdg_ib_set_password_incorrect");
+                               msg = _CS ("ecdg_ib_set_password_incorrect");
                        else
                                msg = _("mcen_ib_username_pw_incorrect");
                        show_password_warning_only (msg);
@@ -1123,12 +1123,13 @@ 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 if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE) {
+       else if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE ||
+                error->code == TNY_SERVICE_ERROR_CONNECT) {
+
                modest_platform_run_information_dialog (NULL, prompt, TRUE);
 
                /* Show the account dialog if it was wrong */
-               if (error->code == TNY_SERVICE_ERROR_CONNECT || 
-                   error->code == TNY_SERVICE_ERROR_AUTHENTICATE)
+               if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE)
                        show_wrong_password_dialog (account);
 
                retval = TRUE;
@@ -1512,9 +1513,9 @@ connection_status_changed (TnyAccount *account,
           runnning */
        if (status == TNY_CONNECTION_STATUS_CONNECTED) {
                const gchar *account_name;
-               ModestWindow *main_window;
+               ModestWindow *top_window;
                ModestTnyAccountStorePrivate *priv = NULL;
-               
+
                priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (data);
 
                /* Remove this handler */
@@ -1524,8 +1525,8 @@ connection_status_changed (TnyAccount *account,
 
                /* Perform a send receive */
                account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
-               main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
-               modest_ui_actions_do_send_receive (account_name, FALSE, FALSE, TRUE, main_window);
+               top_window = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr ());
+               modest_ui_actions_do_send_receive (account_name, FALSE, FALSE, TRUE, top_window);
        }
 }