X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=6716c722c1409fd4010738c32f31fdf0d4eb38e6;hp=67c0988f94d6457ce07fbb6739d6a47ccb14fce1;hb=52665b57b1c2770d5542fb0e70f96d6853225eb8;hpb=9c1aa81721780a0229c9bcf2a669b41e3375da60

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index 67c0988..6716c72 100644
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -30,6 +30,7 @@
 #include <modest-tny-platform-factory.h>
 #include <modest-tny-account.h>
 #include <modest-tny-account-store.h>
+#include <modest-tny-local-folders-account.h>
 #include <modest-runtime.h>
 #include <tny-simple-list.h>
 #include <modest-tny-folder.h>
@@ -84,7 +85,7 @@ modest_tny_account_get_special_folder (TnyAccount *account,
 	} 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(),
-										MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID);
+										MODEST_LOCAL_FOLDERS_ACCOUNT_ID);
 	}
 	
 	if (!local_account) {
@@ -127,8 +128,14 @@ modest_tny_account_get_special_folder (TnyAccount *account,
  */
 #define MODEST_ACCOUNT_OPTION_SSL "use_ssl"
 #define MODEST_ACCOUNT_OPTION_SSL_NEVER "never"
-#define MODEST_ACCOUNT_OPTION_SSL_ALWAYS "always"
+/* This is a tinymail camel-lite specific option, 
+ * roughly equivalent to "always" in regular camel,
+ * which is appropriate for a generic "SSL" connection option: */
+#define MODEST_ACCOUNT_OPTION_SSL_WRAPPED "wrapped"
+/* Not used in our UI so far: */
 #define MODEST_ACCOUNT_OPTION_SSL_WHEN_POSSIBLE "when-possible"
+/* This is a tinymailcamel-lite specific option that is not in regular camel. */
+#define MODEST_ACCOUNT_OPTION_SSL_TLS "tls"
 
 /* These seem to be listed in 
  * libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-provider.c 
@@ -231,10 +238,15 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
 			option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_NEVER;
 			break;
 		case MODEST_PROTOCOL_CONNECTION_SSL:
+			/* Apparently, use of "IMAPS" (specified in our UI spec), implies 
+			 * use of the "wrapped" option: */
+			option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_WRAPPED;
+			break;
 		case MODEST_PROTOCOL_CONNECTION_TLS:
-			option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_ALWAYS;;
+			option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_TLS;
 			break;
 		case MODEST_PROTOCOL_CONNECTION_TLS_OP:
+			/* This is not actually in our UI: */
 			option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_WHEN_POSSIBLE;
 			break;
 		default:
@@ -307,9 +319,10 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
 			tny_account_set_port (tny_account, account_data->port);
 	}
 
-	/* FIXME: for debugging */
+	/* FIXME: for debugging. 
+	 * Let's keep this because it is very useful for debugging. */
 	url = tny_account_get_url_string (TNY_ACCOUNT(tny_account));
-/* 	g_message ("modest: %s:\n  account-url: %s", __FUNCTION__, url); */
+ 	printf ("DEBUG %s:\n  account-url: %s\n", __FUNCTION__, url);
 	g_free (url);
 	/***********************/
 	
@@ -443,9 +456,19 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess
 
 	g_return_val_if_fail (account_mgr, NULL);
 	
-	tny_account = tny_camel_store_account_new ();
+	if (!location_filepath) {
+		/* A NULL filepath means that this is the special local-folders maildir 
+		 * account: */
+		tny_account = TNY_STORE_ACCOUNT (modest_tny_local_folders_account_new ());
+	}
+	else {
+		/* Else, for instance, a per-account outbox maildir account: */
+		tny_account = TNY_STORE_ACCOUNT (tny_camel_store_account_new ());
+	}
+		
 	if (!tny_account) {
-		g_printerr ("modest: cannot create account for local folders");
+		g_printerr ("modest: %s: cannot create account for local folders. filepath=%s", 
+			__FUNCTION__, location_filepath);
 		return NULL;
 	}
 	tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), session);
@@ -500,14 +523,14 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess
  	
 	
 	const gchar* id = is_mmc ? MODEST_MMC_ACCOUNT_ID :
-		MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID;
+		MODEST_LOCAL_FOLDERS_ACCOUNT_ID;
 	tny_account_set_id (TNY_ACCOUNT(tny_account), id);
 	
 	tny_account_set_forget_pass_func (TNY_ACCOUNT(tny_account), forget_pass_dummy);
 	tny_account_set_pass_func (TNY_ACCOUNT(tny_account), get_pass_dummy);
 	
 	modest_tny_account_set_parent_modest_account_name_for_server_account (
-		TNY_ACCOUNT (tny_account), MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID);
+		TNY_ACCOUNT (tny_account), id);
 	
 	camel_url_free (url);
 	g_free (maildir);
@@ -575,7 +598,7 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac
 	
 	/* Make this think that it belongs to the modest local-folders parent account: */
 	modest_tny_account_set_parent_modest_account_name_for_server_account (
-		TNY_ACCOUNT (tny_account), MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID);
+		TNY_ACCOUNT (tny_account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID);
 
 	return TNY_ACCOUNT(tny_account);
 }