X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=e8cfaebd4df1d41dcda816fcf7eba20dbf6e17e4;hp=95cd33fda4228c526ba9cd195d22c491a4a29681;hb=d3152f5a6ea0f939f9535fd8024538d95f14b588;hpb=cadd8461692659596851148ad052b3cd47ac256d

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 95cd33f..e8cfaeb 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -136,7 +136,6 @@ typedef struct
 	gint pending_calls;
 	gboolean poke_all;
 	TnyFolderObserver *inbox_observer;
-	RetrieveAllCallback retrieve_all_cb;
 	gboolean interactive;
 	gboolean msg_readed;
 } UpdateAccountInfo;
@@ -1596,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);
@@ -1640,7 +1638,7 @@ inbox_refreshed_cb (TnyFolder *inbox,
 	ModestAccountMgr *mgr;
 	ModestAccountRetrieveType retrieve_type;
 	TnyList *new_headers = NULL;
-	gboolean headers_only, ignore_limit;
+	gboolean headers_only;
 	time_t time_to_store;
 
 	info = (UpdateAccountInfo *) user_data;
@@ -1729,20 +1727,6 @@ inbox_refreshed_cb (TnyFolder *inbox,
 	/* Order by date */
 	g_ptr_array_sort (new_headers_array, (GCompareFunc) compare_headers_by_date);
 
-	/* Ask the users if they want to retrieve all the messages
-	   even though the limit was exceeded */
-	ignore_limit = FALSE;
-	if (new_headers_array->len > retrieve_limit) {
-		/* Ask the user if a callback has been specified and
-		   if the mail operation has a source (this means that
-		   was invoked by the user and not automatically by a
-		   D-Bus method) */
-		if (info->retrieve_all_cb && info->interactive)
-			ignore_limit = info->retrieve_all_cb (priv->source,
-							      new_headers_array->len,
-							      retrieve_limit);
-	}
-
 	/* Copy the headers to a list and free the array */
 	new_headers = tny_simple_list_new ();
 	for (i=0; i < new_headers_array->len; i++) {
@@ -1760,10 +1744,7 @@ inbox_refreshed_cb (TnyFolder *inbox,
 		GetMsgInfo *msg_info;
 
 		priv->done = 0;
-		if (ignore_limit)
-			priv->total = tny_list_get_length (new_headers);
-		else
-			priv->total = MIN (tny_list_get_length (new_headers), retrieve_limit);
+		priv->total = MIN (tny_list_get_length (new_headers), retrieve_limit);
 
 		iter = tny_list_create_iterator (new_headers);
 
@@ -1783,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 */
@@ -1956,7 +1939,6 @@ modest_mail_operation_update_account (ModestMailOperation *self,
 				      const gchar *account_name,
 				      gboolean poke_all,
 				      gboolean interactive,
-				      RetrieveAllCallback retrieve_all_cb,
 				      UpdateAccountCallback callback,
 				      gpointer user_data)
 {
@@ -2013,7 +1995,6 @@ modest_mail_operation_update_account (ModestMailOperation *self,
 	info->account_name = g_strdup (account_name);
 	info->callback = callback;
 	info->user_data = user_data;
-	info->retrieve_all_cb = retrieve_all_cb;
 
 	/* Set account busy */
 	modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr (), account_name, TRUE);
@@ -2031,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);
@@ -3838,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;
 	}