Fix wrong usage of g_object_unref() in

modest_mail_operation_xfer_msgs() and transfer_msgs_cb()

pmo-trunk-r4112

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index fa8b032..4c3efb3 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -2634,8 +2634,6 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u
                        g_object_unref (helper->dest_folder);
                if (helper->mail_op)
                        g_object_unref (helper->mail_op);
                        g_object_unref (helper->dest_folder);
                if (helper->mail_op)
                        g_object_unref (helper->mail_op);

-               if (folder)
-                       g_object_unref (folder);

                g_slice_free (XFerMsgsAsyncHelper, helper);
        } else {
                /* Transfer more messages */
                g_slice_free (XFerMsgsAsyncHelper, helper);
        } else {
                /* Transfer more messages */

@@ -2796,6 +2794,7 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
                                        transfer_msgs_cb, 
                                        transfer_msgs_status_cb,
                                        helper);
                                        transfer_msgs_cb, 
                                        transfer_msgs_status_cb,
                                        helper);

+       g_object_unref (src_folder);

        g_object_unref (dst_account);
 }
 
        g_object_unref (dst_account);
 }