X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account.c;h=9b55d10e26fa81d5fc2a01ad9aa30f18b76ea504;hp=c5fb06fd962ef41983e37c0a19035d41f358fa4e;hb=16d7f8b9f45217e350735e33ee6d0255aa894074;hpb=85e6aca5e8c16f61f95e29b62ea295d785c9cbdf diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c index c5fb06f..9b55d10 100644 --- a/src/modest-tny-account.c +++ b/src/modest-tny-account.c @@ -63,7 +63,7 @@ modest_tny_account_get_special_folder (TnyAccount *account, 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, @@ -90,7 +90,7 @@ modest_tny_account_get_special_folder (TnyAccount *account, g_free (account_id); } else { - g_warning ("%s: modest_account_name was NULL.", __FUNCTION); + g_warning ("%s: modest_account_name was NULL.", __FUNCTION__); } } else { /* Other local folders are all in one on-disk directory: */ @@ -129,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; /* Leaving a ref for the special_folder return value. */ - } + 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); } @@ -151,96 +154,11 @@ modest_tny_account_get_special_folder (TnyAccount *account, return special_folder; } -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) { - /* 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. - */ - /* 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 @@ -248,12 +166,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); @@ -292,31 +208,87 @@ 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. */ - 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); + 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: @@ -343,7 +315,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: @@ -407,35 +379,116 @@ 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 */ static gchar* get_pass_dummy (TnyAccount *account, const gchar *prompt, gboolean *cancel) @@ -448,8 +501,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, @@ -462,10 +597,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; } @@ -481,15 +619,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. */ @@ -501,27 +639,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; } @@ -559,7 +680,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) @@ -733,8 +857,6 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac 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 @@ -812,17 +934,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)); @@ -840,7 +964,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); @@ -863,7 +986,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); @@ -885,7 +1009,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); @@ -896,17 +1021,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); +}