X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=5b85b3771e9a1726385ecae2164bc72675b47204;hb=6c4f7f26cf46e833b9d32a69555880900b16a4ef;hp=79717d3a9b4ada1ab214e972a9fe8069418cfa90;hpb=2c8f3fa95ab49b3b2334e28383b5409ab16b4002;p=modest diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 79717d3..5b85b37 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -46,8 +46,12 @@ #include #include #include +#include #include #include +#include +#include + #include "modest-tny-account-store.h" #include "modest-tny-platform-factory.h" @@ -58,11 +62,15 @@ #include #ifdef MODEST_HILDON_VERSION_0 #include +#include #else #include +#include #endif #endif +#include + /* 'private'/'protected' functions */ static void modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass); //static void modest_tny_account_store_init (ModestTnyAccountStore *obj); @@ -73,9 +81,9 @@ static void modest_tny_account_store_instance_init (ModestTnyAccountStore *ob static void modest_tny_account_store_init (gpointer g, gpointer iface_data); -static void -get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type); - +static void get_server_accounts (TnyAccountStore *self, + TnyList *list, + TnyAccountType type); /* list my signals */ enum { @@ -181,6 +189,15 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass) } + +static void +on_vfs_volume_mounted(GnomeVFSVolumeMonitor *volume_monitor, + GnomeVFSVolume *volume, gpointer user_data); + +static void +on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, + GnomeVFSVolume *volume, gpointer user_data); + static void modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) { @@ -198,10 +215,19 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) */ priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + + /* Respond to volume mounts and unmounts, such + * as the insertion/removal of the memory card: */ + GnomeVFSVolumeMonitor* monitor = + gnome_vfs_get_volume_monitor(); + g_signal_connect (G_OBJECT(monitor), "volume-mounted", + G_CALLBACK(on_vfs_volume_mounted), + obj); + g_signal_connect (G_OBJECT(monitor), "volume-unmounted", + G_CALLBACK(on_vfs_volume_unmounted), + obj); } - - static void account_list_free (GSList *accounts) { @@ -218,64 +244,128 @@ account_list_free (GSList *accounts) g_slist_free (accounts); } +static void +recreate_all_accounts (ModestTnyAccountStore *self) +{ + ModestTnyAccountStorePrivate *priv = + MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + if (priv->store_accounts_outboxes) { + account_list_free (priv->store_accounts_outboxes); + priv->store_accounts_outboxes = NULL; + } + + if (priv->store_accounts) { + account_list_free (priv->store_accounts); + priv->store_accounts = NULL; + get_server_accounts (TNY_ACCOUNT_STORE(self), + NULL, TNY_ACCOUNT_TYPE_STORE); + } + + if (priv->transport_accounts) { + account_list_free (priv->transport_accounts); + priv->transport_accounts = NULL; + get_server_accounts (TNY_ACCOUNT_STORE(self), NULL, + TNY_ACCOUNT_TYPE_TRANSPORT); + } +} static void -on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean server_account, - gpointer user_data) +on_vfs_volume_mounted(GnomeVFSVolumeMonitor *volume_monitor, + GnomeVFSVolume *volume, gpointer user_data) { - ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); - ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); + + /* Check whether this was the external MMC1 card: */ + gchar *uri = gnome_vfs_volume_get_activation_uri (volume); + if (uri && (strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI) == 0)) { + printf ("DEBUG: %s: MMC1 card mounted.\n", __FUNCTION__); + + /* TODO: Just add an account and emit (and respond to) + * TnyAccountStore::accountinserted signal? + */ + recreate_all_accounts (self); + + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, + NULL); + } + + g_free (uri); +} - /* FIXME: make this more finegrained; changes do not really affect _all_ - * accounts, and some do not affect tny accounts at all (such as 'last_update') - */ +static void +on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, + GnomeVFSVolume *volume, gpointer user_data) +{ + ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); - account_list_free (priv->store_accounts); - get_server_accounts (TNY_ACCOUNT_STORE(self), NULL, TNY_ACCOUNT_TYPE_STORE); + /* Check whether this was the external MMC1 card: */ + gchar *uri = gnome_vfs_volume_get_activation_uri (volume); + if (uri && (strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI) == 0)) { + printf ("DEBUG: %s: MMC1 card unmounted.\n", __FUNCTION__); + + /* TODO: Just add an account and emit (and respond to) + * TnyAccountStore::accountinserted signal? + */ + recreate_all_accounts (self); + + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, + NULL); + } - account_list_free (priv->transport_accounts); - get_server_accounts (TNY_ACCOUNT_STORE(self), NULL, - TNY_ACCOUNT_TYPE_TRANSPORT); + g_free (uri); +} + +static void +on_account_removed (ModestAccountMgr *acc_mgr, + const gchar *account, + gboolean server_account, + gpointer user_data) +{ + ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); + TnyAccount *store_account; + + /* Clear the account cache */ + store_account = modest_tny_account_store_get_tny_account_by (self, + MODEST_TNY_ACCOUNT_STORE_QUERY_NAME, + account); + if (store_account) { + tny_store_account_delete_cache (TNY_STORE_ACCOUNT (store_account)); - /* TODO: Ref these when we add them? */ - g_slist_free (priv->store_accounts_outboxes); - priv->store_accounts_outboxes = NULL; + g_signal_emit (G_OBJECT (self), + tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNT_REMOVED], + 0, store_account); + + g_object_unref (store_account); + } else + g_printerr ("modest: cannot find server account for %s", account); + /* FIXME: make this more finegrained; changes do not + * really affect _all_ accounts, and some do not + * affect tny accounts at all (such as 'last_update') + */ + recreate_all_accounts (self); + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, account); } - static void on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account, - const gchar *key, gboolean server_account, gpointer user_data) + const GSList *keys, gboolean server_account, gpointer user_data) { ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); - ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); /* Ignore the change if it's a change in the last_updated value */ - if (g_str_has_suffix (key, MODEST_ACCOUNT_LAST_UPDATED)) + if (g_slist_length ((GSList *)keys) == 1 && + g_str_has_suffix ((const gchar *) keys->data, MODEST_ACCOUNT_LAST_UPDATED)) return; /* FIXME: make this more finegrained; changes do not really affect _all_ - * accounts, and some do not affect tny accounts at all (such as 'last_update') + * accounts */ - if (server_account) { - if (priv->store_accounts) { - account_list_free (priv->store_accounts); - priv->store_accounts = NULL; - get_server_accounts (TNY_ACCOUNT_STORE(self), - NULL, TNY_ACCOUNT_TYPE_STORE); - } - - if (priv->transport_accounts) { - account_list_free (priv->transport_accounts); - priv->transport_accounts = NULL; - get_server_accounts (TNY_ACCOUNT_STORE(self), NULL, - TNY_ACCOUNT_TYPE_TRANSPORT); - } - } + recreate_all_accounts (self); g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, account); @@ -331,6 +421,10 @@ get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) } /* if it was already asked, it must have been wrong, so ask again */ + /* TODO: However, when we supply a wrong password to tinymail, + * it seems to (at least sometimes) call our alert_func() instead of + * asking for the password again. + */ if (already_asked || !pwd || strlen(pwd) == 0) { /* we don't have it yet. Get the password from the user */ const gchar* account_id = tny_account_get_id (account); @@ -493,7 +587,11 @@ get_cached_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) cursor = accounts; while (cursor) { - tny_list_prepend (list, G_OBJECT(cursor->data)); + if (cursor->data) { + GObject *object = G_OBJECT(cursor->data); + tny_list_prepend (list, object); + } + cursor = cursor->next; } } @@ -555,8 +653,8 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) return; } - GSList *account_names = NULL, *cursor = NULL; - GSList *accounts = NULL; + GSList *account_names = NULL, *cursor = NULL; + GSList *accounts = NULL; /* These are account names, not server_account names */ account_names = modest_account_mgr_account_names (priv->account_mgr,FALSE); @@ -588,13 +686,39 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) } } - if (type == TNY_ACCOUNT_TYPE_STORE) { - /* Also add the local folder pseudo-account: */ - TnyAccount *tny_account = - modest_tny_account_new_for_local_folders (priv->account_mgr, priv->session); - if (list) - tny_list_prepend (list, G_OBJECT(tny_account)); - accounts = g_slist_append (accounts, tny_account); /* cache it */ + if (type == TNY_ACCOUNT_TYPE_STORE) { + /* Also add the Memory card account if it is mounted: */ + gboolean mmc_is_mounted = FALSE; + GnomeVFSVolumeMonitor* monitor = + gnome_vfs_get_volume_monitor(); + GList* list_volumes = gnome_vfs_volume_monitor_get_mounted_volumes (monitor); + GList *iter = list_volumes; + while (iter) { + GnomeVFSVolume *volume = (GnomeVFSVolume*)iter->data; + if (volume) { + if (!mmc_is_mounted) { + gchar *uri = gnome_vfs_volume_get_activation_uri (volume); + if (uri && (strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI) == 0)) { + mmc_is_mounted = TRUE; + } + g_free (uri); + } + + gnome_vfs_volume_unref(volume); + } + + iter = g_list_next (iter); + } + g_list_free (list_volumes); + + if (mmc_is_mounted) { + TnyAccount *tny_account = + modest_tny_account_new_for_local_folders (priv->account_mgr, + priv->session, MODEST_MCC1_VOLUMEPATH); + if (list) + tny_list_prepend (list, G_OBJECT(tny_account)); + accounts = g_slist_append (accounts, tny_account); /* cache it */ + } } /* And add the connection-specific transport accounts, if any. @@ -669,6 +793,11 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) create_per_account_local_outbox_folders (self); } + /* Also add the local folder pseudo-account: */ + TnyAccount *tny_account = + modest_tny_account_new_for_local_folders (priv->account_mgr, + priv->session, NULL); + /* Add them to the TnyList: */ if (priv->store_accounts_outboxes) { GSList *iter = NULL; @@ -677,9 +806,24 @@ get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) if (list && outbox_account) tny_list_prepend (list, G_OBJECT(outbox_account)); + g_object_ref (outbox_account); accounts = g_slist_append (accounts, outbox_account); } } + + /* Add a merged folder, merging all the per-account outbox folders: */ + modest_tny_local_folders_account_add_merged_outbox_folders ( + MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (tny_account), priv->store_accounts_outboxes); + + if (priv->store_accounts_outboxes) { + /* We have finished with this temporary list, so free it: */ + account_list_free (priv->store_accounts_outboxes); + priv->store_accounts_outboxes = NULL; + } + + if (list) + tny_list_prepend (list, G_OBJECT(tny_account)); + accounts = g_slist_append (accounts, tny_account); /* cache it */ } if (type == TNY_ACCOUNT_TYPE_STORE) { @@ -762,35 +906,9 @@ modest_tny_account_store_get_device (TnyAccountStore *self) static TnyAccount* modest_tny_account_store_find_account_by_url (TnyAccountStore *self, const gchar* url_string) { - TnyAccount *account = NULL; - ModestTnyAccountStorePrivate *priv; - GSList *cursor; - - g_return_val_if_fail (self, NULL); - g_return_val_if_fail (url_string, NULL); - - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) { - if (tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), url_string)) { - account = TNY_ACCOUNT(cursor->data); - break; - } - } - - if (!account) { - for (cursor = priv->transport_accounts; !account && cursor ; cursor = cursor->next) { - if (tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), url_string)) { - account = TNY_ACCOUNT(cursor->data); - break; - } - } - } - - if (account) - g_object_ref (G_OBJECT(account)); - - return account; + return modest_tny_account_store_get_tny_account_by (MODEST_TNY_ACCOUNT_STORE (self), + MODEST_TNY_ACCOUNT_STORE_QUERY_URL, + url_string); } @@ -799,6 +917,8 @@ static gboolean modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, gboolean question, const GError *error) { + /* TODO: It would be nice to know what account caused this error. */ + g_return_val_if_fail (error, FALSE); if ((error->domain != TNY_ACCOUNT_ERROR) @@ -818,17 +938,60 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, /* The tinymail camel implementation just sends us this for almost * everything, so we have to guess at the cause. * It could be a wrong password, or inability to resolve a hostname, - * or lack of network, or something entirely different: */ + * or lack of network, or incorrect authentication method, or something entirely different: */ + /* TODO: Fix camel to provide specific error codes, and then use the + * specific dialog messages from Chapter 12 of the UI spec. + */ case TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT: - g_debug ("%s: Handling GError domain=%d, code=%d, message=%s", - __FUNCTION__, error->domain, error->code, error->message); +/* g_debug ("%s: Handling GError domain=%d, code=%d, message=%s", */ +/* __FUNCTION__, error->domain, error->code, error->message); */ /* TODO: Remove the internal error message for the real release. * This is just so the testers can give us more information: */ /* prompt = _("Modest account not yet fully configured."); */ - prompt = g_strdup_printf(_("Modest account not yet fully configured. Error=%s"), + prompt = g_strdup_printf( + "%s\n (Internal error message, often very misleading):\n%s", + _("Incorrect Account Settings"), error->message); + + /* TODO: If we can ever determine that the problem is a wrong password: + * In this case, the UI spec wants us to show a banner, and then + * open the Account Settings dialog. */ + /* Note: Sometimes, the get_password() function seems to be called again + * when a password is wrong, but sometimes this alert_func is called. */ + #if 0 + GtkWidget *parent_widget = + GTK_WIDGET ( + modest_window_mgr_get_main_window ( + modest_runtime_get_window_mgr ())); + + hildon_banner_show_information ( + parent_widget, + NULL /* icon name */, + _("mcen_ib_username_pw_incorrect") ); + + /* Show the Account Settings window: */ + ModestAccountSettingsDialog *dialog = modest_account_settings_dialog_new (); + /* TODO: Get the account somehow. Maybe tinymail should send it with the signal. */ + const gchar* modest_account_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (account); + g_assert (modest_account_name); + modest_account_settings_dialog_set_account_name (dialog, + modest_account_name); + + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (self)); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (GTK_WIDGET (dialog)); + #endif + break; + + //TODO: We have started receiving errors of + //domain=TNY_ACCOUNT_ERROR, code=TNY_ACCOUNT_ERROR_TRY_CONNECT, message="Canceled". + //If this is really a result of us cancelling our own operation then + //a) this probably shouldn't be an error, and + //b) should have its own error code. + default: g_warning ("%s: Unhandled GError code: %d, message=%s", __FUNCTION__, error->code, error->message); @@ -929,35 +1092,72 @@ modest_tny_account_store_get_session (TnyAccountStore *self) TnyAccount* -modest_tny_account_store_get_tny_account_by_id (ModestTnyAccountStore *self, const gchar *id) +modest_tny_account_store_get_tny_account_by (ModestTnyAccountStore *self, + ModestTnyAccountStoreQueryType type, + const gchar *str) { TnyAccount *account = NULL; ModestTnyAccountStorePrivate *priv; GSList *cursor; + const gchar *val = NULL; g_return_val_if_fail (self, NULL); - g_return_val_if_fail (id, NULL); + g_return_val_if_fail (str, NULL); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - + /* Search in store accounts */ for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) { - const gchar *acc_id = tny_account_get_id (TNY_ACCOUNT(cursor->data)); - if (acc_id && strcmp (acc_id, id) == 0) { - account = TNY_ACCOUNT(cursor->data); + switch (type) { + case MODEST_TNY_ACCOUNT_STORE_QUERY_ID: + val = tny_account_get_id (TNY_ACCOUNT(cursor->data)); + break; + case MODEST_TNY_ACCOUNT_STORE_QUERY_NAME: + val = modest_tny_account_get_parent_modest_account_name_for_server_account (TNY_ACCOUNT(cursor->data)); break; + case MODEST_TNY_ACCOUNT_STORE_QUERY_URL: + val = tny_account_get_url_string (TNY_ACCOUNT(cursor->data)); + break; + } + + if (type == MODEST_TNY_ACCOUNT_STORE_QUERY_URL && + tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), val)) { + account = TNY_ACCOUNT (cursor->data); + goto end; + } else { + if (strcmp (val, str) == 0) { + account = TNY_ACCOUNT(cursor->data); + goto end; + } } } /* if we already found something, no need to search the transport accounts */ for (cursor = priv->transport_accounts; !account && cursor ; cursor = cursor->next) { - const gchar *acc_id = tny_account_get_id (TNY_ACCOUNT(cursor->data)); - if (acc_id && strcmp (acc_id, id) == 0) { - account = TNY_ACCOUNT(cursor->data); + switch (type) { + case MODEST_TNY_ACCOUNT_STORE_QUERY_ID: + val = tny_account_get_id (TNY_ACCOUNT(cursor->data)); + break; + case MODEST_TNY_ACCOUNT_STORE_QUERY_NAME: + val = tny_account_get_name (TNY_ACCOUNT(cursor->data)); + break; + case MODEST_TNY_ACCOUNT_STORE_QUERY_URL: + val = tny_account_get_url_string (TNY_ACCOUNT(cursor->data)); break; } + + if (type == MODEST_TNY_ACCOUNT_STORE_QUERY_URL && + tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), val)) { + account = TNY_ACCOUNT (cursor->data); + goto end; + } else { + if (strcmp (val, str) == 0) { + account = TNY_ACCOUNT(cursor->data); + goto end; + } + } } - + end: if (account) g_object_ref (G_OBJECT(account)); @@ -965,7 +1165,7 @@ modest_tny_account_store_get_tny_account_by_id (ModestTnyAccountStore *self, co } TnyAccount* -modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self, +modest_tny_account_store_get_server_account (ModestTnyAccountStore *self, const gchar *account_name, TnyAccountType type) { @@ -981,15 +1181,19 @@ modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); /* Special case for the local account */ - if (!strcmp (account_name, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID) && - type == TNY_ACCOUNT_TYPE_STORE) { - id = g_strdup (MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID); + if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) { + if(type == TNY_ACCOUNT_TYPE_STORE) + id = g_strdup (MODEST_LOCAL_FOLDERS_ACCOUNT_ID); + else { + /* The local folders modest account has no transport server account. */ + return NULL; + } } else { ModestAccountData *account_data; - account_data = modest_account_mgr_get_account_data (priv->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; } @@ -1005,11 +1209,11 @@ modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self g_printerr ("modest: could not get an id for account %s\n", account_name); else - account = modest_tny_account_store_get_tny_account_by_id (self, id); + account = modest_tny_account_store_get_tny_account_by (self, MODEST_TNY_ACCOUNT_STORE_QUERY_ID, id); if (!account) g_printerr ("modest: could not get tny %s account for %s (id=%s)\n", - type == TNY_ACCOUNT_TYPE_STORE? "store" : "transport", + type == TNY_ACCOUNT_TYPE_STORE ? "store" : "transport", account_name, id ? id : ""); return account; @@ -1052,7 +1256,9 @@ get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore * return NULL; /* No connection-specific SMTP server was specified for this connection. */ } - TnyAccount* account = modest_tny_account_store_get_tny_account_by_id (self, server_account_name); + TnyAccount* account = modest_tny_account_store_get_tny_account_by (self, + MODEST_TNY_ACCOUNT_STORE_QUERY_ID, + server_account_name); /* printf ("DEBUG: %s: account=%p\n", __FUNCTION__, account); */ g_free (server_account_name); @@ -1078,16 +1284,47 @@ modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAcc * just get the regular transport account: */ if (!account) { /* printf("DEBUG: %s: using regular transport account for account %s.\n", __FUNCTION__, account_name); */ - account = modest_tny_account_store_get_tny_account_by_account (self, account_name, + + /* The special local folders don't have transport accounts. */ + if (strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) == 0) + account = NULL; + else + account = modest_tny_account_store_get_server_account (self, account_name, TNY_ACCOUNT_TYPE_TRANSPORT); } return account; } -gboolean modest_tny_folder_store_is_virtual_local_folders (TnyFolderStore *self) +gboolean +modest_tny_account_is_virtual_local_folders (TnyAccount *self) { - /* We should make this more sophisticated if we ever use ModestTnySimpleFolderStore + /* We should make this more sophisticated if we ever use ModestTnyLocalFoldersAccount * for anything else. */ - return MODEST_IS_TNY_SIMPLE_FOLDER_STORE (self); + return MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (self); +} + +TnyAccount* +modest_tny_account_store_get_local_folders_account (TnyAccountStore *self) +{ + TnyAccount *account = NULL; + ModestTnyAccountStorePrivate *priv; + GSList *cursor; + + g_return_val_if_fail (self, NULL); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) { + TnyAccount *this_account = TNY_ACCOUNT(cursor->data); + if (modest_tny_account_is_virtual_local_folders (this_account)) { + account = this_account; + break; + } + } + + if (account) + g_object_ref (G_OBJECT(account)); + + return account; }