X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=ab4c62e7027379bf41bc135c6f6feeb1e4ff966c;hp=a1f80f455803e4837b85e492792d794632c52d78;hb=33a7162c8d9d7971f99c78f61d7981342e93557a;hpb=0e86a77d87889a20306ea35ae57363e78b68d9a4

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index a1f80f4..ab4c62e 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1358,7 +1358,7 @@ open_msg_performer(gboolean canceled,
 		    gpointer user_data)
 {
 	ModestMailOperation *mail_op = NULL;
-	gchar *error_msg;
+	gchar *error_msg = NULL;
 	ModestProtocolType proto;
 	TnyConnectionStatus status;
 	OpenMsgHelper *helper = NULL;
@@ -1483,6 +1483,8 @@ open_msg_performer(gboolean canceled,
 
 	/* Frees */
  clean:
+	if (error_msg)
+		g_free (error_msg);
 	if (mail_op)
 		g_object_unref (mail_op);
 	g_object_unref (account);
@@ -6397,8 +6399,9 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
 						gpointer user_data)
 {
 	const gchar* server_name = NULL;
-	TnyTransportAccount *server_account;
+	TnyTransportAccount *transport;
 	gchar *message = NULL;
+	ModestProtocol *protocol;
 
 	/* Don't show anything if the user cancelled something or the
 	 * send receive request is not interactive. Authentication
@@ -6410,24 +6413,51 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
 		return;
 
 
-	/* Get the server name: */
-	server_account =
-		TNY_TRANSPORT_ACCOUNT (tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (self)));
-	if (server_account)
-		server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account));
-	else
-		g_return_if_reached ();
+	/* Get the server name. Note that we could be using a
+	   connection specific transport account */
+	transport = (TnyTransportAccount *)
+		tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (self));
+	if (transport) {
+		ModestTnyAccountStore *acc_store;
+		const gchar *acc_name;
+		TnyTransportAccount *conn_specific;
+
+		acc_store = modest_runtime_get_account_store();
+		acc_name = modest_tny_account_get_parent_modest_account_name_for_server_account (TNY_ACCOUNT (transport));
+		conn_specific = (TnyTransportAccount *)
+			modest_tny_account_store_get_transport_account_for_open_connection (acc_store, acc_name);
+		if (conn_specific) {
+			server_name = tny_account_get_hostname (TNY_ACCOUNT (conn_specific));
+			g_object_unref (conn_specific);
+		} else {
+			server_name = tny_account_get_hostname (TNY_ACCOUNT (transport));
+		}
+		g_object_unref (transport);
+	}
+
+	/* Get protocol */
+	protocol = modest_protocol_registry_get_protocol_by_name (modest_runtime_get_protocol_registry (),
+								  MODEST_PROTOCOL_REGISTRY_TRANSPORT_STORE_PROTOCOLS,
+								  tny_account_get_proto (TNY_ACCOUNT (transport)));
+	if (!protocol) {
+		g_warning ("%s: Account with no proto", __FUNCTION__);
+		return;
+	}
 
 	/* Show the appropriate message text for the GError: */
 	switch (err->code) {
 	case TNY_SERVICE_ERROR_CONNECT:
-		message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
+		message = modest_protocol_get_translation (protocol,
+							   MODEST_PROTOCOL_TRANSLATION_ACCOUNT_CONNECTION_ERROR, 
+							   server_name);
 		break;
 	case TNY_SERVICE_ERROR_SEND:
 		message = g_strdup (_CS("sfil_ib_unable_to_send"));
 		break;
 	case TNY_SERVICE_ERROR_UNAVAILABLE:
-		message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
+		message = modest_protocol_get_translation (protocol,
+							   MODEST_PROTOCOL_TRANSLATION_CONNECT_ERROR, 
+							   server_name);
 		break;
 	default:
 		g_warning ("%s: unexpected ERROR %d",
@@ -6438,7 +6468,6 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self,
 
 	modest_platform_run_information_dialog (NULL, message, FALSE);
 	g_free (message);
-	g_object_unref (server_account);
 }
 
 void
@@ -6472,7 +6501,8 @@ modest_ui_actions_on_send_queue_status_changed (ModestTnySendQueue *send_queue,
 #endif
 
 	/* Get selected folder */
-	selected_folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view));
+	if (header_view)
+		selected_folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view));
 	if (!selected_folder)
 		return;