X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation-queue.c;h=c4611bfa3d2821de341a8a9fa84f43b63d6239c4;hp=804a6569f148c8f50d3a1077e51fea89a32314d9;hb=f065ac27e44ca355d02b24513e6695812bcf546c;hpb=8dd50ff5e07c449e6cdca0abfd868826673fcba5 diff --git a/src/modest-mail-operation-queue.c b/src/modest-mail-operation-queue.c index 804a656..c4611bf 100644 --- a/src/modest-mail-operation-queue.c +++ b/src/modest-mail-operation-queue.c @@ -180,7 +180,7 @@ on_finalize_foreach(gpointer op, 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)); @@ -228,6 +228,28 @@ modest_mail_operation_queue_new (void) } static void +on_operation_started (ModestMailOperation *mail_op, + gpointer user_data) +{ + ModestMailOperationQueue *self = MODEST_MAIL_OPERATION_QUEUE (user_data); + ModestMailOperationTypeOperation op_type; + ModestMailOperationQueuePrivate *priv; + TnyDevice *device; + + priv = MODEST_MAIL_OPERATION_QUEUE_GET_PRIVATE(self); + + op_type = modest_mail_operation_get_type_operation (mail_op); + device = modest_runtime_get_device (); + + if ((op_type != MODEST_MAIL_OPERATION_TYPE_SHUTDOWN) && + priv->running_final_sync && + tny_device_is_forced (device)) + tny_device_reset (device); + + priv->running_final_sync = (op_type == MODEST_MAIL_OPERATION_TYPE_SHUTDOWN); +} + +static void on_operation_finished (ModestMailOperation *mail_op, gpointer user_data) { @@ -245,24 +267,27 @@ modest_mail_operation_queue_add (ModestMailOperationQueue *self, 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); + priv = MODEST_MAIL_OPERATION_QUEUE_GET_PRIVATE(self); 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");); + g_signal_connect (G_OBJECT (mail_op), + "operation-started", + G_CALLBACK (on_operation_started), + self); + /* Get notified when the operation ends to remove it from the queue. We connect it using the *after* because we want to let the other handlers for the finish function happen before this */ - g_signal_connect_after (G_OBJECT (mail_op), + g_signal_connect_after (G_OBJECT (mail_op), "operation-finished", - G_CALLBACK (on_operation_finished), + G_CALLBACK (on_operation_finished), self); /* Notify observers */ @@ -302,7 +327,7 @@ notify_queue_empty (gpointer user_data) } -void +void modest_mail_operation_queue_remove (ModestMailOperationQueue *self, ModestMailOperation *mail_op) { @@ -342,7 +367,7 @@ modest_mail_operation_queue_remove (ModestMailOperationQueue *self, modest_mail_operation_execute_error_handler (mail_op); } else { if (status == MODEST_MAIL_OPERATION_STATUS_CANCELED) - g_warning ("%s: operation canceled \n", __FUNCTION__); + g_debug ("%s: operation canceled \n", __FUNCTION__); else g_warning ("%s: possible error in a mail operation " \ "implementation. The status is not successful " \ @@ -367,14 +392,14 @@ modest_mail_operation_queue_remove (ModestMailOperationQueue *self, } } -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); @@ -431,7 +456,7 @@ modest_mail_operation_queue_cancel_all (ModestMailOperationQueue *self) 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)) @@ -452,68 +477,77 @@ typedef struct 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, ""); - else { + if (len == 0) { + gchar *copy; + copy = str; + str = g_strdup_printf ("%s\n%s", copy, ""); + 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; } @@ -521,9 +555,9 @@ 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; } @@ -532,9 +566,9 @@ 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; }