static TnyFolder* modest_tny_send_queue_get_outbox (TnySendQueue *self);
static TnyFolder* modest_tny_send_queue_get_sentbox (TnySendQueue *self);
+static void modest_tny_send_queue_cancel (TnySendQueue *self,
+ TnySendQueueCancelAction cancel_action,
+ GError **err);
/* list my signals */
enum {
/* last was send receive operation?*/
gboolean requested_send_receive;
-
gboolean sending;
+ gboolean suspend;
+
+ GSList *sighandlers;
};
#define MODEST_TNY_SEND_QUEUE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
return g_object_ref (priv->outbox);
}
+static void
+modest_tny_send_queue_cancel (TnySendQueue *self,
+ TnySendQueueCancelAction cancel_action,
+ GError **err)
+{
+ ModestTnySendQueuePrivate *priv;
+
+ g_return_if_fail (self);
+
+ priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+
+ /* Call the parent */
+ TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->cancel (self, cancel_action, err);
+
+ if (cancel_action == TNY_SEND_QUEUE_CANCEL_ACTION_SUSPEND && (err == NULL || *err == NULL))
+ priv->suspend = TRUE;
+}
+
GType
modest_tny_send_queue_get_type (void)
{
TNY_CAMEL_SEND_QUEUE_CLASS(klass)->add_async = modest_tny_send_queue_add_async;
TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_outbox = modest_tny_send_queue_get_outbox;
TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_sentbox = modest_tny_send_queue_get_sentbox;
+ TNY_CAMEL_SEND_QUEUE_CLASS(klass)->cancel = modest_tny_send_queue_cancel;
klass->status_changed = NULL;
signals[STATUS_CHANGED_SIGNAL] =
priv->outbox = NULL;
priv->sentbox = NULL;
priv->sending = FALSE;
+ priv->suspend = FALSE;
+ priv->sighandlers = NULL;
}
static void
priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (obj);
+ modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers);
+ priv->sighandlers = NULL;
+
g_queue_foreach (priv->queue, (GFunc)modest_tny_send_queue_info_free, NULL);
g_queue_free (priv->queue);
ModestTnySendQueue *self;
TnyIterator *iter;
GetHeadersInfo *info;
+ ModestMailOperation *wakeup_op;
info = (GetHeadersInfo *) user_data;
self = MODEST_TNY_SEND_QUEUE (info->queue);
}
/* Reenable suspended items */
- modest_tny_send_queue_wakeup (self);
+ wakeup_op = modest_mail_operation_new (NULL);
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+ wakeup_op);
+ modest_mail_operation_queue_wakeup (wakeup_op, MODEST_TNY_SEND_QUEUE (self));
/* Frees */
g_object_unref (iter);
ModestTnySendQueuePrivate *priv = NULL;
TnyList *headers = NULL;
GetHeadersInfo *info;
-
+
g_return_val_if_fail (TNY_IS_CAMEL_TRANSPORT_ACCOUNT(account), NULL);
-
+
self = MODEST_TNY_SEND_QUEUE(g_object_new(MODEST_TYPE_TNY_SEND_QUEUE, NULL));
/* Set outbox and sentbox */
}
/* Connect signals to control when a msg is being or has been sent */
- g_signal_connect (G_OBJECT(self), "msg-sending",
- G_CALLBACK(_on_msg_start_sending),
- NULL);
- g_signal_connect (G_OBJECT(self), "msg-sent",
- G_CALLBACK(_on_msg_has_been_sent),
- NULL);
- g_signal_connect (G_OBJECT(self), "error-happened",
- G_CALLBACK(_on_msg_error_happened),
- NULL);
-
- g_signal_connect (G_OBJECT (self), "queue-start",
- G_CALLBACK (_on_queue_start),
- NULL);
-
- g_signal_connect (G_OBJECT (self), "queue-stop",
- G_CALLBACK (_on_queue_stop),
- NULL);
-
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT(self),
+ "msg-sending",
+ G_CALLBACK(_on_msg_start_sending),
+ NULL);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT(self), "msg-sent",
+ G_CALLBACK(_on_msg_has_been_sent),
+ NULL);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT(self), "error-happened",
+ G_CALLBACK(_on_msg_error_happened),
+ NULL);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (self), "queue-start",
+ G_CALLBACK (_on_queue_start),
+ NULL);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (self), "queue-stop",
+ G_CALLBACK (_on_queue_stop),
+ NULL);
priv->requested_send_receive = FALSE;
headers = tny_simple_list_new ();
g_free(msg_uid);
return;
}
-
+
info = item->data;
/* Keep in queue so that we remember that the opertion has failed */
if (err->code == TNY_SYSTEM_ERROR_CANCEL) {
info->status = MODEST_TNY_SEND_QUEUE_SUSPENDED;
} 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;
- 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);
- }
- }
info->status = MODEST_TNY_SEND_QUEUE_FAILED;
}
priv->current = NULL;
-
+
/* Notify status has changed */
g_signal_emit (self, signals[STATUS_CHANGED_SIGNAL], 0, info->msg_id, info->status);
priv->sending = TRUE;
}
-static void
+static void
+on_queue_stop_get_headers_async_cb (TnyFolder *folder,
+ gboolean cancelled,
+ TnyList *headers,
+ GError *err,
+ gpointer user_data)
+{
+ ModestTnySendQueue *self = (ModestTnySendQueue *) user_data;
+ TnyIterator *iter;
+
+ if (cancelled || err)
+ goto end;
+
+ /* Update the info about headers */
+ iter = tny_list_create_iterator (headers);
+ while (!tny_iterator_is_done (iter)) {
+ TnyHeader *header;
+
+ header = (TnyHeader *) tny_iterator_get_current (iter);
+ if (header) {
+ gchar *msg_id = NULL;
+ GList *item = NULL;
+
+ /* Get message uid */
+ msg_id = modest_tny_send_queue_get_msg_id (header);
+ if (msg_id)
+ item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id);
+ else
+ g_warning ("%s: could not get msg-id for header", __FUNCTION__);
+
+ if (item) {
+ SendInfo *info;
+ /* Set current status item */
+ info = item->data;
+ if (tny_header_get_flags (header) & TNY_HEADER_FLAG_SUSPENDED) {
+ info->status = MODEST_TNY_SEND_QUEUE_SUSPENDED;
+ g_signal_emit (self, signals[STATUS_CHANGED_SIGNAL], 0,
+ info->msg_id, info->status);
+ }
+ } else {
+ g_warning ("%s: could not find item with id '%s'", __FUNCTION__, msg_id);
+ }
+ g_object_unref (header);
+ }
+ tny_iterator_next (iter);
+ }
+ g_object_unref (iter);
+
+ end:
+ /* Unrefs */
+ g_object_unref (headers);
+ g_object_unref (self);
+}
+
+static void
_on_queue_stop (TnySendQueue *self,
gpointer data)
{
priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
priv->sending = FALSE;
+
+ if (priv->suspend) {
+ TnyList *headers;
+ priv->suspend = FALSE;
+
+ /* Update the state of messages in the queue */
+ headers = tny_simple_list_new ();
+ tny_folder_get_headers_async (priv->outbox, headers, TRUE,
+ on_queue_stop_get_headers_async_cb,
+ NULL, g_object_ref (self));
+ }
}
-static void
+static void
fill_list_of_caches (gpointer key, gpointer value, gpointer userdata)
{
GSList **send_queues = (GSList **) userdata;
ModestTnySendQueueStatus queue_status = MODEST_TNY_SEND_QUEUE_UNKNOWN;
gchar *msg_uid = NULL;
ModestTnySendQueue *send_queue = NULL;
-
+
g_return_val_if_fail (TNY_IS_HEADER(header), MODEST_TNY_SEND_QUEUE_UNKNOWN);
msg_uid = modest_tny_send_queue_get_msg_id (header);
cache_mgr = modest_runtime_get_cache_mgr ();
send_queue_cache = modest_cache_mgr_get_cache (cache_mgr,
MODEST_CACHE_MGR_CACHE_TYPE_SEND_QUEUE);
-
+
g_hash_table_foreach (send_queue_cache, (GHFunc) fill_list_of_caches, &send_queues);
if (send_queues == NULL) {
accounts = tny_simple_list_new ();
tny_account_store_get_accounts (TNY_ACCOUNT_STORE(accounts_store),
accounts,
TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS);
-
+
iter = tny_list_create_iterator (accounts);
- while (!tny_iterator_is_done (iter)) {
+ while (!tny_iterator_is_done (iter)) {
account = TNY_TRANSPORT_ACCOUNT(tny_iterator_get_current (iter));
send_queue = modest_runtime_get_send_queue(TNY_TRANSPORT_ACCOUNT(account), TRUE);
g_object_unref(account);
else {
for (node = send_queues; node != NULL; node = g_slist_next (node)) {
send_queue = MODEST_TNY_SEND_QUEUE (node->data);
-
+
queue_status = modest_tny_send_queue_get_msg_status (send_queue, msg_uid);
if (queue_status != MODEST_TNY_SEND_QUEUE_UNKNOWN) {
status = queue_status;
return status;
}
+typedef struct _WakeupHelper {
+ ModestTnySendQueue *self;
+ ModestTnySendQueueWakeupFunc callback;
+ gpointer userdata;
+} WakeupHelper;
+
+static void
+wakeup_sync_cb (TnyFolder *self, gboolean cancelled, GError *err, gpointer userdata)
+{
+ WakeupHelper *helper = (WakeupHelper *) userdata;
+
+ if (helper->callback) {
+ helper->callback (helper->self, cancelled, err, helper->userdata);
+ }
+ g_object_unref (helper->self);
+ g_slice_free (WakeupHelper, helper);
+}
+
static void
wakeup_get_headers_async_cb (TnyFolder *folder,
gboolean cancelled,
ModestTnySendQueue *self;
ModestTnySendQueuePrivate *priv;
TnyIterator *iter;
+ WakeupHelper *helper = (WakeupHelper *) user_data;
- self = MODEST_TNY_SEND_QUEUE (user_data);
+ self = MODEST_TNY_SEND_QUEUE (helper->self);
priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
if (cancelled || err) {
g_debug ("Failed to wake up the headers of the send queue");
g_object_unref (self);
+ if (helper->callback) {
+ helper->callback (helper->self, cancelled, err, helper->userdata);
+ }
+ g_object_unref (helper->self);
+ g_slice_free (WakeupHelper, helper);
return;
}
}
/* Make changes persistent on disk */
- tny_folder_sync_async (priv->outbox, FALSE, NULL, NULL, NULL);
+ tny_folder_sync_async (priv->outbox, FALSE, wakeup_sync_cb, NULL, helper);
/* Frees */
g_object_unref (iter);
g_object_unref (headers);
- g_object_unref (self);
}
-
void
-modest_tny_send_queue_wakeup (ModestTnySendQueue *self)
+modest_tny_send_queue_wakeup (ModestTnySendQueue *self,
+ ModestTnySendQueueWakeupFunc callback,
+ gpointer userdata)
{
ModestTnySendQueuePrivate *priv;
TnyList *headers;
+ WakeupHelper *helper;
g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (self));
-
priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+ helper = g_slice_new (WakeupHelper);
+ helper->self = g_object_ref (self);
+ helper->callback = callback;
+ helper->userdata = userdata;
+
headers = tny_simple_list_new ();
tny_folder_get_headers_async (priv->outbox, headers, TRUE,
wakeup_get_headers_async_cb,
- NULL, g_object_ref (self));
+ NULL, helper);
}
gboolean