X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-mail-operation-queue.c;h=01a36b9f7644a9010e6796cd2f81850d93cf8522;hb=d2b7b5190cdfa7b235eba09687beed4f48d57bba;hp=804a6569f148c8f50d3a1077e51fea89a32314d9;hpb=8dd50ff5e07c449e6cdca0abfd868826673fcba5;p=modest

diff --git a/src/modest-mail-operation-queue.c b/src/modest-mail-operation-queue.c
index 804a656..01a36b9 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));
@@ -245,7 +245,7 @@ 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);
@@ -253,7 +253,7 @@ modest_mail_operation_queue_add (ModestMailOperationQueue *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"););
 
 	/* Get notified when the operation ends to remove it from the
@@ -302,7 +302,7 @@ notify_queue_empty (gpointer user_data)
 }
 
 
-void 
+void
 modest_mail_operation_queue_remove (ModestMailOperationQueue *self,
 				    ModestMailOperation *mail_op)
 {
@@ -367,14 +367,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 +431,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,18 +452,21 @@ 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;
@@ -471,18 +474,18 @@ modest_mail_operation_queue_get_by_source (
 
 	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->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;
 }
 
@@ -513,7 +516,7 @@ modest_mail_operation_queue_to_string (ModestMailOperationQueue *self)
 		g_queue_foreach (priv->op_queue, (GFunc)accumulate_mail_op_strings, &str);
 		g_mutex_unlock (priv->queue_lock);
 	}
-		
+
 	return str;
 }
 
@@ -521,9 +524,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 +535,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;
 }