X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=f3108d5117bbe16d5adbdb80598b48b018b24939;hb=a462ac9c41c676808d42f22b5dfe209e98692f10;hp=e0cd50b751bcb1fc9bc7055110b43968ce6223e4;hpb=54d35f158a8ffa5a3bc4c13aeceff3b61070afab;p=modest

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index e0cd50b..f3108d5 100644
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -475,7 +475,7 @@ on_account_changed (ModestAccountMgr *acc_mgr,
 		if (tny_account) {
 			if (!strcmp (tny_account_get_id (tny_account), account_name)) {
 				found = TRUE;
-				modest_tny_account_update_from_account (tny_account);
+				modest_tny_account_update_from_account (tny_account, get_password, forget_password);
 				g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, tny_account);
 			}
 			g_object_unref (tny_account);
@@ -1058,7 +1058,6 @@ modest_tny_account_store_alert (TnyAccountStore *self,
 	case TNY_SERVICE_ERROR_UNAVAILABLE:
 		/* You must be working online for this operation */
 	case TNY_SERVICE_ERROR_CONNECT:
-		/* TODO: Show the appropriate message, depending on whether it's POP or IMAP: */		
 		switch (proto) {
 		case MODEST_PROTOCOL_STORE_POP:
 			prompt = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"),
@@ -1078,9 +1077,25 @@ modest_tny_account_store_alert (TnyAccountStore *self,
 		break;
 		
 	case TNY_SERVICE_ERROR_AUTHENTICATE:
-		/* This is "Secure connection failed", even though the logical
-		 * ID has _certificate_ in the name: */
-		prompt = g_strdup (_("mail_ni_ssl_certificate_error")); 
+		/* It seems that there's no better error to show with
+		 * POP and IMAP because TNY_SERVICE_ERROR_AUTHENTICATE
+		 * may appear if there's a timeout during auth */
+		switch (proto) {
+		case MODEST_PROTOCOL_STORE_POP:
+			prompt = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"),
+						  server_name);
+			break;
+		case MODEST_PROTOCOL_STORE_IMAP:
+			prompt = g_strdup_printf (_("emev_ni_ui_imap_connect_server_error"),
+						  server_name);
+			break;
+		case MODEST_PROTOCOL_TRANSPORT_SMTP:
+			prompt = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"),
+						  server_name);
+			break;
+		default:
+			g_return_val_if_reached (FALSE);
+		}
 		break;
 			
 	case TNY_SERVICE_ERROR_CERTIFICATE: