#include <modest-tny-platform-factory.h>
#include <modest-tny-account.h>
#include <modest-tny-account-store.h>
+#include <modest-default-connection-policy.h>
#include <modest-tny-local-folders-account.h>
#include <modest-runtime.h>
#include <tny-simple-list.h>
*/
/* Per-account outbox folders are each in their own on-disk directory: */
- if (special_type == TNY_FOLDER_TYPE_OUTBOX) {
+ if ((special_type == TNY_FOLDER_TYPE_OUTBOX) &&
+ (!modest_tny_account_is_virtual_local_folders (account))) {
gchar *account_id;
const gchar *modest_account_name;
g_return_val_if_fail (account_name, FALSE);
g_return_val_if_fail (tny_account, FALSE);
- tny_account_set_id (tny_account, account_name);
+ /* Do not change the id if it's not needed */
+ if (tny_account_get_id (tny_account) &&
+ strcmp (tny_account_get_id (tny_account), account_name))
+ tny_account_set_id (tny_account, account_name);
/* mbox and maildir accounts use a URI instead of the rest:
* Note that this is not where we create the special local folders account.
else {
/* Set camel-specific options: */
/* Enable secure connection settings: */
- const gchar* option_security = NULL;
+ TnyPair *option_security = NULL;
const gchar* auth_mech_name = NULL;
ModestTransportStoreProtocol protocol;
ModestConnectionProtocol security;
const gchar *hostname;
guint port;
+ /* First of all delete old options */
+ tny_camel_account_clear_options (TNY_CAMEL_ACCOUNT (tny_account));
+
protocol = modest_server_account_settings_get_protocol (server_settings);
security = modest_server_account_settings_get_security (server_settings);
auth_protocol = modest_server_account_settings_get_auth_protocol (server_settings);
switch (security) {
case MODEST_PROTOCOL_CONNECTION_NORMAL:
- option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_NEVER;
+ option_security = tny_pair_new (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;
+ option_security = tny_pair_new (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_TLS;
+ option_security = tny_pair_new (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;
+ option_security = tny_pair_new (MODEST_ACCOUNT_OPTION_SSL,MODEST_ACCOUNT_OPTION_SSL_WHEN_POSSIBLE);
break;
default:
break;
}
if(option_security)
- tny_camel_account_add_option (TNY_CAMEL_ACCOUNT (tny_account),
- option_security);
+ tny_camel_account_add_option (TNY_CAMEL_ACCOUNT (tny_account), option_security);
/* Secure authentication: */
switch (auth_protocol) {
if (protocol == MODEST_PROTOCOL_STORE_IMAP ||
protocol == MODEST_PROTOCOL_STORE_POP)
auth_mech_name = NULL;
- else if (protocol == MODEST_PROTOCOL_TRANSPORT_SMTP)
- auth_mech_name = MODEST_ACCOUNT_AUTH_ANONYMOUS;
else
auth_mech_name = MODEST_ACCOUNT_AUTH_PLAIN;
break;
break;
}
- if(auth_mech_name)
- tny_account_set_secure_auth_mech (tny_account, auth_mech_name);
+ tny_account_set_secure_auth_mech (tny_account, auth_mech_name);
if (modest_protocol_info_protocol_is_store(protocol) &&
(protocol == MODEST_PROTOCOL_STORE_IMAP) ) {
/* Other connection options, needed for IMAP. */
tny_camel_account_add_option (TNY_CAMEL_ACCOUNT (tny_account),
- MODEST_ACCOUNT_OPTION_USE_LSUB);
+ tny_pair_new (MODEST_ACCOUNT_OPTION_USE_LSUB, ""));
tny_camel_account_add_option (TNY_CAMEL_ACCOUNT (tny_account),
- MODEST_ACCOUNT_OPTION_CHECK_ALL);
+ tny_pair_new (MODEST_ACCOUNT_OPTION_CHECK_ALL, ""));
}
username = modest_server_account_settings_get_username (server_settings);
tny_account_set_pass_func (tny_account,
get_pass_func ? get_pass_func: get_pass_dummy);
}
-
+
+ tny_account_set_connection_policy (tny_account, modest_default_connection_policy_new ());
+
g_object_unref (server_settings);
return tny_account;
static void
set_online_callback (TnyCamelAccount *account, gboolean canceled, GError *err, gpointer user_data)
{
- /* MODEST TODO: Show a real error message here, this is a significant error!
- * Perhaps show the account's settings dialog again?! Reconnecting after
- * changing the settings of an account failed in this situation. */
+ TnyAccountStore *account_store;
- if (err && !canceled)
- g_warning ("err: %s", err->message);
+ account_store = TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account),
+ "account_store"));
+ if (err && !canceled) {
+ /* It seems err is forgotten here ... if the disk is full ! */
+ if (account_store) {
+ tny_account_store_alert (
+ account_store,
+ TNY_ACCOUNT (account), TNY_ALERT_TYPE_ERROR, FALSE,
+ err);
+ }
+ g_warning ("err: %s", err->message);
+ }
}
gboolean
-modest_tny_account_update_from_account (TnyAccount *tny_account)
+modest_tny_account_update_from_account (TnyAccount *tny_account,
+ TnyGetPassFunc get_pass_func,
+ TnyForgetPassFunc forget_pass_func)
{
ModestAccountSettings *settings = NULL;
ModestServerAccountSettings *server_settings = NULL;
- TnyConnectionStatus conn_status;
ModestAccountMgr *account_mgr;
const gchar *account_name;
TnyAccountType type;
const gchar *display_name;
+ TnyConnectionStatus conn_status;
g_return_val_if_fail (tny_account, FALSE);
g_object_unref (server_settings);
g_object_unref (settings);
- /* If the account was online, reconnect to apply the changes */
+ tny_account_set_connection_policy (tny_account, modest_default_connection_policy_new ());
+
+ /* The callback will have an error for you if the reconnect
+ * failed. Please handle it (this is TODO). */
+
conn_status = tny_account_get_connection_status (tny_account);
if (conn_status != TNY_CONNECTION_STATUS_DISCONNECTED) {
TnyAccountStore *account_store = NULL;
-
- /* The callback will have an error for you if the reconnect
- * failed. Please handle it (this is TODO). */
-
+
account_store = TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(tny_account),
- "account_store"));
-
+ "account_store"));
+
if (account_store) {
modest_tny_account_store_forget_already_asked (MODEST_TNY_ACCOUNT_STORE (account_store),
- tny_account);
+ tny_account);
}
-
+
tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(tny_account), TRUE,
- set_online_callback, "online");
+ set_online_callback, "online");
}
-
+
return TRUE;
}
forget_pass_func ? forget_pass_func : forget_pass_dummy);
tny_account_set_pass_func (tny_account,
get_pass_func ? get_pass_func: get_pass_dummy);
-
+
+ tny_account_set_connection_policy (tny_account, modest_default_connection_policy_new ());
+
modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account,
account_name);
g_object_unref (server_settings);
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);
-
+
+ tny_account_set_connection_policy (TNY_ACCOUNT (tny_account), modest_default_connection_policy_new ());
+
modest_tny_account_set_parent_modest_account_name_for_server_account (
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);
-
+
+ tny_account_set_connection_policy (TNY_ACCOUNT (tny_account), modest_default_connection_policy_new ());
+
/* 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_LOCAL_FOLDERS_ACCOUNT_ID);
projects / modest / blobdiff