X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=5836ff524efae19c9578f4967124342231a009ca;hp=a15ea5d82a2eac6a4519bff2559ffc3da49295ab;hb=ab8f1b74bd81753cf93ec2d1664dc2d101ee2267;hpb=201c850b03ab4d1ffd973ad4682c460e06a53a6d

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index a15ea5d..5836ff5 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -135,7 +135,6 @@ struct _ModestMailOperationPrivate {
 typedef struct {
 	GetMsgAsyncUserCallback user_callback;
 	TnyHeader *header;
-	TnyList *header_list;
 	TnyIterator *iter;
 	gpointer user_data;
 	ModestMailOperation *mail_op;
@@ -2196,8 +2195,6 @@ get_msg_async_cb (TnyFolder *folder,
 		/* Clean */
 		if (info->iter)
 			g_object_unref (info->iter);
-		if (info->header_list)
-			g_object_unref (info->header_list);
 		g_object_unref (info->header);
 		g_object_unref (info->mail_op);
 		g_slice_free (GetMsgInfo, info);
@@ -2240,8 +2237,8 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 
 	/* Get account and set it into mail_operation */
 	if (tny_list_get_length (header_list) >= 1) {
-		iter = tny_list_create_iterator (header_list);
-		TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+		TnyIterator *iterator = tny_list_create_iterator (header_list);
+		TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iterator));
 		if (header) {
 			TnyFolder *folder = tny_header_get_folder (header);
 			if (folder) {		
@@ -2250,11 +2247,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 			}
 			g_object_unref (header);
 		}
-
-		if (tny_list_get_length (header_list) == 1) {
-			g_object_unref (iter);
-			iter = NULL;
-		}
+		g_object_unref (iterator);
 	}
 
 	msg_list_size = compute_message_list_size (header_list);
@@ -2278,7 +2271,6 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 		msg_info = g_slice_new0 (GetMsgInfo);
 		msg_info->mail_op = g_object_ref (self);
 		msg_info->header = g_object_ref (header);
-		msg_info->header_list = g_object_ref (header_list);
 		msg_info->iter = g_object_ref (iter);
 		msg_info->user_callback = user_callback;
 		msg_info->user_data = user_data;