#include <tny-simple-list.h>
#include <modest-tny-folder.h>
#include <modest-tny-outbox-account.h>
+#include <modest-transport-account-decorator.h>
#include <modest-account-mgr-helpers.h>
#include <modest-init.h>
#include <tny-camel-transport-account.h>
#include <tny-camel-imap-store-account.h>
#include <tny-camel-pop-store-account.h>
#include <tny-folder-stats.h>
+#include <modest-debug.h>
#include <string.h>
+#ifdef MODEST_PLATFORM_MAEMO
#ifdef MODEST_HAVE_HILDON0_WIDGETS
#include <hildon-widgets/hildon-file-system-info.h>
#else
#include <hildon/hildon-file-system-info.h>
#endif
+#endif
+
+/* we need these dummy functions, or tinymail will complain */
+static gchar * get_pass_dummy (TnyAccount *account, const gchar *prompt, gboolean *cancel);
+static void forget_pass_dummy (TnyAccount *account);
TnyFolder *
modest_tny_account_get_special_folder (TnyAccount *account,
TnyFolderType special_type)
{
- TnyList *folders;
- TnyIterator *iter;
+ TnyList *folders = NULL;
+ TnyIterator *iter = NULL;
TnyFolder *special_folder = NULL;
-
+ TnyAccount *local_account = NULL;
+ GError *error = NULL;
g_return_val_if_fail (account, NULL);
g_return_val_if_fail (0 <= special_type && special_type < TNY_FOLDER_TYPE_NUM,
NULL);
- TnyAccount *local_account = NULL;
-
/* The accounts have already been instantiated by
* modest_tny_account_store_get_accounts(), which is the
* TnyAccountStore::get_accounts_func() implementation,
*/
/* Per-account outbox folders are each in their own on-disk directory: */
- if (special_type == TNY_FOLDER_TYPE_OUTBOX) {
- const gchar *modest_account_name =
+ if ((special_type == TNY_FOLDER_TYPE_OUTBOX) &&
+ (!modest_tny_account_is_virtual_local_folders (account))) {
+
+ gchar *account_id;
+ const gchar *modest_account_name;
+
+ modest_account_name =
modest_tny_account_get_parent_modest_account_name_for_server_account (account);
-
- 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);
+ if (!modest_account_name) {
+ g_warning ("%s: could not get modest account name", __FUNCTION__);
return NULL;
- }
-
- g_free (account_id);
- } else {
- g_warning ("%s: modest_account_name was NULL.", __FUNCTION__);
}
- } else {
+
+ 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);
+ 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(),
MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
MODEST_LOCAL_FOLDERS_ACCOUNT_ID);
- }
-
if (!local_account) {
g_printerr ("modest: cannot get local account\n");
- return NULL;
+ goto cleanup;
}
folders = TNY_LIST (tny_simple_list_new ());
-
+
/* There is no need to do this _async, as these are local folders. */
/* TODO: However, this seems to fail sometimes when the network is busy,
* returning an empty list. murrayc. */
- GError *error = NULL;
- tny_folder_store_get_folders (TNY_FOLDER_STORE (local_account),
- folders, NULL, &error);
+ tny_folder_store_get_folders (TNY_FOLDER_STORE (local_account), folders, NULL, &error);
if (error) {
- g_warning ("%s: tny_folder_store_get_folders() failed:\n error=%s\n",
- __FUNCTION__, error->message);
+ g_warning ("%s: tny_folder_store_get_folders() failed:%s\n", __FUNCTION__, error->message);
+ g_error_free (error);
+ goto cleanup;
}
if (tny_list_get_length (folders) == 0) {
gchar* url_string = tny_account_get_url_string (local_account);
- g_printerr ("modest: %s: tny_folder_store_get_folders() returned an empty list for account with URL '%s'\n",
- __FUNCTION__, url_string);
+ g_printerr ("modest: %s: tny_folder_store_get_folders(%s) returned an empty list\n",
+ __FUNCTION__, url_string);
g_free (url_string);
+ goto cleanup;
}
iter = tny_list_create_iterator (folders);
while (!tny_iterator_is_done (iter)) {
- TnyFolder *folder =
- TNY_FOLDER (tny_iterator_get_current (iter));
+ TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (iter));
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 (folder);
}
-
tny_iterator_next (iter);
}
- g_object_unref (G_OBJECT (folders));
- g_object_unref (G_OBJECT (iter));
- g_object_unref (G_OBJECT (local_account));
-
- /*
- if (!special_folder) {
- g_warning ("%s: Returning NULL.", __FUNCTION__);
- }
- */
+cleanup:
+ if (folders)
+ g_object_unref (folders);
+ if (iter)
+ g_object_unref (iter);
+ if (local_account)
+ g_object_unref (local_account);
return special_folder;
}
-static void
-on_connection_status_changed (TnyAccount *account, TnyConnectionStatus status, gpointer user_data)
+/**
+ * create_tny_account:
+ * @session: A valid TnySessionCamel instance.
+ * @account_data: the server account for which to create a corresponding tny account
+ *
+ * get a tnyaccount corresponding to the server_accounts (store or transport) for this account.
+ * NOTE: this function does not set the camel session or the get/forget password functions
+ *
+ * Returns: a new TnyAccount or NULL in case of error.
+ */
+static TnyAccount*
+create_tny_account (TnySessionCamel *session,
+ ModestServerAccountSettings *server_settings)
{
- printf ("DEBUG: %s: status=%d\n", __FUNCTION__, status);
-
- if (status == TNY_CONNECTION_STATUS_DISCONNECTED) {
- /* A tinymail network operation failed, and tinymail then noticed that
- * the account is offline, because our TnyDevice is offline,
- * because libconic says we are offline.
- * So ask the user to go online again.
- *
- * Note that this signal will not be emitted if the account was offline
- * when the network operation was first attempted. For those cases,
- * the application must do its own explicit checks.
- *
- * We make sure that this UI is shown in the main thread, to avoid races,
- * because tinymail does not guarantee that this signal handler will be called
- * in the main thread.
- */
- /* TODO: Commented out, because this causes hangs, probably related to
- * our use of mainloops:
- * modest_platform_connect_and_wait (NULL);
- */
- } else if (status == TNY_CONNECTION_STATUS_CONNECTED_BROKEN) {
- printf ("DEBUG: %s: Connection broken. Forcing TnyDevice offline.\n",
- __FUNCTION__);
-
- /* Something went wrong during some network operation.
- * Stop trying to use the network now,
- * by forcing accounts into offline mode:
- *
- * When libconic reconnects, it will set the device back online again,
- * regardless of it being forced offline before.
+ TnyAccount *tny_account = NULL;
+ ModestTransportStoreProtocol protocol;
+ const gchar* proto_name;
+
+ g_return_val_if_fail (session, NULL);
+ g_return_val_if_fail (server_settings, NULL);
+ protocol = modest_server_account_settings_get_protocol (server_settings);
+ g_return_val_if_fail (protocol != MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN, NULL);
+
+ switch (protocol) {
+ case MODEST_PROTOCOL_TRANSPORT_SENDMAIL:
+ case MODEST_PROTOCOL_TRANSPORT_SMTP:
+ tny_account = TNY_ACCOUNT (modest_transport_account_decorator_new ()); break;
+ case MODEST_PROTOCOL_STORE_POP:
+ tny_account = TNY_ACCOUNT(tny_camel_pop_store_account_new ()); break;
+ case MODEST_PROTOCOL_STORE_IMAP:
+ tny_account = TNY_ACCOUNT(tny_camel_imap_store_account_new ()); break;
+ case MODEST_PROTOCOL_STORE_MAILDIR:
+ case MODEST_PROTOCOL_STORE_MBOX:
+ /* Note that this is not where we create the special local folders account.
+ * That happens in modest_tny_account_new_for_local_folders() instead.
*/
- /* TODO: Find out when this is falsely being emitted. */
- printf (" DEBUG: %s: Not forcing offline because tinymail is sometimes reporting false connection breaks.\n",
- __FUNCTION__);
- /*
- TnyDevice *device = modest_runtime_get_device ();
- tny_device_force_offline (device);
- */
+ tny_account = TNY_ACCOUNT(tny_camel_store_account_new()); break;
+ default:
+ g_return_val_if_reached (NULL);
}
+
+ if (!tny_account) {
+ g_printerr ("modest: %s: could not create tny account for '%s'\n",
+ __FUNCTION__, modest_server_account_settings_get_account_name (server_settings));
+ return NULL;
+ }
+ tny_account_set_id (tny_account, modest_server_account_settings_get_account_name (server_settings));
+
+ /* This must be set quite early, or other set() functions will fail. */
+ tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (tny_account), session);
+
+ /* Proto */
+ proto_name = modest_protocol_info_get_transport_store_protocol_name(protocol);
+ tny_account_set_proto (tny_account, proto_name);
+
+ return tny_account;
}
+
+
/* Camel options: */
/* These seem to be listed in
#define MODEST_ACCOUNT_OPTION_USE_LSUB "use_lsub" /* Show only subscribed folders */
#define MODEST_ACCOUNT_OPTION_CHECK_ALL "check_all" /* Check for new messages in all folders */
-
/* Posssible values for tny_account_set_secure_auth_mech().
* These might be camel-specific.
* Really, tinymail should use an enum.
#define MODEST_ACCOUNT_AUTH_PASSWORD "LOGIN"
#define MODEST_ACCOUNT_AUTH_CRAMMD5 "CRAM-MD5"
-
/**
- * modest_tny_account_new_from_server_account:
+ * update_tny_account:
* @account_mgr: a valid account mgr instance
- * @session: A valid TnySessionCamel instance.
* @account_data: the server account for which to create a corresponding tny account
- * @type: the type of account to create (TNY_ACCOUNT_TYPE_STORE or TNY_ACCOUNT_TYPE_TRANSPORT)
*
* get a tnyaccount corresponding to the server_accounts (store or transport) for this account.
* NOTE: this function does not set the camel session or the get/forget password functions
*
* Returns: a new TnyAccount or NULL in case of error.
*/
-static TnyAccount*
-modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr,
- TnySessionCamel *session,
- ModestServerAccountData *account_data)
+static gboolean
+update_tny_account (TnyAccount *tny_account,
+ ModestServerAccountSettings *server_settings)
{
- gchar *url = NULL;
-
- g_return_val_if_fail (account_mgr, NULL);
- g_return_val_if_fail (session, NULL);
- g_return_val_if_fail (account_data, NULL);
-
- /* sanity checks */
- if (account_data->proto == MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN) {
- g_printerr ("modest: '%s' does not provide a protocol\n",
- account_data->account_name);
- return NULL;
- }
-
- TnyAccount *tny_account = NULL;
+ const gchar *account_name;
+ const gchar *uri;
+ g_return_val_if_fail (server_settings, FALSE);
+ account_name = modest_server_account_settings_get_account_name (server_settings);
+ g_return_val_if_fail (account_name, FALSE);
+ g_return_val_if_fail (tny_account, FALSE);
+
+ tny_account_set_id (tny_account, account_name);
- switch (account_data->proto) {
- case MODEST_PROTOCOL_TRANSPORT_SENDMAIL:
- case MODEST_PROTOCOL_TRANSPORT_SMTP:
- tny_account = TNY_ACCOUNT(tny_camel_transport_account_new ()); break;
- case MODEST_PROTOCOL_STORE_POP:
- tny_account = TNY_ACCOUNT(tny_camel_pop_store_account_new ()); break;
- case MODEST_PROTOCOL_STORE_IMAP:
- tny_account = TNY_ACCOUNT(tny_camel_imap_store_account_new ()); break;
- case MODEST_PROTOCOL_STORE_MAILDIR:
- case MODEST_PROTOCOL_STORE_MBOX:
- /* Note that this is not where we create the special local folders account.
- * That happens in modest_tny_account_new_for_local_folders() instead.
- */
- tny_account = TNY_ACCOUNT(tny_camel_store_account_new()); break;
- default:
- g_return_val_if_reached (NULL);
- }
- if (!tny_account) {
- g_printerr ("modest: could not create tny account for '%s'\n",
- account_data->account_name);
- return NULL;
- }
- tny_account_set_id (tny_account, account_data->account_name);
-
- /* This must be set quite early, or other set() functions will fail. */
- tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (tny_account), session);
-
- /* Handle connection requests:
- * This (badly-named) signal will be called when we try to use an offline account. */
- g_signal_connect (G_OBJECT (tny_account), "connection-status-changed",
- G_CALLBACK (on_connection_status_changed), NULL);
-
- /* Proto */
- const gchar* proto_name =
- modest_protocol_info_get_transport_store_protocol_name(account_data->proto);
- tny_account_set_proto (tny_account, proto_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.
* We do that in modest_tny_account_new_for_local_folders() instead. */
- if (account_data->uri) {
- tny_account_set_url_string (TNY_ACCOUNT(tny_account), account_data->uri);
-/* g_message ("DEBUG: %s: local account-url:\n %s", __FUNCTION__, account_data->uri); */
- }
+ uri = modest_server_account_settings_get_uri (server_settings);
+ if (uri)
+ tny_account_set_url_string (TNY_ACCOUNT(tny_account), uri);
else {
- /* Set camel-specific options: */
-
+ /* Set camel-specific options: */
/* Enable secure connection settings: */
- /* printf("DEBUG: %s: security=%d\n", __FUNCTION__, account_data->security); */
const gchar* option_security = NULL;
- switch (account_data->security) {
+ const gchar* auth_mech_name = NULL;
+ ModestTransportStoreProtocol protocol;
+ ModestConnectionProtocol security;
+ ModestAuthProtocol auth_protocol;
+ const gchar *username;
+ const gchar *hostname;
+ guint port;
+
+ 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;
break;
option_security);
/* Secure authentication: */
- /* printf("DEBUG: %s: secure-auth=%d\n", __FUNCTION__, account_data->secure_auth); */
- const gchar* auth_mech_name = NULL;
- switch (account_data->secure_auth) {
+ switch (auth_protocol) {
case MODEST_PROTOCOL_AUTH_NONE:
/* IMAP and POP need at least a password,
* which camel uses if we specify NULL.
* This setting should never happen anyway. */
- if (account_data->proto == MODEST_PROTOCOL_STORE_IMAP ||
- account_data->proto == MODEST_PROTOCOL_STORE_POP)
+ if (protocol == MODEST_PROTOCOL_STORE_IMAP ||
+ protocol == MODEST_PROTOCOL_STORE_POP)
auth_mech_name = NULL;
- else if (account_data->proto == MODEST_PROTOCOL_TRANSPORT_SMTP)
- auth_mech_name = MODEST_ACCOUNT_AUTH_ANONYMOUS;
+ else if (protocol == MODEST_PROTOCOL_TRANSPORT_SMTP)
+ auth_mech_name = NULL;
else
auth_mech_name = MODEST_ACCOUNT_AUTH_PLAIN;
break;
/* Camel use a password for IMAP or POP if we specify NULL,
* For IMAP, at least it will report an error if we use "Password", "Login" or "Plain".
* (POP is know to report an error for Login too. Probably Password and Plain too.) */
- if (account_data->proto == MODEST_PROTOCOL_STORE_IMAP)
+ if (protocol == MODEST_PROTOCOL_STORE_IMAP)
auth_mech_name = NULL;
- else if (account_data->proto == MODEST_PROTOCOL_STORE_POP)
+ else if (protocol == MODEST_PROTOCOL_STORE_POP)
auth_mech_name = NULL;
else
auth_mech_name = MODEST_ACCOUNT_AUTH_PASSWORD;
default:
g_warning ("%s: Unhandled secure authentication setting %d for "
- "account=%s (%s)", __FUNCTION__, account_data->secure_auth,
- account_data->account_name, account_data->hostname);
+ "account_name=%s (%s)", __FUNCTION__, auth_protocol,
+ account_name, modest_server_account_settings_get_hostname (server_settings));
break;
}
if(auth_mech_name)
tny_account_set_secure_auth_mech (tny_account, auth_mech_name);
- if (modest_protocol_info_protocol_is_store(account_data->proto) &&
- (account_data->proto == MODEST_PROTOCOL_STORE_IMAP) ) {
+ 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);
MODEST_ACCOUNT_OPTION_CHECK_ALL);
}
- if (account_data->username)
- tny_account_set_user (tny_account, account_data->username);
- if (account_data->hostname)
- tny_account_set_hostname (tny_account, account_data->hostname);
+ username = modest_server_account_settings_get_username (server_settings);
+ if (username && strlen (username) > 0)
+ tny_account_set_user (tny_account, username);
+ hostname = modest_server_account_settings_get_hostname (server_settings);
+ if (hostname)
+ tny_account_set_hostname (tny_account, hostname);
/* Set the port: */
- if (account_data->port)
- tny_account_set_port (tny_account, account_data->port);
+ port = modest_server_account_settings_get_port (server_settings);
+ if (port)
+ tny_account_set_port (tny_account, port);
}
- /* FIXME: for debugging.
- * Let's keep this because it is very useful for debugging. */
- url = tny_account_get_url_string (TNY_ACCOUNT(tny_account));
-
- printf ("DEBUG %s:\n account-url: %s\n", __FUNCTION__, url);
-
- g_free (url);
- /***********************/
-
- return tny_account;
+ MODEST_DEBUG_BLOCK (
+ gchar *url = tny_account_get_url_string (TNY_ACCOUNT(tny_account));
+ g_debug ("%s:\n account-url: %s\n", __FUNCTION__, url);
+ g_free (url);
+ );
+
+ return TRUE;
}
TnyAccount*
modest_tny_account_new_from_server_account_name (ModestAccountMgr *account_mgr,
- TnySessionCamel *session,
- const gchar *server_account_name)
+ TnySessionCamel *session,
+ const gchar *server_account_name,
+ TnyGetPassFunc get_pass_func,
+ TnyForgetPassFunc forget_pass_func)
{
- ModestServerAccountData *account_data =
- modest_account_mgr_get_server_account_data (account_mgr,
- server_account_name);
- if (!account_data)
+ ModestServerAccountSettings *server_settings;
+ TnyAccount *tny_account;
+
+ g_return_val_if_fail (session, NULL);
+ g_return_val_if_fail (server_account_name, NULL);
+
+
+ server_settings = modest_account_mgr_load_server_settings (account_mgr, server_account_name);
+ if (!server_settings)
return NULL;
- TnyAccount *result = modest_tny_account_new_from_server_account (
- account_mgr, session, account_data);
+ tny_account = TNY_ACCOUNT (tny_camel_transport_account_new ());
+
+ if (tny_account) {
+ const gchar* proto_name = NULL;
+ tny_account_set_id (tny_account, server_account_name);
+ tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (tny_account), session);
+ proto_name = modest_protocol_info_get_transport_store_protocol_name
+ (modest_server_account_settings_get_protocol (server_settings));
+ tny_account_set_proto (tny_account, proto_name);
+ modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account, server_account_name);
+ }
- modest_account_mgr_free_server_account_data (account_mgr, account_data);
+ if (!tny_account)
+ g_warning ("%s: failed to create tny_account", __FUNCTION__);
+ else if (!update_tny_account (tny_account, server_settings))
+ g_warning ("%s: failed to initialize tny_account", __FUNCTION__);
+ else {
+ tny_account_set_forget_pass_func (tny_account,
+ 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);
+ }
- return result;
+ g_object_unref (server_settings);
+
+ return tny_account;
}
+
+
/* we need these dummy functions, or tinymail will complain */
static gchar*
get_pass_dummy (TnyAccount *account, const gchar *prompt, gboolean *cancel)
/* intentionally left blank */
}
+
+static void
+set_online_callback (TnyCamelAccount *account, gboolean canceled, GError *err, gpointer user_data)
+{
+ TnyAccountStore *account_store;
+
+ 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,
+ TnyGetPassFunc get_pass_func,
+ TnyForgetPassFunc forget_pass_func)
+{
+ ModestAccountSettings *settings = NULL;
+ ModestServerAccountSettings *server_settings = NULL;
+ ModestAccountMgr *account_mgr;
+ const gchar *account_name;
+ TnyAccountType type;
+ const gchar *display_name;
+ TnyConnectionStatus conn_status;
+
+ g_return_val_if_fail (tny_account, FALSE);
+
+ account_mgr = modest_runtime_get_account_mgr ();
+ account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (tny_account);
+ type = tny_account_get_account_type (tny_account);
+ settings = modest_account_mgr_load_account_settings (account_mgr, account_name);
+ if (!settings) {
+ g_printerr ("modest: %s: cannot get account data for account %s\n",
+ __FUNCTION__, account_name);
+ return FALSE;
+ }
+
+ display_name = modest_account_settings_get_display_name (settings);
+
+ if (type == TNY_ACCOUNT_TYPE_STORE)
+ server_settings = modest_account_settings_get_store_settings (settings);
+ else if (type == TNY_ACCOUNT_TYPE_TRANSPORT)
+ server_settings = modest_account_settings_get_transport_settings (settings);
+
+ if (modest_server_account_settings_get_account_name (server_settings) == NULL) {
+ g_printerr ("modest: no %s account defined for '%s'\n",
+ type == TNY_ACCOUNT_TYPE_STORE ? "store" : "transport",
+ display_name);
+ g_object_unref (server_settings);
+ g_object_unref (settings);
+ return FALSE;
+ }
+
+ update_tny_account (tny_account, server_settings);
+
+ /* This name is what shows up in the folder view -- so for some POP/IMAP/... server
+ * account, we set its name to the account of which it is part. */
+
+ if (display_name)
+ tny_account_set_name (tny_account, display_name);
+
+ g_object_unref (server_settings);
+ g_object_unref (settings);
+
+ tny_account_set_forget_pass_func (tny_account, NULL);
+ tny_account_set_pass_func (tny_account, NULL);
+ tny_account_set_forget_pass_func (tny_account,
+ 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);
+
+ /* 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;
+
+ account_store = TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(tny_account),
+ "account_store"));
+
+ if (account_store) {
+ modest_tny_account_store_forget_already_asked (MODEST_TNY_ACCOUNT_STORE (account_store),
+ tny_account);
+ }
+
+ tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(tny_account), TRUE,
+ set_online_callback, "online");
+ }
+
+ return TRUE;
+}
+
+
+
TnyAccount*
-modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar *account_name,
+modest_tny_account_new_from_account (ModestAccountMgr *account_mgr,
+ const gchar *account_name,
TnyAccountType type,
TnySessionCamel *session,
TnyGetPassFunc get_pass_func,
TnyForgetPassFunc forget_pass_func)
{
TnyAccount *tny_account = NULL;
- ModestAccountData *account_data = NULL;
- ModestServerAccountData *server_data = NULL;
+ ModestAccountSettings *settings = NULL;
+ ModestServerAccountSettings *server_settings = NULL;
+ const gchar *display_name;
g_return_val_if_fail (account_mgr, NULL);
g_return_val_if_fail (account_name, NULL);
g_return_val_if_fail (session, NULL);
+ g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE || type == TNY_ACCOUNT_TYPE_TRANSPORT,
+ NULL);
- account_data = modest_account_mgr_get_account_data (account_mgr, account_name);
- if (!account_data) {
- g_printerr ("modest: %s: cannot get account data for account %s\n", __FUNCTION__, account_name);
+ settings = modest_account_mgr_load_account_settings (account_mgr, account_name);
+ if (!settings) {
+ g_printerr ("modest: %s: cannot get account data for account %s\n",
+ __FUNCTION__, account_name);
return NULL;
}
+ display_name = modest_account_settings_get_display_name (settings);
- if (type == TNY_ACCOUNT_TYPE_STORE && account_data->store_account)
- server_data = account_data->store_account;
- else if (type == TNY_ACCOUNT_TYPE_TRANSPORT && account_data->transport_account)
- server_data = account_data->transport_account;
- if (!server_data) {
+ if (type == TNY_ACCOUNT_TYPE_STORE)
+ server_settings = modest_account_settings_get_store_settings (settings);
+ else if (type == TNY_ACCOUNT_TYPE_TRANSPORT)
+ server_settings = modest_account_settings_get_transport_settings (settings);
+
+ if (modest_server_account_settings_get_account_name (server_settings) == NULL) {
g_printerr ("modest: no %s account defined for '%s'\n",
type == TNY_ACCOUNT_TYPE_STORE ? "store" : "transport",
- account_data->display_name);
- modest_account_mgr_free_account_data (account_mgr, account_data);
+ display_name);
+ g_object_unref (server_settings);
+ g_object_unref (settings);
return NULL;
}
- tny_account = modest_tny_account_new_from_server_account (account_mgr, session, server_data);
+ tny_account = create_tny_account (session, server_settings);
if (!tny_account) {
g_printerr ("modest: failed to create tny account for %s (%s)\n",
- account_data->account_name, server_data->account_name);
- modest_account_mgr_free_account_data (account_mgr, account_data);
+ account_name,
+ modest_server_account_settings_get_account_name (server_settings));
+ g_object_unref (server_settings);
+ g_object_unref (settings);
return NULL;
- }
-
-
+ } else
+ update_tny_account (tny_account, server_settings);
+
/* This name is what shows up in the folder view -- so for some POP/IMAP/... server
* account, we set its name to the account of which it is part. */
- if (account_data->display_name)
- tny_account_set_name (tny_account, account_data->display_name);
+ if (display_name)
+ tny_account_set_name (tny_account, display_name);
tny_account_set_forget_pass_func (tny_account,
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);
-
- modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account, account_name);
-
- modest_account_mgr_free_account_data (account_mgr, account_data);
-
-/*
- TnyAccountStore *astore = (TnyAccountStore *) modest_runtime_get_account_store ();
- if (astore) {
- TnyDevice *device = tny_account_store_get_device (astore);
- GError *err = NULL;
- g_object_set_data (G_OBJECT(tny_account), "account_store", (gpointer)astore);
- tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (tny_account),
- tny_device_is_online (device), &err);
- if (err) {
- g_print ("%s: tny_camel_account_set_online() failed: %s\n", __FUNCTION__, err->message);
- g_error_free (err);
- }
- g_object_unref (device);
- }
-*/
+ modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account,
+ account_name);
+ g_object_unref (server_settings);
+ g_object_unref (settings);
return tny_account;
}
-
+#ifdef MODEST_PLATFORM_MAEMO
/* Gets the memory card name: */
static void
-on_modest_file_system_info(HildonFileSystemInfoHandle *handle,
- HildonFileSystemInfo *info,
- const GError *error, gpointer data)
+on_modest_file_system_info (HildonFileSystemInfoHandle *handle,
+ HildonFileSystemInfo *info,
+ const GError *error, gpointer data)
{
GetMmcAccountNameData *callback_data = (GetMmcAccountNameData*)data;
}
/* printf ("DEBUG: %s: display name=%s\n", __FUNCTION__, display_name); */
- tny_account_set_name (account, display_name);
+ if (display_name && previous_display_name &&
+ (strcmp (display_name, previous_display_name) != 0)) {
+ tny_account_set_name (account, display_name);
+ }
/* Inform the application that the name is now ready: */
if (callback_data->callback)
g_object_unref (callback_data->account);
g_slice_free (GetMmcAccountNameData, callback_data);
}
+#endif
void modest_tny_account_get_mmc_account_name (TnyStoreAccount* self, ModestTnyAccountGetMmcAccountNameCallback callback, gpointer user_data)
{
+#ifdef MODEST_PLATFORM_MAEMO
/* Just use the hard-coded path for the single memory card,
* rather than try to figure out the path to the specific card by
* looking at the maildir URI:
}
/* g_free (uri); */
+#endif
}
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
/* Create helper */
helper = g_malloc0 (sizeof (RecurseFoldersHelper));
helper->task = TASK_GET_FOLDER_COUNT;
- helper->sum = 0;
helper->folders = 0;
recurse_folders (self, NULL, helper);
/* Create helper */
helper = g_malloc0 (sizeof (RecurseFoldersHelper));
helper->task = TASK_GET_ALL_COUNT;
- helper->sum = 0;
+ if (TNY_IS_FOLDER (self))
+ helper->sum = tny_folder_get_all_count (TNY_FOLDER (self));
recurse_folders (self, NULL, helper);
/* Create helper */
helper = g_malloc0 (sizeof (RecurseFoldersHelper));
helper->task = TASK_GET_LOCAL_SIZE;
- helper->sum = 0;
+ if (TNY_IS_FOLDER (self))
+ helper->sum = tny_folder_get_local_size (TNY_FOLDER (self));
recurse_folders (self, NULL, helper);
return retval;
}
-const gchar* modest_tny_account_get_parent_modest_account_name_for_server_account (TnyAccount *self)
+const gchar*
+modest_tny_account_get_parent_modest_account_name_for_server_account (TnyAccount *self)
{
return (const gchar *)g_object_get_data (G_OBJECT (self), "modest_account");
}
-void modest_tny_account_set_parent_modest_account_name_for_server_account (TnyAccount *self, const gchar* parent_modest_acount_name)
+void
+modest_tny_account_set_parent_modest_account_name_for_server_account (TnyAccount *self,
+ const gchar* parent_modest_account_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_account_name), g_free);
+}
+
+gboolean
+modest_tny_account_is_virtual_local_folders (TnyAccount *self)
+{
+ /* We should make this more sophisticated if we ever use ModestTnyLocalFoldersAccount
+ * for anything else. */
+ return MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (self);
}
+gboolean
+modest_tny_account_is_memory_card_account (TnyAccount *self)
+{
+ const gchar* account_id = NULL;
+
+ g_return_val_if_fail (TNY_ACCOUNT (self), FALSE);
+
+ if (!self)
+ return FALSE;
+
+ account_id = tny_account_get_id (self);
+
+ if (!account_id)
+ return FALSE;
+ else
+ return (strcmp (account_id, MODEST_MMC_ACCOUNT_ID) == 0);
+}
+gboolean
+modest_tny_folder_store_is_remote (TnyFolderStore *folder_store)
+{
+ TnyAccount *account = NULL;
+ gboolean result = TRUE;
+
+ g_return_val_if_fail(TNY_IS_FOLDER_STORE(folder_store), FALSE);
+
+ if (TNY_IS_FOLDER (folder_store)) {
+ /* Get the folder's parent account: */
+ account = tny_folder_get_account(TNY_FOLDER(folder_store));
+ } else if (TNY_IS_ACCOUNT (folder_store)) {
+ account = TNY_ACCOUNT(folder_store);
+ g_object_ref(account);
+ }
+
+ if (account != NULL) {
+ if (tny_account_get_account_type (account) == TNY_ACCOUNT_TYPE_STORE) {
+ if (!TNY_IS_CAMEL_POP_STORE_ACCOUNT (account) &&
+ !TNY_IS_CAMEL_IMAP_STORE_ACCOUNT (account)) {
+ /* This must be a maildir account, which does
+ * not require a connection: */
+ result = FALSE;
+ }
+ }
+ g_object_unref (account);
+ } else {
+ result = FALSE;
+ }
+
+ return result;
+}
projects / modest / blobdiff