X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=12944e627a0ba2716646d52bb45d6231f83ee746;hp=3b12158e5ddd7c1ff3453be13e30fc34f156b44c;hb=65672fc46aa168a161d33f78325245e1ea4f2611;hpb=271699adf62b6841495684d3f106108318211b62

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 3b12158..12944e6 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -1595,7 +1595,6 @@ update_account_get_msg_async_cb (TnyFolder *folder,
 		/* Call the user callback and free */
 		new_headers = tny_iterator_get_list (msg_info->more_msgs);
 		update_account_notify_user_and_free (info, new_headers);
-		g_object_unref (new_headers);
 
 		/* Delete the helper */
 		g_object_unref (msg_info->more_msgs);
@@ -1765,11 +1764,13 @@ inbox_refreshed_cb (TnyFolder *inbox,
 						  NULL, msg_info);
 
 			g_object_unref (folder);
+			g_object_unref (header);
 
 			msg_num++;
 			tny_iterator_next (iter);
 		}
 		g_object_unref (iter);
+		g_object_unref (new_headers);
 
 		/* The mail operation will finish when the last
 		   message is retrieved */
@@ -3818,12 +3819,14 @@ modest_mail_operation_to_string (ModestMailOperation *self)
 	
 	switch (priv->op_type) {
 	case MODEST_MAIL_OPERATION_TYPE_SEND:    type= "SEND";    break;
+	case MODEST_MAIL_OPERATION_TYPE_SEND_AND_RECEIVE:    type= "SEND-AND-RECEIVE";    break;
 	case MODEST_MAIL_OPERATION_TYPE_RECEIVE: type= "RECEIVE"; break;
 	case MODEST_MAIL_OPERATION_TYPE_OPEN:    type= "OPEN";    break;
 	case MODEST_MAIL_OPERATION_TYPE_DELETE:  type= "DELETE";  break;
 	case MODEST_MAIL_OPERATION_TYPE_INFO:    type= "INFO";    break;
 	case MODEST_MAIL_OPERATION_TYPE_RUN_QUEUE: type= "RUN-QUEUE"; break;
 	case MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER: type= "SYNC-FOLDER"; break;
+	case MODEST_MAIL_OPERATION_TYPE_SHUTDOWN: type= "SHUTDOWN"; break;
 	case MODEST_MAIL_OPERATION_TYPE_UNKNOWN: type= "UNKNOWN"; break;
 	default: type = "UNEXPECTED"; break;
 	}