X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=d1695dee02f8f76212f7061ca08308b09663f0db;hp=d1ac3302d55602c52df52f9c69d7d1ca8debe516;hb=9788e88c893334e44459874dcc8cac598b334ee3;hpb=65a1453815d9335d1e3af8911f2cdb7ae9ae0d03 diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c index d1ac330..d1695de 100644 --- a/src/modest-tny-account.c +++ b/src/modest-tny-account.c @@ -36,12 +36,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #ifdef MODEST_HAVE_HILDON0_WIDGETS #include @@ -49,21 +51,24 @@ #include #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, @@ -72,126 +77,142 @@ modest_tny_account_get_special_folder (TnyAccount *account, /* Per-account outbox folders are each in their own on-disk directory: */ 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 ( + 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) { + g_warning ("%s: could not get modest account name", __FUNCTION__); + return NULL; + } + + 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_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)); - if (modest_tny_folder_get_local_folder_type (folder) == special_type) { - special_folder = folder; - break; + 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 (folder); } - - g_object_unref (G_OBJECT(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: + * @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 + * + * 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 (ModestAccountMgr *account_mgr, + TnySessionCamel *session, + ModestServerAccountData *account_data) { - 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; + const gchar* proto_name; + + g_return_val_if_fail (account_mgr, NULL); + g_return_val_if_fail (session, NULL); + g_return_val_if_fail (account_data, NULL); + g_return_val_if_fail (account_data->proto != MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN, + NULL); + + switch (account_data->proto) { + 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__, 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); + + /* Proto */ + proto_name = 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 @@ -214,7 +235,6 @@ on_connection_status_changed (TnyAccount *account, TnyConnectionStatus status, g #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. @@ -230,91 +250,40 @@ on_connection_status_changed (TnyAccount *account, TnyConnectionStatus status, g #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, ModestAccountMgr *account_mgr, + 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); - - /* 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; + g_return_val_if_fail (account_mgr, FALSE); + g_return_val_if_fail (account_data, FALSE); + g_return_val_if_fail (account_data->account_name, FALSE); + g_return_val_if_fail (tny_account, FALSE); - 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) { + 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: */ - + /* Set camel-specific options: */ /* Enable secure connection settings: */ - /* printf("DEBUG: %s: security=%d\n", __FUNCTION__, account_data->security); */ const gchar* option_security = NULL; + const gchar* auth_mech_name = NULL; + + switch (account_data->security) { case MODEST_PROTOCOL_CONNECTION_NORMAL: option_security = MODEST_ACCOUNT_OPTION_SSL "=" MODEST_ACCOUNT_OPTION_SSL_NEVER; @@ -340,8 +309,6 @@ 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: /* IMAP and POP need at least a password, @@ -374,7 +341,7 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr, default: g_warning ("%s: Unhandled secure authentication setting %d for " - "account=%s (%s)", __FUNCTION__, account_data->secure_auth, + "account_name=%s (%s)", __FUNCTION__, account_data->secure_auth, account_data->account_name, account_data->hostname); break; } @@ -401,38 +368,63 @@ modest_tny_account_new_from_server_account (ModestAccountMgr *account_mgr, tny_account_set_port (tny_account, account_data->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); + 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 = TNY_ACCOUNT (tny_camel_transport_account_new ()); + if (tny_account) { + const gchar* proto_name = NULL; + tny_account_set_id (tny_account, account_data->account_name); + tny_camel_account_set_session (TNY_CAMEL_ACCOUNT (tny_account), session); + proto_name = modest_protocol_info_get_transport_store_protocol_name(account_data->proto); + tny_account_set_proto (tny_account, proto_name); + modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account, server_account_name); + } + + 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__); + 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); + } + modest_account_mgr_free_server_account_data (account_mgr, account_data); - return result; + return tny_account; } + + /* we need these dummy functions, or tinymail will complain */ static gchar* get_pass_dummy (TnyAccount *account, const gchar *prompt, gboolean *cancel) @@ -445,8 +437,90 @@ forget_pass_dummy (TnyAccount *account) /* intentionally left blank */ } + +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. */ + + if (err && !canceled) + g_warning ("err: %s", err->message); +} + +gboolean +modest_tny_account_update_from_account (TnyAccount *tny_account) +{ + ModestAccountData *account_data = NULL; + ModestServerAccountData *server_data = NULL; + TnyConnectionStatus conn_status; + ModestAccountMgr *account_mgr; + const gchar *account_name; + TnyAccountType type; + + 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); + 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); + + /* If the account was online, reconnect to apply the changes */ + 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")); + + 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, @@ -459,10 +533,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; } @@ -478,15 +555,15 @@ 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. */ @@ -498,27 +575,10 @@ modest_tny_account_new_from_account (ModestAccountMgr *account_mgr, const gchar 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_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; } @@ -535,9 +595,9 @@ typedef struct /* 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; @@ -556,7 +616,10 @@ on_modest_file_system_info(HildonFileSystemInfoHandle *handle, } /* 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) @@ -807,17 +870,19 @@ recurse_folders (TnyFolderStore *store, TnyFolder *folder; folder = TNY_FOLDER (tny_iterator_get_current (iter)); + if (folder) { + if (helper->task == TASK_GET_ALL_COUNT) + helper->sum += tny_folder_get_all_count (folder); - if (helper->task == TASK_GET_ALL_COUNT) - helper->sum += tny_folder_get_all_count (folder); + if (helper->task == TASK_GET_LOCAL_SIZE) + helper->sum += tny_folder_get_local_size (folder); - if (helper->task == TASK_GET_LOCAL_SIZE) - helper->sum += tny_folder_get_local_size (folder); + if (TNY_IS_FOLDER_STORE (folder)) + recurse_folders (TNY_FOLDER_STORE (folder), query, helper); - if (TNY_IS_FOLDER_STORE (folder)) - recurse_folders (TNY_FOLDER_STORE (folder), query, helper); + g_object_unref (folder); + } - g_object_unref (folder); tny_iterator_next (iter); } g_object_unref (G_OBJECT (iter)); @@ -835,7 +900,6 @@ modest_tny_folder_store_get_folder_count (TnyFolderStore *self) /* Create helper */ helper = g_malloc0 (sizeof (RecurseFoldersHelper)); helper->task = TASK_GET_FOLDER_COUNT; - helper->sum = 0; helper->folders = 0; recurse_folders (self, NULL, helper); @@ -858,7 +922,8 @@ modest_tny_folder_store_get_message_count (TnyFolderStore *self) /* 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); @@ -880,7 +945,8 @@ modest_tny_folder_store_get_local_size (TnyFolderStore *self) /* 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); @@ -891,17 +957,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); +}