priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (instance);
priv->queue = g_queue_new();
priv->current = NULL;
+ priv->outbox = NULL;
+ priv->sentbox = NULL;
}
static void
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 {
} 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);
/* Notify view */
msg_id = modest_tny_send_queue_get_msg_id (header);
item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id);
- info = (SendInfo *) item->data;
+ if (!item) {
+ info = g_slice_new (SendInfo);
+ info->msg_id = msg_id;
+ g_queue_push_tail (priv->queue, info);
+ } else {
+ info = (SendInfo *) item->data;
+ g_free (msg_id);
+ }
info->status = MODEST_TNY_SEND_QUEUE_WAITING;
- g_signal_emit (self, signals[STATUS_CHANGED_SIGNAL], 0, info->msg_id, info->status);
-
- /* Frees */
- g_free (msg_id);
+ g_signal_emit (self, signals[STATUS_CHANGED_SIGNAL], 0, info->msg_id, info->status);
}
/* Frees */