X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation-queue.c;h=22bbd539d6d97cbb4fc00af7f9ba40536b280b84;hp=cb02a9f9e3598cacc5846917fedb4b848eb9f0a3;hb=4eed73e6ad57291561801592a3d81f6d584c47e9;hpb=464e5b59df121d3c2315df838998d948c48bd6d3

diff --git a/src/modest-mail-operation-queue.c b/src/modest-mail-operation-queue.c
index cb02a9f..22bbd53 100644
--- a/src/modest-mail-operation-queue.c
+++ b/src/modest-mail-operation-queue.c
@@ -342,7 +342,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 " \
@@ -470,13 +470,14 @@ modest_mail_operation_queue_get_by_source (ModestMailOperationQueue *self,
 {
 	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;
 
@@ -492,7 +493,9 @@ modest_mail_operation_queue_get_by_source (ModestMailOperationQueue *self,
 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);
 }
 
 
@@ -510,8 +513,10 @@ modest_mail_operation_queue_to_string (ModestMailOperationQueue *self)
 	len = g_queue_get_length (priv->op_queue);
 	str = g_strdup_printf ("mail operation queue (%02d)\n-------------------------", len);
 	if (len == 0) {
-		g_free (str);
-		str = g_strdup_printf ("%s\n%s", str, "<empty>");
+		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);