X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=382f0d1522eb3905bc80c73e5a049ef8ccdd8d11;hp=7ca1808e31bb5fb99c0ae40f8768d510bf74e00e;hb=40a8f5cbe03bd040fe3403dbfa6806df4fb6bc8a;hpb=fd5b6103aab069d4b12e04a5e3205f13a4f91042 diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c index 7ca1808..382f0d1 100644 --- a/src/modest-tny-account.c +++ b/src/modest-tny-account.c @@ -27,12 +27,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include #include #include -#include #include #include #include @@ -74,21 +74,24 @@ modest_tny_account_get_special_folder (TnyAccount *account, 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", - 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); - return NULL; + 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); + return NULL; + } + + g_free (account_id); + } else { + g_warning ("%s: modest_account_name was NULL.", __FUNCTION__); } - - 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(), @@ -126,12 +129,15 @@ modest_tny_account_get_special_folder (TnyAccount *account, while (!tny_iterator_is_done (iter)) { TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (iter)); - if (modest_tny_folder_get_local_folder_type (folder) == special_type) { - special_folder = folder; - break; - } + 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 (G_OBJECT(folder)); + } + tny_iterator_next (iter); } @@ -148,70 +154,29 @@ modest_tny_account_get_special_folder (TnyAccount *account, return special_folder; } -typedef struct -{ - GSourceFunc func; - GMainLoop* loop; -} UtilIdleData; - -static gboolean util_on_idle(gpointer user_data) -{ - /* We are now in the main thread, - * so we can call the function: - */ - UtilIdleData *idle_data = (UtilIdleData*)user_data; - if (idle_data && idle_data->func) - (*(idle_data->func))(NULL); - - /* Stop the main loop so that the caller can continue: */ - if (idle_data->loop) - g_main_loop_quit (idle_data->loop); - - return FALSE; /* Stop calling this callback. */ -} - -static void -util_run_in_main_thread_and_wait(GSourceFunc function) -{ - UtilIdleData *data = g_slice_new0 (UtilIdleData); - data->func = function; - data->loop = g_main_loop_new (NULL, FALSE /* not running */); - - /* Cause the function to be run in an idle-handler, which is always - * in the main thread: - */ - g_idle_add (util_on_idle, data); - - /* This main loop will run until the idle handler has stopped it: */ - g_main_loop_run (data->loop); - g_main_loop_unref (data->loop); - - g_slice_free (UtilIdleData, data); -} - -static gboolean -connect_and_wait(gpointer user_data) -{ - modest_platform_connect_and_wait(NULL); - return TRUE; /* Ignored */ -} - static void on_connection_status_changed (TnyAccount *account, TnyConnectionStatus status, gpointer user_data) { printf ("DEBUG: %s: status=%d\n", __FUNCTION__, status); if (status == TNY_CONNECTION_STATUS_DISCONNECTED) { - /* We are trying to use the network with an account, - * but the accounts are set as offline, because our TnyDevice is offline, + /* 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: + * 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. */ - util_run_in_main_thread_and_wait (&connect_and_wait); + /* 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__); @@ -223,57 +188,23 @@ on_connection_status_changed (TnyAccount *account, TnyConnectionStatus status, g * When libconic reconnects, it will set the device back online again, * regardless of it being forced offline before. */ + /* 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); + */ } } -/* Camel options: */ - -/* These seem to be listed in - * libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c - */ -#define MODEST_ACCOUNT_OPTION_SSL "use_ssl" -#define MODEST_ACCOUNT_OPTION_SSL_NEVER "never" -/* 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 - */ -#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. - * camel_sasl_authtype() seems to list some possible values. - */ - -/* Note that evolution does not offer these for IMAP: */ -#define MODEST_ACCOUNT_AUTH_PLAIN "PLAIN" -#define MODEST_ACCOUNT_AUTH_ANONYMOUS "ANONYMOUS" -/* Caeml's IMAP uses NULL instead for "Password". - * Also, not that Evolution offers "Password" for IMAP, but "Login" for SMTP.*/ -#define MODEST_ACCOUNT_AUTH_PASSWORD "LOGIN" -#define MODEST_ACCOUNT_AUTH_CRAMMD5 "CRAM-MD5" - - - /** - * modest_tny_account_new_from_server_account: + * create_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 @@ -281,12 +212,10 @@ on_connection_status_changed (TnyAccount *account, TnyConnectionStatus status, g * 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) +create_tny_account (ModestAccountMgr *account_mgr, + TnySessionCamel *session, + ModestServerAccountData *account_data) { - 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); @@ -325,7 +254,7 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr, 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); + 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. */ @@ -337,19 +266,80 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr, modest_protocol_info_get_transport_store_protocol_name(account_data->proto); tny_account_set_proto (tny_account, proto_name); + return tny_account; +} + + + +/* Camel options: */ + +/* These seem to be listed in + * libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c + */ +#define MODEST_ACCOUNT_OPTION_SSL "use_ssl" +#define MODEST_ACCOUNT_OPTION_SSL_NEVER "never" +/* 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 + */ +#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. + * camel_sasl_authtype() seems to list some possible values. + */ + +/* Note that evolution does not offer these for IMAP: */ +#define MODEST_ACCOUNT_AUTH_PLAIN "PLAIN" +#define MODEST_ACCOUNT_AUTH_ANONYMOUS "ANONYMOUS" + +/* Caeml's IMAP uses NULL instead for "Password". + * Also, not that Evolution offers "Password" for IMAP, but "Login" for SMTP.*/ +#define MODEST_ACCOUNT_AUTH_PASSWORD "LOGIN" +#define MODEST_ACCOUNT_AUTH_CRAMMD5 "CRAM-MD5" + + +/** + * update_tny_account: + * @account_mgr: a valid account mgr 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 gboolean +update_tny_account (TnyAccount *tny_account, ModestAccountMgr *account_mgr, + ModestServerAccountData *account_data) +{ + gchar *url = NULL; + + g_return_val_if_fail (account_mgr, FALSE); + g_return_val_if_fail (account_data, FALSE); + g_return_val_if_fail (tny_account, FALSE); + + tny_account_set_id (tny_account, account_data->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. * We do that in modest_tny_account_new_for_local_folders() instead. */ - if (account_data->uri) { + 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); */ - } else { /* 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) { case MODEST_PROTOCOL_CONNECTION_NORMAL: @@ -376,7 +366,7 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr, 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) { case MODEST_PROTOCOL_AUTH_NONE: @@ -440,33 +430,114 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr, /* 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_debug ("%s:\n account-url: %s\n", __FUNCTION__, url); g_free (url); - /***********************/ - - return tny_account; + 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) { - ModestServerAccountData *account_data = - modest_account_mgr_get_server_account_data (account_mgr, - server_account_name); + ModestServerAccountData *account_data; + TnyAccount *tny_account; + + g_return_val_if_fail (session, NULL); + g_return_val_if_fail (server_account_name, NULL); + + account_data = modest_account_mgr_get_server_account_data (account_mgr, + server_account_name); if (!account_data) return NULL; - TnyAccount *result = modest_tny_account_new_from_server_account ( - account_mgr, session, account_data); - + tny_account = create_tny_account (account_mgr, session, account_data); + if (!tny_account) + g_warning ("%s: failed to create tny_account", __FUNCTION__); + else if (!update_tny_account (tny_account, account_mgr, account_data)) + g_warning ("%s: failed to initialize tny_account", __FUNCTION__); + modest_account_mgr_free_server_account_data (account_mgr, account_data); - return result; + return tny_account; +} + + +#if 0 +gboolean +modest_tny_account_update_from_server_account_name (TnyAccount *tny_account, + ModestAccountMgr *account_mgr, + const gchar *server_account_name) +{ + ModestServerAccountData *account_data; + gboolean valid_account_type; + + g_return_val_if_fail (tny_account, FALSE); + g_return_val_if_fail (server_account_name, FALSE); + + account_data = modest_account_mgr_get_server_account_data (account_mgr, + server_account_name); + if (!account_data) { + g_warning ("%s: failed to get server account data for %s", + __FUNCTION__, server_account_name); + return FALSE; + } + + valid_account_type = FALSE; + + /* you cannot change the protocol type of an existing account; + * so double check we don't even try + */ + switch (account_data->proto) { + case MODEST_PROTOCOL_TRANSPORT_SENDMAIL: + case MODEST_PROTOCOL_TRANSPORT_SMTP: + if (!TNY_IS_CAMEL_TRANSPORT_ACCOUNT(tny_account)) + g_warning ("%s: expecting transport account", __FUNCTION__); + else + valid_account_type = TRUE; + break; + case MODEST_PROTOCOL_STORE_POP: + if (!TNY_IS_CAMEL_POP_STORE_ACCOUNT(tny_account)) + g_warning ("%s: expecting pop account", __FUNCTION__); + else + valid_account_type = TRUE; + break; + case MODEST_PROTOCOL_STORE_IMAP: + if (!TNY_IS_CAMEL_IMAP_STORE_ACCOUNT(tny_account)) + g_warning ("%s: expecting imap account", __FUNCTION__); + else + valid_account_type = TRUE; + break; + case MODEST_PROTOCOL_STORE_MAILDIR: + case MODEST_PROTOCOL_STORE_MBOX: + if (!TNY_IS_CAMEL_STORE_ACCOUNT(tny_account)) + g_warning ("%s: expecting store account", __FUNCTION__); + else + valid_account_type = TRUE; + break; + default: + g_warning ("invalid account type"); + } + + if (!valid_account_type) { + g_warning ("%s: protocol type cannot be changed", __FUNCTION__); + modest_account_mgr_free_server_account_data (account_mgr, account_data); + return FALSE; + } + + if (!update_tny_account (tny_account, account_mgr, account_data)) { + g_warning ("%s: failed to update account", __FUNCTION__); + modest_account_mgr_free_server_account_data (account_mgr, account_data); + return FALSE; + } + + modest_account_mgr_free_server_account_data (account_mgr, account_data); + return TRUE; } +#endif + + /* we need these dummy functions, or tinymail will complain */ @@ -481,8 +552,58 @@ forget_pass_dummy (TnyAccount *account) /* intentionally left blank */ } + + +gboolean +modest_tny_account_update_from_account (TnyAccount *tny_account, ModestAccountMgr *account_mgr, + const gchar *account_name, TnyAccountType type) +{ + ModestAccountData *account_data = NULL; + ModestServerAccountData *server_data = NULL; + + g_return_val_if_fail (tny_account, FALSE); + g_return_val_if_fail (account_mgr, FALSE); + g_return_val_if_fail (account_name, FALSE); + g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE || type == TNY_ACCOUNT_TYPE_TRANSPORT, + FALSE); + + 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); + return FALSE; + } + + 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) { + 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); + return FALSE; + } + + update_tny_account (tny_account, account_mgr, server_data); + + /* 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); + + modest_account_mgr_free_account_data (account_mgr, account_data); + + 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, @@ -495,10 +616,13 @@ modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar 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); + g_printerr ("modest: %s: cannot get account data for account %s\n", + __FUNCTION__, account_name); return NULL; } @@ -514,46 +638,30 @@ modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar return NULL; } - tny_account = modest_tny_account_new_from_server_account (account_mgr, session, server_data); + tny_account = create_tny_account (account_mgr,session, server_data); 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); return NULL; - } - + } else + update_tny_account (tny_account, account_mgr, server_data); + + /* 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); + 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); - - /* 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); - - modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account, account_name); - + 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); - } -*/ - return tny_account; } @@ -815,9 +923,12 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac typedef gint (*TnyStatsFunc) (TnyFolderStats *stats); +#define TASK_GET_ALL_COUNT 0 +#define TASK_GET_LOCAL_SIZE 1 +#define TASK_GET_FOLDER_COUNT 2 typedef struct _RecurseFoldersHelper { - TnyStatsFunc function; + gint task; guint sum; guint folders; } RecurseFoldersHelper; @@ -836,23 +947,22 @@ recurse_folders (TnyFolderStore *store, helper->folders += tny_list_get_length (folders); while (!tny_iterator_is_done (iter)) { - TnyFolderStats *stats; TnyFolder *folder; folder = TNY_FOLDER (tny_iterator_get_current (iter)); - stats = tny_folder_get_stats (folder); + if (folder) { + if (helper->task == TASK_GET_ALL_COUNT) + helper->sum += tny_folder_get_all_count (folder); - if (stats) { - /* initially, we sometimes get -1 from tinymail; ignore that */ - if (helper->function && helper->function (stats) > 0) - helper->sum += helper->function (stats); + if (helper->task == TASK_GET_LOCAL_SIZE) + helper->sum += tny_folder_get_local_size (folder); - if (TNY_IS_FOLDER_STORE (folder)) { + if (TNY_IS_FOLDER_STORE (folder)) recurse_folders (TNY_FOLDER_STORE (folder), query, helper); - } - g_object_unref (stats); - } - g_object_unref (folder); + + g_object_unref (folder); + } + tny_iterator_next (iter); } g_object_unref (G_OBJECT (iter)); @@ -869,7 +979,7 @@ modest_tny_folder_store_get_folder_count (TnyFolderStore *self) /* Create helper */ helper = g_malloc0 (sizeof (RecurseFoldersHelper)); - helper->function = NULL; + helper->task = TASK_GET_FOLDER_COUNT; helper->sum = 0; helper->folders = 0; @@ -892,7 +1002,7 @@ modest_tny_folder_store_get_message_count (TnyFolderStore *self) /* Create helper */ helper = g_malloc0 (sizeof (RecurseFoldersHelper)); - helper->function = (TnyStatsFunc) tny_folder_stats_get_all_count; + helper->task = TASK_GET_ALL_COUNT; helper->sum = 0; recurse_folders (self, NULL, helper); @@ -914,7 +1024,7 @@ modest_tny_folder_store_get_local_size (TnyFolderStore *self) /* Create helper */ helper = g_malloc0 (sizeof (RecurseFoldersHelper)); - helper->function = (TnyStatsFunc) tny_folder_stats_get_local_size; + helper->task = TASK_GET_LOCAL_SIZE; helper->sum = 0; recurse_folders (self, NULL, helper); @@ -926,17 +1036,43 @@ modest_tny_folder_store_get_local_size (TnyFolderStore *self) 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); +}