X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=6fe5ce00051df066947fd0051d2541f4af3249bf;hp=bb103ab95a9794c9f5833f74bb0f05973696444d;hb=975da5d9646e83410e4fdd45e1138d31f8a2f629;hpb=f541209a85cb6c71c79da1df81afbe10c448690a

diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c
index bb103ab..6fe5ce0 100644
--- a/src/modest-tny-send-queue.c
+++ b/src/modest-tny-send-queue.c
@@ -411,10 +411,9 @@ modest_tny_send_queue_finalize (GObject *obj)
 	g_queue_foreach (priv->queue, (GFunc)modest_tny_send_queue_info_free, NULL);
 	g_queue_free (priv->queue);
 
+	G_OBJECT_CLASS(parent_class)->finalize (obj);
 	g_object_unref (priv->outbox);
 	g_object_unref (priv->sentbox);
-
-	G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
 typedef struct {
@@ -698,12 +697,26 @@ _on_msg_error_happened (TnySendQueue *self,
 		} else {
 			if (err->code == TNY_SERVICE_ERROR_CONNECT) {
 				TnyCamelTransportAccount* transport;
+				TnyTransportAccount *conn_specific;
 
 				transport = tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE (self));
 				if (transport) {
-					gchar *message;					
-					message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), 
-								   tny_account_get_hostname (TNY_ACCOUNT (transport)));
+					gchar *message;
+					ModestTnyAccountStore *acc_store;
+					const gchar *acc_name;
+
+					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) {
+						message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), 
+									   tny_account_get_hostname (TNY_ACCOUNT (conn_specific)));
+						g_object_unref (conn_specific);
+					} else {
+						message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), 
+									   tny_account_get_hostname (TNY_ACCOUNT (transport)));
+					}
 					modest_platform_run_alert_dialog (message, FALSE);
 					g_free (message);
 					g_object_unref (transport);