X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=0a1a16ef5e1efa6f55951898c3c43efd663e4f2b;hb=51cc36c187e300ea0db5e3cff2bdeb687f8c2d28;hp=67c0988f94d6457ce07fbb6739d6a47ccb14fce1;hpb=9c1aa81721780a0229c9bcf2a669b41e3375da60;p=modest diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c index 67c0988..0a1a16e 100644 --- a/src/modest-tny-account.c +++ b/src/modest-tny-account.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -78,13 +79,15 @@ modest_tny_account_get_special_folder (TnyAccount *account, MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDER_ACCOUNT_ID_PREFIX "%s", modest_account_name); - local_account = modest_tny_account_store_get_tny_account_by_id (modest_runtime_get_account_store(), - account_id); + local_account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(), + MODEST_TNY_ACCOUNT_STORE_QUERY_ID, + 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(), - MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID); + local_account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(), + MODEST_TNY_ACCOUNT_STORE_QUERY_ID, + MODEST_LOCAL_FOLDERS_ACCOUNT_ID); } if (!local_account) { @@ -127,8 +130,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 +240,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 +321,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); /***********************/ @@ -328,7 +343,7 @@ modest_tny_account_new_from_server_account_name (ModestAccountMgr *account_mgr, TnyAccount *result = modest_tny_account_new_from_server_account ( account_mgr, account_data); - + modest_account_mgr_free_server_account_data (account_mgr, account_data); return result; @@ -416,7 +431,7 @@ on_modest_file_system_info(HildonFileSystemInfoHandle *handle, TnyAccount *account = TNY_ACCOUNT (data); if (error) { - printf (" DEBUG: %s: error=%s\n", __FUNCTION__, error->message); +/* printf (" DEBUG: %s: error=%s\n", __FUNCTION__, error->message); */ } const gchar *display_name = NULL; @@ -443,9 +458,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); @@ -461,7 +486,7 @@ modest_tny_account_new_for_local_folders (ModestAccountMgr *account_mgr, TnySess url_string = camel_url_to_string (url, 0); tny_account_set_url_string (TNY_ACCOUNT(tny_account), url_string); - printf("DEBUG: %s:\n url=%s\n", __FUNCTION__, url_string); +/* printf("DEBUG: %s:\n url=%s\n", __FUNCTION__, url_string); */ /* TODO: Use a more generic way of identifying memory card paths, * and of marking accounts as memory card accounts, maybe @@ -500,14 +525,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); @@ -556,7 +581,7 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac camel_url_free (url); tny_account_set_url_string (TNY_ACCOUNT(tny_account), url_string); - printf("DEBUG: %s:\n url=%s\n", __FUNCTION__, url_string); +/* printf("DEBUG: %s:\n url=%s\n", __FUNCTION__, url_string); */ g_free (url_string); /* This text should never been seen, @@ -575,7 +600,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); } @@ -701,7 +726,7 @@ const gchar* modest_tny_account_get_parent_modest_account_name_for_server_accoun void modest_tny_account_set_parent_modest_account_name_for_server_account (TnyAccount *self, const gchar* parent_modest_acount_name) { g_object_set_data_full (G_OBJECT(self), "modest_account", - (gpointer*) g_strdup (parent_modest_acount_name), g_free); + (gpointer) g_strdup (parent_modest_acount_name), g_free); }