Fixes leak 16/26

[modest] / src / modest-mail-operation-queue.c

diff --git a/src/modest-mail-operation-queue.c b/src/modest-mail-operation-queue.c
index 720e668..cb02a9f 100644 (file)
--- a/src/modest-mail-operation-queue.c
+++ b/src/modest-mail-operation-queue.c
@@ -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;
 }
 
@@ -496,19 +499,20 @@ accumulate_mail_op_strings (ModestMailOperation *op, gchar **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)
+       if (len == 0) {
+               g_free (str);
                str = g_strdup_printf ("%s\n%s", str, "<empty>");
-       else {
+       } 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);