X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=e8cfaebd4df1d41dcda816fcf7eba20dbf6e17e4;hp=aa1d1cd42fa6b988ee4a677b4b00cdb953485532;hb=6b278f424ea98b040de03e6ad307a551b484b725;hpb=e5257b19bddccd4992b445fc828d03d09366ba25;ds=sidebyside

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index aa1d1cd..e8cfaeb 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);
@@ -2013,7 +2012,7 @@ modest_mail_operation_update_account (ModestMailOperation *self,
 	/* Get all folders and continue in the callback */ 
 	folders = tny_simple_list_new ();
 	tny_folder_store_get_folders_async (TNY_FOLDER_STORE (priv->account),
-					    folders, NULL, FALSE,
+					    folders, NULL, TRUE,
 					    recurse_folders_async_cb, 
 					    NULL, info);
 	g_object_unref (folders);
@@ -3820,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;
 	}