X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=070f3a2aa52648f2a992cd4e0aee2ddc6d520939;hp=ac3c94e70ccd1dfd224aa6dc384d9c39ea29ac17;hb=447e2544da351186d8be820c8cbb32982d323764;hpb=cf217ac0fa960e3d479287b349d2d45f3c1cb213

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index ac3c94e..070f3a2 100644
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -74,21 +74,24 @@ modest_tny_account_get_special_folder (TnyAccount *account,
 	if (special_type == TNY_FOLDER_TYPE_OUTBOX) {
 		const gchar *modest_account_name = 
 			modest_tny_account_get_parent_modest_account_name_for_server_account (account);
-		g_assert (modest_account_name);
-
-		gchar *account_id = g_strdup_printf (
-			MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDER_ACCOUNT_ID_PREFIX "%s", 
-			modest_account_name);
 		
-		local_account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(),
-									     MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
-									     account_id);
-		if (!local_account) {
-			g_printerr ("modest: %s: modest_tny_account_store_get_tny_account_by(ID) returned NULL for %s\n", __FUNCTION__, account_id);
-		return NULL;
+		if (modest_account_name) {
+			gchar *account_id = g_strdup_printf (
+				MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDER_ACCOUNT_ID_PREFIX "%s", 
+				modest_account_name);
+			
+			local_account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(),
+										     MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
+										     account_id);
+			if (!local_account) {
+				g_printerr ("modest: %s: modest_tny_account_store_get_tny_account_by(ID) returned NULL for %s\n", __FUNCTION__, account_id);
+			return NULL;
+			}
+		
+			g_free (account_id);
+		} else {
+			g_warning ("%s: modest_account_name was NULL.", __FUNCTION__);
 		}
-	
-		g_free (account_id);
 	} else {
 		/* Other local folders are all in one on-disk directory: */
 		local_account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(),
@@ -126,12 +129,15 @@ modest_tny_account_get_special_folder (TnyAccount *account,
 	while (!tny_iterator_is_done (iter)) {
 		TnyFolder *folder =
 			TNY_FOLDER (tny_iterator_get_current (iter));
-		if (modest_tny_folder_get_local_folder_type (folder) == special_type) {
-			special_folder = folder;
-			break;
-		}
+		if (folder) {
+			if (modest_tny_folder_get_local_or_mmc_folder_type (folder) == special_type) {
+				special_folder = folder;
+				break; /* Leaving a ref for the special_folder return value. */
+			}
 		
-		g_object_unref (G_OBJECT(folder));
+			g_object_unref (G_OBJECT(folder));
+		}
+
 		tny_iterator_next (iter);
 	}
 	
@@ -730,6 +736,8 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac
 		return NULL;
 	}
 	
+	printf ("DEBUG: %s: Setting session for account: session=%p\n", 
+		__FUNCTION__, session);
 	tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), session);
 	
 	/* Make sure that the paths exists on-disk so that TnyCamelStoreAccount can 
@@ -780,9 +788,12 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac
 
 
 typedef gint (*TnyStatsFunc) (TnyFolderStats *stats);
+#define TASK_GET_ALL_COUNT	0
+#define TASK_GET_LOCAL_SIZE	1
+#define TASK_GET_FOLDER_COUNT	2
 
 typedef struct _RecurseFoldersHelper {
-	TnyStatsFunc function;
+	gint task;
 	guint sum;
 	guint folders;
 } RecurseFoldersHelper;
@@ -801,23 +812,22 @@ recurse_folders (TnyFolderStore *store,
 	helper->folders += tny_list_get_length (folders);
 
 	while (!tny_iterator_is_done (iter)) {
-		TnyFolderStats *stats;
 		TnyFolder *folder;
 
 		folder = TNY_FOLDER (tny_iterator_get_current (iter));
-		stats = tny_folder_get_stats (folder);
+		if (folder) {
+			if (helper->task == TASK_GET_ALL_COUNT)
+				helper->sum += tny_folder_get_all_count (folder);
 
-		if (stats) {
-			/* initially, we sometimes get -1 from tinymail; ignore that */
-			if (helper->function && helper->function (stats) > 0)
-				helper->sum += helper->function (stats);
+			if (helper->task == TASK_GET_LOCAL_SIZE)
+				helper->sum += tny_folder_get_local_size (folder);
 
-			if (TNY_IS_FOLDER_STORE (folder)) {
+			if (TNY_IS_FOLDER_STORE (folder))
 				recurse_folders (TNY_FOLDER_STORE (folder), query, helper);
-			}
-			g_object_unref (stats);
-		}    
- 		g_object_unref (folder);
+
+ 			g_object_unref (folder);
+		}
+
 		tny_iterator_next (iter);
 	}
 	 g_object_unref (G_OBJECT (iter));
@@ -834,7 +844,7 @@ modest_tny_folder_store_get_folder_count (TnyFolderStore *self)
 
 	/* Create helper */
 	helper = g_malloc0 (sizeof (RecurseFoldersHelper));
-	helper->function = NULL;
+	helper->task = TASK_GET_FOLDER_COUNT;
 	helper->sum = 0;
 	helper->folders = 0;
 
@@ -857,7 +867,7 @@ modest_tny_folder_store_get_message_count (TnyFolderStore *self)
 	
 	/* Create helper */
 	helper = g_malloc0 (sizeof (RecurseFoldersHelper));
-	helper->function = (TnyStatsFunc) tny_folder_stats_get_all_count;
+	helper->task = TASK_GET_ALL_COUNT;
 	helper->sum = 0;
 
 	recurse_folders (self, NULL, helper);
@@ -879,7 +889,7 @@ modest_tny_folder_store_get_local_size (TnyFolderStore *self)
 
 	/* Create helper */
 	helper = g_malloc0 (sizeof (RecurseFoldersHelper));
-	helper->function = (TnyStatsFunc) tny_folder_stats_get_local_size;
+	helper->task = TASK_GET_LOCAL_SIZE;
 	helper->sum = 0;
 
 	recurse_folders (self, NULL, helper);