X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=fda43668d74a7a02fbf4835423513814997f0eb3;hp=c4b379af09e29bbe13076e3a60fa2215c576bbc1;hb=25cf2dcb2cafa1281f23363ad314cddf1cea12a3;hpb=cc77d0cecb3fdb6cc55c36c60be92cc63730e5e4

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index c4b379a..fda4366 100644
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -65,13 +65,17 @@ modest_tny_account_get_special_folder (TnyAccount *account,
 	 
 	/* Per-account outbox folders are each in their own on-disk directory: */
 	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", 
-			tny_account_get_id (account));
+			modest_account_name);
 		
-			local_account = modest_tny_account_store_get_tny_account_by_id (modest_runtime_get_account_store(),
+		local_account = modest_tny_account_store_get_tny_account_by_id (modest_runtime_get_account_store(),
 									account_id);
-			g_free (account_id);
+		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_id (modest_runtime_get_account_store(),
@@ -303,6 +307,15 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
 	g_free (url);
 	/***********************/
 	
+	/* For transport accounts, now is a good time to create the send queues, 
+	 * so that the send queues start trying as soon as possible to send any 
+	 * messages that are already in their outboxes: */
+	if ( (account_data->proto == MODEST_PROTOCOL_TRANSPORT_SENDMAIL) ||
+	     (account_data->proto == MODEST_PROTOCOL_TRANSPORT_SMTP) ) {
+		/* modest_runtime_get_send_queue() instantiates and stores the send queue: */
+		modest_runtime_get_send_queue( TNY_TRANSPORT_ACCOUNT (tny_account));
+	}
+	
 	return tny_account;
 }
 
@@ -424,11 +437,10 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess
 
 
 TnyAccount*
-modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *account_mgr, TnyAccount *account, TnySessionCamel *session)
+modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *account_mgr, const gchar* account_name, TnySessionCamel *session)
 {
 	g_return_val_if_fail (account_mgr, NULL);
-	g_return_val_if_fail (account, NULL);
-	g_return_val_if_fail (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_TRANSPORT, NULL);
+	g_return_val_if_fail (account_name, NULL);
 	
 	/* Notice that we create a ModestTnyOutboxAccount here, 
 	 * instead of just a TnyCamelStoreAccount,
@@ -444,14 +456,14 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac
 	
 	/* Make sure that the paths exists on-disk so that TnyCamelStoreAccount can 
 	 * find it to create a TnyFolder for it: */
-	gchar *folder_dir = modest_per_account_local_outbox_folder_info_get_maildir_path_to_outbox_folder (account); 
+	gchar *folder_dir = modest_per_account_local_outbox_folder_info_get_maildir_path_to_outbox_folder (account_name); 
 	modest_init_one_local_folder(folder_dir);
 	g_free (folder_dir);
 	folder_dir = NULL;
 
 	/* This path should contain just one directory - "outbox": */
 	gchar *maildir = 
-		modest_per_account_local_outbox_folder_info_get_maildir_path (account);
+		modest_per_account_local_outbox_folder_info_get_maildir_path (account_name);
 			
 	CamelURL *url = camel_url_new ("maildir:", NULL);
 	camel_url_set_path (url, maildir);
@@ -473,7 +485,7 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac
 	
 	gchar *account_id = g_strdup_printf (
 		MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDER_ACCOUNT_ID_PREFIX "%s", 
-		tny_account_get_id (account));
+		account_name);
 	tny_account_set_id (TNY_ACCOUNT(tny_account), account_id);
 	g_free (account_id);