GQueue *op_queue;
GMutex *queue_lock;
guint op_id;
+ guint queue_empty_handler;
+ gboolean running_final_sync;
};
#define MODEST_MAIL_OPERATION_QUEUE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_MAIL_OPERATION_QUEUE, \
priv->op_queue = g_queue_new ();
priv->queue_lock = g_mutex_new ();
priv->op_id = 0;
+ priv->queue_empty_handler = 0;
+ priv->running_final_sync = FALSE;
}
static void
g_signal_handlers_disconnect_by_func (mail_op, G_CALLBACK (on_operation_finished), user_data);
MODEST_DEBUG_BLOCK (print_queue_item (mail_op, "cancel/remove"););
-
+
modest_mail_operation_cancel (mail_op);
g_queue_remove (priv->op_queue, mail_op);
g_object_unref (G_OBJECT (mail_op));
g_return_if_fail (MODEST_IS_MAIL_OPERATION_QUEUE (self));
g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op));
-
+
priv = MODEST_MAIL_OPERATION_QUEUE_GET_PRIVATE(self);
+ priv->running_final_sync = (modest_mail_operation_get_type_operation (mail_op) == MODEST_MAIL_OPERATION_TYPE_SHUTDOWN);
+
g_mutex_lock (priv->queue_lock);
g_queue_push_tail (priv->op_queue, g_object_ref (mail_op));
g_mutex_unlock (priv->queue_lock);
-
+
MODEST_DEBUG_BLOCK (print_queue_item (mail_op, "add"););
/* Get notified when the operation ends to remove it from the
mail_op, MODEST_MAIL_OPERATION_QUEUE_OPERATION_ADDED);
}
-void
+static gboolean
+notify_queue_empty (gpointer user_data)
+{
+ ModestMailOperationQueue *self = (ModestMailOperationQueue *) user_data;
+ ModestMailOperationQueuePrivate *priv;
+ guint num_elements;
+
+ priv = MODEST_MAIL_OPERATION_QUEUE_GET_PRIVATE(self);
+
+ g_mutex_lock (priv->queue_lock);
+ num_elements = priv->op_queue->length;
+ g_mutex_unlock (priv->queue_lock);
+
+ /* We re-check again that the queue is empty. It could happen
+ that we had issued a tny_send_queue_flush before the send
+ queue could add a mail operation to the queue as a response
+ to the "start-queue" signal, because that signal is issued
+ by tinymail in the main loop. Therefor it could happen that
+ we emit the queue-empty signal while a send-queue is still
+ waiting for the "start-queue" signal from tinymail, so the
+ send queue will never try to send the items because modest
+ is finalized before */
+ if (num_elements == 0) {
+ gdk_threads_enter ();
+ g_signal_emit (self, signals[QUEUE_EMPTY_SIGNAL], 0);
+ gdk_threads_leave ();
+ }
+
+ return FALSE;
+}
+
+
+void
modest_mail_operation_queue_remove (ModestMailOperationQueue *self,
ModestMailOperation *mail_op)
{
ModestMailOperationQueuePrivate *priv;
ModestMailOperationStatus status;
+ guint num_elements;
g_return_if_fail (MODEST_IS_MAIL_OPERATION_QUEUE (self));
g_return_if_fail (MODEST_IS_MAIL_OPERATION (mail_op));
g_mutex_lock (priv->queue_lock);
g_queue_remove (priv->op_queue, mail_op);
+ num_elements = priv->op_queue->length;
g_mutex_unlock (priv->queue_lock);
MODEST_DEBUG_BLOCK (print_queue_item (mail_op, "remove"););
/* Check errors */
status = modest_mail_operation_get_status (mail_op);
- if (status == MODEST_MAIL_OPERATION_STATUS_CANCELED) {
- g_warning ("%s: operation canceled \n", __FUNCTION__);
- } else if (status != MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
+ if (status != MODEST_MAIL_OPERATION_STATUS_SUCCESS &&
+ status != MODEST_MAIL_OPERATION_STATUS_INVALID) {
/* This is a sanity check. Shouldn't be needed, but
prevent possible application crashes. It's useful
also for detecting mail operations with invalid
if (modest_mail_operation_get_error (mail_op) != NULL) {
modest_mail_operation_execute_error_handler (mail_op);
} else {
- g_warning ("%s: possible error in a mail operation " \
- "implementation. The status is not successful " \
- "but the mail operation does not have any " \
- "error set\n", __FUNCTION__);
+ if (status == MODEST_MAIL_OPERATION_STATUS_CANCELED)
+ g_debug ("%s: operation canceled \n", __FUNCTION__);
+ else
+ g_warning ("%s: possible error in a mail operation " \
+ "implementation. The status is not successful " \
+ "but the mail operation does not have any " \
+ "error set\n", __FUNCTION__);
}
}
/* Free object */
-
- /* We do not own the last reference when this operation is deleted
- * as response to a progress changed signal from the mail operation
- * itself, in which case the glib signal system owns a reference
- * until the signal emission is complete. armin. */
- /* modest_runtime_verify_object_last_ref (mail_op, ""); */
g_object_unref (G_OBJECT (mail_op));
- /* Emit the queue empty-signal */
- g_signal_emit (self, signals[QUEUE_EMPTY_SIGNAL], 0);
+ /* Emit the queue empty-signal. See the function to know why
+ we emit it in an idle */
+ if (num_elements == 0) {
+ if (priv->queue_empty_handler) {
+ g_source_remove (priv->queue_empty_handler);
+ priv->queue_empty_handler = 0;
+ }
+ priv->queue_empty_handler = g_idle_add_full (G_PRIORITY_LOW,
+ notify_queue_empty,
+ self, NULL);
+ }
}
-guint
+guint
modest_mail_operation_queue_num_elements (ModestMailOperationQueue *self)
{
ModestMailOperationQueuePrivate *priv;
guint length = 0;
g_return_val_if_fail (MODEST_IS_MAIL_OPERATION_QUEUE (self), 0);
-
+
priv = MODEST_MAIL_OPERATION_QUEUE_GET_PRIVATE(self);
g_mutex_lock (priv->queue_lock);
g_queue_foreach (priv->op_queue, (GFunc) on_cancel_all_foreach, &operations_to_cancel);
g_mutex_unlock (priv->queue_lock);
- /* TODO: Reverse the list, to remove operations in order? */
+ operations_to_cancel = g_slist_reverse (operations_to_cancel);
for(cur = operations_to_cancel; cur != NULL; cur = cur->next) {
if (!MODEST_IS_MAIL_OPERATION(cur->data))
static void
on_find_by_source_foreach (gpointer op, gpointer data)
{
- FindBySourceInfo *info = (FindBySourceInfo*) data;
+ FindBySourceInfo *info = (FindBySourceInfo*) data;
+ GObject *source = NULL;
- if ( info->source == modest_mail_operation_get_source (MODEST_MAIL_OPERATION (op))) {
+ source = modest_mail_operation_get_source (MODEST_MAIL_OPERATION (op));
+ if (info->source == source) {
g_object_ref (G_OBJECT (op));
*(info->new_list) = g_slist_prepend (*(info->new_list), MODEST_MAIL_OPERATION (op));
}
+ if (source)
+ g_object_unref (source);
}
GSList*
-modest_mail_operation_queue_get_by_source (
- ModestMailOperationQueue *self,
- GObject *source)
+modest_mail_operation_queue_get_by_source (ModestMailOperationQueue *self,
+ GObject *source)
{
ModestMailOperationQueuePrivate *priv;
GSList* found_operations= NULL;
- FindBySourceInfo *info = g_new0 (FindBySourceInfo, 1);
+ FindBySourceInfo *info;
g_return_val_if_fail (MODEST_IS_MAIL_OPERATION_QUEUE (self), NULL);
g_return_val_if_fail (source != NULL, NULL);
-
+
priv = MODEST_MAIL_OPERATION_QUEUE_GET_PRIVATE(self);
+ info = g_new0 (FindBySourceInfo, 1);
info->new_list = &found_operations;
info->source = source;
-
+
g_mutex_lock (priv->queue_lock);
g_queue_foreach (priv->op_queue, (GFunc) on_find_by_source_foreach, info);
g_mutex_unlock (priv->queue_lock);
-
+
g_free (info);
-
+
return found_operations;
}
static void
accumulate_mail_op_strings (ModestMailOperation *op, gchar **str)
{
- *str = g_strdup_printf ("%s\n%s", *str, modest_mail_operation_to_string (op));
+ gchar *mail_op_to_str = modest_mail_operation_to_string (op);
+ *str = g_strdup_printf ("%s\n%s", *str, mail_op_to_str);
+ g_free (mail_op_to_str);
}
gchar*
modest_mail_operation_queue_to_string (ModestMailOperationQueue *self)
{
- gchar *str;
+ gchar *str = NULL;
guint len;
ModestMailOperationQueuePrivate *priv;
-
+
g_return_val_if_fail (MODEST_IS_MAIL_OPERATION_QUEUE (self), NULL);
-
+
priv = MODEST_MAIL_OPERATION_QUEUE_GET_PRIVATE(self);
len = g_queue_get_length (priv->op_queue);
str = g_strdup_printf ("mail operation queue (%02d)\n-------------------------", len);
- if (len == 0)
- str = g_strdup_printf ("%s\n%s", str, "<empty>");
- else {
+ if (len == 0) {
+ gchar *copy;
+ copy = str;
+ str = g_strdup_printf ("%s\n%s", copy, "<empty>");
+ g_free (copy);
+ } else {
g_mutex_lock (priv->queue_lock);
g_queue_foreach (priv->op_queue, (GFunc)accumulate_mail_op_strings, &str);
g_mutex_unlock (priv->queue_lock);
}
-
+
return str;
}
+
+gboolean
+modest_mail_operation_queue_running_shutdown (ModestMailOperationQueue *self)
+{
+ ModestMailOperationQueuePrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_MAIL_OPERATION_QUEUE (self), FALSE);
+
+ priv = MODEST_MAIL_OPERATION_QUEUE_GET_PRIVATE(self);
+ return priv->running_final_sync;
+}
+
+void
+modest_mail_operation_queue_set_running_shutdown (ModestMailOperationQueue *self)
+{
+ ModestMailOperationQueuePrivate *priv;
+
+ g_return_if_fail (MODEST_IS_MAIL_OPERATION_QUEUE (self));
+
+ priv = MODEST_MAIL_OPERATION_QUEUE_GET_PRIVATE(self);
+ priv->running_final_sync = TRUE;
+}
projects / modest / blobdiff