#include <modest-protocol-info.h>
#include <modest-local-folder-info.h>
#include <modest-tny-account.h>
+#include <modest-tny-local-folders-account.h>
#include <modest-account-mgr.h>
#include <modest-account-mgr-helpers.h>
+#include <widgets/modest-window-mgr.h>
+#include <modest-account-settings-dialog.h>
+#include <maemo/modest-maemo-utils.h>
+
#include "modest-tny-account-store.h"
#include "modest-tny-platform-factory.h"
#ifdef MODEST_PLATFORM_MAEMO
#include <tny-maemo-conic-device.h>
-#ifdef MODEST_HILDON_VERSION_0
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
#include <hildon-widgets/hildon-note.h>
+#include <hildon-widgets/hildon-banner.h>
#else
#include <hildon/hildon-note.h>
+#include <hildon/hildon-banner.h>
#endif
#endif
+#include <libgnomevfs/gnome-vfs-volume-monitor.h>
+
/* 'private'/'protected' functions */
static void modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass);
//static void modest_tny_account_store_init (ModestTnyAccountStore *obj);
static void modest_tny_account_store_init (gpointer g, gpointer iface_data);
+static void get_server_accounts (TnyAccountStore *self,
+ TnyList *list,
+ TnyAccountType type);
+
/* list my signals */
enum {
ACCOUNT_UPDATE_SIGNAL,
struct _ModestTnyAccountStorePrivate {
gchar *cache_dir;
GHashTable *password_hash;
+ GHashTable *account_settings_dialog_hash;
ModestAccountMgr *account_mgr;
TnySessionCamel *session;
TnyDevice *device;
- /* we cache them here */
+ /* We cache the lists of accounts here.
+ * They are created in our get_accounts_func() implementation. */
GSList *store_accounts;
GSList *transport_accounts;
+
+ /* This is also contained in store_accounts,
+ * but we cached it temporarily separately,
+ * because we create this while creating the transport accounts,
+ * but return it when requesting the store accounts:
+ */
+ GSList *store_accounts_outboxes;
};
#define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
}
+
+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)
{
*/
priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, g_free);
+
+ /* A hash-map of modest account names to dialog pointers,
+ * so we can avoid showing the account settings twice for the same modest account: */
+ priv->account_settings_dialog_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, NULL);
+
+ /* 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)
{
}
+
+/* disconnect the list of TnyAccounts */
static void
-on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean server_account,
- gpointer user_data)
+account_list_disconnect (GSList *accounts)
{
- ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
- ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+ GSList *cursor = accounts;
- /* 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')
- */
+ while (cursor) {
+ if (TNY_IS_CAMEL_ACCOUNT(cursor->data)) /* check twice... */
+ tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(cursor->data), FALSE, NULL);
+ cursor = g_slist_next (cursor);
+ }
+}
+
+
+
+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);
+ }
- account_list_free (priv->store_accounts);
- priv->store_accounts = NULL;
+ 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_vfs_volume_mounted(GnomeVFSVolumeMonitor *volume_monitor,
+ GnomeVFSVolume *volume, gpointer user_data)
+{
+ ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
- account_list_free (priv->transport_accounts);
- priv->transport_accounts = NULL;
+ /* 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_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
- account);
+ g_free (uri);
+}
+
+static void
+on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor,
+ GnomeVFSVolume *volume, gpointer user_data)
+{
+ 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 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);
+ }
+
+ g_free (uri);
}
+static void
+on_account_removed (ModestAccountMgr *acc_mgr,
+ const gchar *account,
+ gboolean is_server_account,
+ gpointer user_data)
+{
+ ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
+ TnyAccount *server_account;
+
+ /* Clear the account cache */
+ server_account = modest_tny_account_store_get_tny_account_by (self,
+ MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
+ account);
+ if (server_account) {
+ if (TNY_IS_STORE_ACCOUNT (server_account)) {
+
+ tny_store_account_delete_cache (TNY_STORE_ACCOUNT (server_account));
+
+ g_signal_emit (G_OBJECT (self),
+ tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNT_REMOVED],
+ 0, server_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); */
+ }
+ g_object_unref (server_account);
+ } else
+ g_printerr ("modest: cannot find server account for %s", account);
+}
+
+/**
+ * modest_tny_account_store_forget_password_in_memory
+ * @self: a TnyAccountStore instance
+ * @account: A server account.
+ *
+ * Forget any password stored in memory for this account.
+ * For instance, this should be called when the user has changed the password in the account settings.
+ */
+static void
+modest_tny_account_store_forget_password_in_memory (ModestTnyAccountStore *self, const gchar * server_account_name)
+{
+ /* printf ("DEBUG: %s\n", __FUNCTION__); */
+ ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ if (server_account_name && priv->password_hash) {
+ g_hash_table_remove (priv->password_hash, server_account_name);
+ }
+}
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);
+ /*
+ printf ("DEBUG: %s\n", __FUNCTION__);
+ const GSList *iter = keys;
+ for (iter = keys; iter; iter = g_slist_next (iter)) {
+ printf (" DEBUG: %s: key=%s\n", __FUNCTION__, (const gchar*)iter->data);
+ }
+ */
+
+ /* Ignore the change if it's a change in the last_updated value */
+ 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 (priv->store_accounts) {
- account_list_free (priv->store_accounts);
- priv->store_accounts = NULL;
- }
+ recreate_all_accounts (self);
- if (priv->transport_accounts) {
- account_list_free (priv->transport_accounts);
- priv->transport_accounts = NULL;
+ /* TODO: This doesn't actually work, because
+ * a) The account name is not sent correctly per key:
+ * b) We should test the end of the key, not the whole keym
+ * c) We don't seem to be getting all keys here.
+ * Instead, we just forget the password for all accounts when we create them, for now.
+ */
+ #if 0
+ /* If a password has changed, then forget the previously cached password for this account: */
+ if (server_account && keys && g_slist_find_custom ((GSList *)keys, MODEST_ACCOUNT_PASSWORD, (GCompareFunc)strcmp)) {
+ printf ("DEBUG: %s: Forgetting cached password for account ID=%s\n", __FUNCTION__, account);
+ modest_tny_account_store_forget_password_in_memory (self, account);
}
+ #endif
g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
account);
"account_store"));
}
+static
+void on_account_settings_hide (GtkWidget *widget, gpointer user_data)
+{
+ TnyAccount *account = (TnyAccount*)user_data;
+
+ /* This is easier than using a struct for the user_data: */
+ ModestTnyAccountStore *self = modest_runtime_get_account_store();
+ ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ const gchar *modest_account_name =
+ modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+ if (modest_account_name)
+ g_hash_table_remove (priv->account_settings_dialog_hash, modest_account_name);
+}
+
+static
+gboolean on_idle_wrong_password (gpointer user_data)
+{
+ TnyAccount *account = (TnyAccount*)user_data;
+ /* This is easier than using a struct for the user_data: */
+ ModestTnyAccountStore *self = modest_runtime_get_account_store();
+ ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ const gchar *modest_account_name =
+ modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+ if (!modest_account_name) {
+ g_warning ("%s: modest_tny_account_get_parent_modest_account_name_for_server_account() failed.\n",
+ __FUNCTION__);
+
+ g_object_unref (account);
+ return FALSE;
+ }
+
+
+ /* Check whether this window is already open,
+ * for instance because of a previous get_password() call:
+ */
+ gpointer dialog_as_gpointer = NULL;
+ gboolean found = FALSE;
+ if (priv->account_settings_dialog_hash) {
+ found = g_hash_table_lookup_extended (priv->account_settings_dialog_hash,
+ modest_account_name, NULL, (gpointer*)&dialog_as_gpointer);
+ }
+ ModestAccountSettingsDialog *dialog = dialog_as_gpointer;
+
+ ModestWindow *main_window =
+ modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
+
+ gdk_threads_enter ();
+ gboolean created_dialog = FALSE;
+ if (!found || !dialog) {
+ dialog = modest_account_settings_dialog_new ();
+ modest_account_settings_dialog_set_account_name (dialog, modest_account_name);
+ modest_account_settings_dialog_switch_to_user_info (dialog);
+
+ g_hash_table_insert (priv->account_settings_dialog_hash, g_strdup (modest_account_name), dialog);
+
+ created_dialog = TRUE;
+ }
+
+ /* Show an explanatory temporary banner: */
+ hildon_banner_show_information (
+ GTK_WIDGET(dialog), NULL, _("mcen_ib_username_pw_incorrect"));
+
+ if (created_dialog) {
+ /* Forget it when it closes: */
+ g_signal_connect_object (G_OBJECT (dialog), "hide", G_CALLBACK (on_account_settings_hide),
+ account, 0);
+
+ /* Show it and delete it when it closes: */
+ modest_maemo_show_dialog_and_forget (GTK_WINDOW (main_window), GTK_DIALOG (dialog));
+ }
+ else {
+ /* Just show it instead of showing it and deleting it when it closes,
+ * though it is probably open already: */
+ gtk_window_present (GTK_WINDOW (dialog));
+ }
+
+ g_object_unref (account);
+ gdk_threads_leave ();
+
+ return FALSE; /* Dont' call this again. */
+}
+
+typedef struct
+{
+ GMainLoop *loop;
+ ModestTnyAccountStore* account_store;
+ const gchar* server_account_id;
+ gchar **username;
+ gchar **password;
+ gboolean *cancel;
+ gboolean *remember;
+} IdlePasswordRequest;
+
+static gboolean
+on_idle_request_password (gpointer user_data)
+{
+ gdk_threads_enter();
+
+ IdlePasswordRequest* info = (IdlePasswordRequest*)user_data;
+ g_signal_emit (G_OBJECT(info->account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0,
+ info->server_account_id, /* server_account_name */
+ info->username, info->password, info->cancel, info->remember);
+
+ if (info->loop)
+ g_main_loop_quit (info->loop);
+
+ gdk_threads_leave();
+
+ return FALSE; /* Don't call again. */
+}
+
+static void
+request_password_in_main_loop_and_wait (ModestTnyAccountStore *account_store,
+ const gchar* server_account_id,
+ gchar **username,
+ gchar **password,
+ gboolean *cancel,
+ gboolean *remember)
+{
+ IdlePasswordRequest *data = g_slice_new0 (IdlePasswordRequest);
+ data->account_store = account_store;
+ data->server_account_id = server_account_id;
+ data->username = username;
+ data->password = password;
+ data->cancel = cancel;
+ data->remember = remember;
+
+ 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 (&on_idle_request_password, data);
+
+ /* This main loop will run until the idle handler has stopped it: */
+ printf ("DEBUG: %s: before g_main_loop_run()\n", __FUNCTION__);
+ GDK_THREADS_LEAVE();
+ g_main_loop_run (data->loop);
+ GDK_THREADS_ENTER();
+ printf ("DEBUG: %s: after g_main_loop_run()\n", __FUNCTION__);
+ printf ("DEBUG: %s: Finished\n", __FUNCTION__);
+ g_main_loop_unref (data->loop);
+
+ g_slice_free (IdlePasswordRequest, data);
+}
+
/* This callback will be called by Tinymail when it needs the password
- * from the user, for instance if the password was not remembered.
+ * from the user or the account settings.
+ * It can also call forget_password() before calling this,
+ * so that we clear wrong passwords out of our account settings.
* Note that TnyAccount here will be the server account. */
static gchar*
-get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel)
+get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *cancel)
{
- const gchar *key;
- const TnyAccountStore *account_store;
- ModestTnyAccountStore *self;
+ /* TODO: Settting cancel to FALSE does not actually cancel everything.
+ * We still get multiple requests afterwards, so we end up showing the
+ * same dialogs repeatedly.
+ */
+
+ printf ("DEBUG: modest: %s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used);
+
+ g_return_val_if_fail (account, NULL);
+
+ const TnyAccountStore *account_store = NULL;
+ ModestTnyAccountStore *self = NULL;
ModestTnyAccountStorePrivate *priv;
gchar *username = NULL;
gchar *pwd = NULL;
- gpointer pwd_ptr;
- gboolean already_asked;
-
- key = tny_account_get_id (account);
+ gpointer pwd_ptr = NULL;
+ gboolean already_asked = FALSE;
+
+ /* Initialize the output parameter: */
+ if (cancel)
+ *cancel = FALSE;
+
+ const gchar *server_account_name = tny_account_get_id (account);
account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account));
-
+
+ if (!server_account_name || !account_store) {
+ g_warning ("modest: %s: could not retrieve account_store for account %s",
+ __FUNCTION__, server_account_name ? server_account_name : "<NULL>");
+ if (cancel)
+ *cancel = TRUE;
+
+ return NULL;
+ }
+
self = MODEST_TNY_ACCOUNT_STORE (account_store);
- priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
/* This hash map stores passwords, including passwords that are not stored in gconf. */
- /* is it in the hash? if it's already there, it must be wrong... */
+ /* Is it in the hash? if it's already there, it must be wrong... */
pwd_ptr = (gpointer)&pwd; /* pwd_ptr so the compiler does not complained about
* type-punned ptrs...*/
- already_asked = g_hash_table_lookup_extended (priv->password_hash,
- key,
+ already_asked = priv->password_hash &&
+ g_hash_table_lookup_extended (priv->password_hash,
+ server_account_name,
NULL,
(gpointer*)&pwd_ptr);
+
+ printf ("DEBUG: modest: %s: Already asked = %d\n", __FUNCTION__, already_asked);
- /* if the password is not already there, try ModestConf */
+ /* If the password is not already there, try ModestConf */
if (!already_asked) {
- pwd = modest_account_mgr_get_string (priv->account_mgr,
- key, MODEST_ACCOUNT_PASSWORD, TRUE);
- g_hash_table_insert (priv->password_hash, g_strdup (key), g_strdup (pwd));
+ pwd = modest_server_account_get_password (priv->account_mgr,
+ server_account_name);
+ g_hash_table_insert (priv->password_hash, g_strdup (server_account_name), g_strdup (pwd));
}
- /* if it was already asked, it must have been wrong, so ask again */
+ /* If it was already asked, it must have been wrong, so ask again */
if (already_asked || !pwd || strlen(pwd) == 0) {
+ /* As per the UI spec, if no password was set in the account settings,
+ * ask for it now. But if the password is wrong in the account settings,
+ * then show a banner and the account settings dialog so it can be corrected:
+ */
+ const gboolean settings_have_password =
+ modest_server_account_get_has_password (priv->account_mgr, server_account_name);
+ printf ("DEBUG: modest: %s: settings_have_password=%d\n", __FUNCTION__, settings_have_password);
+ if (settings_have_password) {
+
+
+ /* The password must be wrong, so show the account settings dialog so it can be corrected: */
+ /* We show it in the main loop, because this function might no tbe in the main loop. */
+ g_object_ref (account); /* unrefed in the idle handler. */
+ g_idle_add (on_idle_wrong_password, account);
+
+ if (cancel)
+ *cancel = TRUE;
+
+ return NULL;
+ }
+
/* we don't have it yet. Get the password from the user */
const gchar* account_id = tny_account_get_id (account);
gboolean remember = FALSE;
pwd = NULL;
- /* Note that we ignore the returned username here,
- * because it is enough that it will be stored in gconf
- * by the signal handler. */
- g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0,
- account_id, /* server_account_name */
+ request_password_in_main_loop_and_wait (self, account_id,
&username, &pwd, cancel, &remember);
if (!*cancel) {
- if (remember)
- modest_account_mgr_set_string (priv->account_mgr,key,
- MODEST_ACCOUNT_PASSWORD,
- pwd, TRUE);
+ /* The password will be returned as the result,
+ * but we need to tell tinymail about the username too: */
+ tny_account_set_user (account, username);
+
+ if (remember) {
+ printf ("%s: Storing username=%s, password=%s\n",
+ __FUNCTION__, username, pwd);
+ modest_server_account_set_username (priv->account_mgr, server_account_name,
+ username);
+ modest_server_account_set_password (priv->account_mgr, server_account_name,
+ pwd);
+ }
/* We need to dup the string even knowing that
it's already a dup of the contents of an
entry, because it if it's wrong, then camel
will free it */
- g_hash_table_insert (priv->password_hash, g_strdup (key), g_strdup(pwd));
+ g_hash_table_insert (priv->password_hash, g_strdup (server_account_name), g_strdup(pwd));
} else {
- g_hash_table_remove (priv->password_hash, key);
+ g_hash_table_remove (priv->password_hash, server_account_name);
g_free (pwd);
pwd = NULL;
return pwd;
}
-
+/* tinymail calls this if the connection failed due to an incorrect password.
+ * And it seems to call this for any general connection failure. */
static void
forget_password (TnyAccount *account)
{
+ printf ("DEBUG: %s\n", __FUNCTION__);
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
const TnyAccountStore *account_store;
}
/* Remove from configuration system */
+ /*
modest_account_mgr_unset (priv->account_mgr,
key, MODEST_ACCOUNT_PASSWORD, TRUE);
+ */
}
+static void
+destroy_password_hashtable (ModestTnyAccountStore *self)
+{
+ ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ g_free (priv->cache_dir);
+ priv->cache_dir = NULL;
+
+ if (priv->password_hash) {
+ g_hash_table_destroy (priv->password_hash);
+ priv->password_hash = NULL;
+ }
+}
static void
modest_tny_account_store_finalize (GObject *obj)
g_hash_table_destroy (priv->password_hash);
priv->password_hash = NULL;
}
+
+ destroy_password_hashtable (self);
if (priv->account_mgr) {
g_object_unref (G_OBJECT(priv->account_mgr));
priv->device = NULL;
}
+ /* disconnect all accounts when we are destroyed */
+ g_debug ("modest: disconnecting all store accounts");
+ account_list_disconnect (priv->store_accounts);
+ g_debug ("modest: disconnecting all transport accounts");
+ account_list_disconnect (priv->transport_accounts);
+
/* this includes the local folder */
account_list_free (priv->store_accounts);
priv->store_accounts = NULL;
GObject *obj;
ModestTnyAccountStorePrivate *priv;
- TnyList *list;
+// TnyList *list;
g_return_val_if_fail (account_mgr, NULL);
g_return_val_if_fail (device, NULL);
priv->device = g_object_ref (device);
priv->session = tny_session_camel_new (TNY_ACCOUNT_STORE(obj));
+ if (!priv->session) {
+ g_warning ("failed to get TnySessionCamel");
+ return NULL;
+ }
tny_session_camel_set_ui_locker (priv->session, tny_gtk_lockable_new ());
- /* FIXME: unref this in the end? */
tny_session_camel_set_async_connecting (priv->session, TRUE);
-
- /* force a cache fill... ugly */
- list = TNY_LIST(tny_simple_list_new());
- tny_account_store_get_accounts (TNY_ACCOUNT_STORE(obj), list,
- TNY_ACCOUNT_STORE_BOTH);
- g_object_unref(list);
-
+
/* Connect signals */
g_signal_connect (G_OBJECT(account_mgr), "account_changed",
G_CALLBACK (on_account_changed), obj);
return MODEST_TNY_ACCOUNT_STORE(obj);
}
-
+/** Fill the TnyList from the appropriate cached GSList of accounts. */
static void
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;
}
}
-
-
-/* this function fills the TnyList, and also returns a GSList of the accounts,
- * for caching purposes
- */
-static GSList*
-get_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type)
+static void
+create_per_account_local_outbox_folders (TnyAccountStore *self)
{
- ModestTnyAccountStorePrivate *priv = NULL;
- GSList *account_names = NULL, *cursor = NULL;
- GSList *accounts = NULL;
+ g_return_if_fail (self);
- priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
- account_names = modest_account_mgr_account_names (priv->account_mgr,
+ ModestTnyAccountStorePrivate *priv =
+ MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ /* printf("DEBUG: %s: priv->store_accounts_outboxes = %p\n", __FUNCTION__, priv->store_accounts_outboxes); */
+
+ GSList *accounts = NULL;
+
+ GSList *account_names = modest_account_mgr_account_names (priv->account_mgr,
TRUE /* including disabled accounts */);
+ GSList *iter = NULL;
+ for (iter = account_names; iter; iter = g_slist_next (iter)) {
+
+ const gchar* account_name = (const gchar*)iter->data;
+
+ /* Create a per-account local outbox folder (a _store_ account)
+ * for each _transport_ account: */
+ TnyAccount *tny_account_outbox =
+ modest_tny_account_new_for_per_account_local_outbox_folder (
+ priv->account_mgr, account_name, priv->session);
+
+ accounts = g_slist_append (accounts, tny_account_outbox); /* cache it */
+ };
+
+ modest_account_mgr_free_account_names (account_names);
+ account_names = NULL;
+
+ priv->store_accounts_outboxes = accounts;
+}
+
+/* This function fills the TnyList, and also stores a GSList of the accounts,
+ * for caching purposes. It creates the TnyAccount objects if necessary.
+ * The @list parameter may be NULL, if you just want to fill the cache.
+ */
+static void
+get_server_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type)
+{
+ g_return_if_fail (self);
+
+ ModestTnyAccountStorePrivate *priv =
+ MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ /* Do nothing if the accounts are already cached: */
+ if (type == TNY_ACCOUNT_TYPE_STORE) {
+ if (priv->store_accounts)
+ return;
+ } else if (type == TNY_ACCOUNT_TYPE_TRANSPORT) {
+ if (priv->transport_accounts)
+ return;
+ }
+
+ 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);
+
for (cursor = account_names; cursor; cursor = cursor->next) {
gchar *account_name = (gchar*)cursor->data;
- /* only return enabled accounts */
+ /* we get the server_accounts for enabled accounts */
if (modest_account_mgr_get_enabled(priv->account_mgr, account_name)) {
+
+ /* Add the account: */
TnyAccount *tny_account =
modest_tny_account_new_from_account (priv->account_mgr,
account_name,
get_password,
forget_password);
if (tny_account) {
+ /* Forget any cached password for the account,
+ * so that we use a new account if any.
+ * TODO: Really we should do this in a more precise way in
+ * on_account_changed().
+ */
+ modest_tny_account_store_forget_password_in_memory (
+ MODEST_TNY_ACCOUNT_STORE (self),
+ tny_account_get_id (tny_account));
+
g_object_set_data (G_OBJECT(tny_account), "account_store",
(gpointer)self);
- tny_list_prepend (list, G_OBJECT(tny_account));
- accounts = g_slist_append (accounts, tny_account); /* cache it */
+ if (list)
+ tny_list_prepend (list, G_OBJECT(tny_account));
+
+ accounts = g_slist_append (accounts, tny_account); /* cache it */
} else
g_printerr ("modest: failed to create account for %s\n",
account_name);
+ }
+ }
+
+ 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_free (account_name);
+ 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.
+ * Note that these server account instances might never be used
+ * if their connections are never active: */
+ /* Look at each modest account: */
+ if (type == TNY_ACCOUNT_TYPE_TRANSPORT) {
+ GSList *iter_account_names = account_names;
+ while (iter_account_names) {
+ const gchar* account_name = (const gchar*)(iter_account_names->data);
+ GSList *list_specifics = modest_account_mgr_get_list (priv->account_mgr,
+ account_name,
+ MODEST_ACCOUNT_CONNECTION_SPECIFIC_SMTP_LIST,
+ MODEST_CONF_VALUE_STRING, FALSE);
+
+ /* Look at each connection-specific transport account for the
+ * modest account: */
+ GSList *iter = list_specifics;
+ while (iter) {
+ /* const gchar* this_connection_name = (const gchar*)(iter->data); */
+ iter = g_slist_next (iter);
+ if (iter) {
+ const gchar* transport_account_name = (const gchar*)(iter->data);
+ if (transport_account_name) {
+ TnyAccount * tny_account = NULL;
+ /* Add the account: */
+ tny_account = modest_tny_account_new_from_server_account_name (
+ priv->account_mgr, priv->session, transport_account_name);
+ if (tny_account) {
+ g_object_set_data (G_OBJECT(tny_account), "account_store",
+ (gpointer)self);
+ if (list)
+ tny_list_prepend (list, G_OBJECT(tny_account));
+
+ accounts = g_slist_append (accounts, tny_account); /* cache it */
+ } else
+ g_printerr ("modest: failed to create smtp-specific account for %s\n",
+ transport_account_name);
+ }
+ }
+
+ iter = g_slist_next (iter);
+ }
+
+ iter_account_names = g_slist_next (iter_account_names);
+ }
}
- g_slist_free (account_names);
- /* also, add the local folder pseudo-account */
+ /* free the account_names */
+ modest_account_mgr_free_account_names (account_names);
+ account_names = NULL;
+
+ /* We also create a per-account local outbox folder (a _store_ account)
+ * for each _transport_ account. */
+ if (type == TNY_ACCOUNT_TYPE_TRANSPORT) {
+ /* Now would be a good time to create the per-account local outbox folder
+ * _store_ accounts corresponding to each transport account: */
+ if (!priv->store_accounts_outboxes) {
+ create_per_account_local_outbox_folders (self);
+ }
+ }
+
+ /* But we only return the per-account local outbox folder when
+ * _store_ accounts are requested. */
if (type == TNY_ACCOUNT_TYPE_STORE) {
+ /* Create them if necessary,
+ * (which also requires creating the transport accounts,
+ * if necessary.) */
+ if (!priv->store_accounts_outboxes) {
+ 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);
- tny_list_prepend (list, G_OBJECT(tny_account));
- accounts = g_slist_append (accounts, tny_account); /* cache it */
- }
- return accounts;
+ 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;
+ for (iter = priv->store_accounts_outboxes; iter; iter = g_slist_next (iter)) {
+ TnyAccount *outbox_account = (TnyAccount*)iter->data;
+ 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) {
+ /* Store the cache: */
+ priv->store_accounts = accounts;
+ } else if (type == TNY_ACCOUNT_TYPE_TRANSPORT) {
+ /* Store the cache: */
+ priv->transport_accounts = accounts;
+ }
}
TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
modest_tny_account_store_get_accounts (self, list,
TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS);
+
+ tny_session_camel_set_initialized (priv->session);
+
return;
}
if (request_type == TNY_ACCOUNT_STORE_STORE_ACCOUNTS) {
-
if (!priv->store_accounts)
- priv->store_accounts = get_accounts (self, list, TNY_ACCOUNT_TYPE_STORE);
+ get_server_accounts (self, list, TNY_ACCOUNT_TYPE_STORE);
else
get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_STORE);
+ tny_session_camel_set_initialized (priv->session);
+
} else if (request_type == TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS) {
-
if (!priv->transport_accounts)
- priv->transport_accounts =
- get_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT);
+ get_server_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT);
else
get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT);
+
+ tny_session_camel_set_initialized (priv->session);
} else
g_return_if_reached (); /* incorrect req type */
}
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);
}
static gboolean
-modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
- const GError *error)
+modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, TnyAlertType type,
+ gboolean question, const GError *error)
{
g_return_val_if_fail (error, FALSE);
if ((error->domain != TNY_ACCOUNT_ERROR)
&& (error->domain != TNY_ACCOUNT_STORE_ERROR)) {
- g_warning("%s: Unexpected error domain: != TNY_ACCOUNT_ERROR: %d, message=%s",
+ g_warning("modest: %s: Unexpected error domain: != TNY_ACCOUNT_ERROR: %d, message=%s",
__FUNCTION__, error->domain, error->message);
+
return FALSE;
}
- /* printf("DEBUG: %s: error->message=%s\n", __FUNCTION__, error->message); */
+ printf("DEBUG: %s: GError code: %d, message=%s\n",
+ __FUNCTION__, error->code, error->message);
+
+ /* Get the server name: */
+ const gchar* server_name = NULL;
+ if (account && TNY_IS_ACCOUNT (account)) {
+ server_name = tny_account_get_hostname (account);
+ printf ("modest: %s: account name = %s, server_name=%s\n", __FUNCTION__,
+ tny_account_get_id (account), server_name);
+ }
-
+ if (!server_name)
+ server_name = _("Unknown Server");
+
+ ModestTransportStoreProtocol proto = MODEST_PROTOCOL_STORE_POP; /* Arbitrary default. */
+ if (account) {
+ const gchar *proto_name = tny_account_get_proto (account);
+ if (proto_name)
+ proto = modest_protocol_info_get_transport_store_protocol (proto_name);
+ else {
+ g_warning("modest: %s: account with id=%s has no proto.\n", __FUNCTION__,
+ tny_account_get_id (account));
+ }
+ }
+
/* const gchar *prompt = NULL; */
gchar *prompt = NULL;
- switch (error->code)
- {
+ switch (error->code) {
+ case TNY_ACCOUNT_STORE_ERROR_CANCEL_ALERT:
+ case TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL:
+ /* Don't show waste the user's time by showing him a dialog telling
+ * him that he has just cancelled something: */
+ g_debug ("%s: Handling GError domain=%d, code=%d (cancelled) without showing a dialog, message=%s",
+ __FUNCTION__, error->domain, error->code, error->message);
+ prompt = NULL;
+ break;
+
+ case TNY_ACCOUNT_ERROR_TRY_CONNECT_HOST_LOOKUP_FAILED:
+ /* TODO: Show the appropriate message, depending on whether it's POP or IMAP: */
+ g_debug ("%s: Handling GError domain=%d, code=%d (lookup failed), message=%s",
+ __FUNCTION__, error->domain, error->code, error->message);
+
+ switch (proto) {
+ case MODEST_PROTOCOL_STORE_POP:
+ prompt = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"), server_name);
+ break;
+ case MODEST_PROTOCOL_STORE_IMAP:
+ prompt = g_strdup_printf (_("emev_ni_ui_imap_connect_server_error"), server_name);
+ break;
+ case MODEST_PROTOCOL_TRANSPORT_SMTP:
+ default: /* Arbitrary default. */
+ prompt = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name);
+ break;
+ }
+
+ /*
+ prompt = g_strdup_printf(
+ _("Incorrect Account Settings:\n Host lookup failed.%s"),
+ error->message);
+ */
+ break;
+
+ case TNY_ACCOUNT_ERROR_TRY_CONNECT_AUTHENTICATION_NOT_SUPPORTED:
+ g_debug ("%s: Handling GError domain=%d, code=%d (authentication not supported), message=%s",
+ __FUNCTION__, error->domain, error->code, error->message);
+ /* TODO: This needs a logical ID for the string: */
+ prompt = g_strdup_printf(
+ _("Incorrect Account Settings:\nThe secure authentication method is not supported.\n%s"),
+ error->message);
+ break;
+
+ case TNY_ACCOUNT_ERROR_TRY_CONNECT_CERTIFICATE:
+ g_debug ("%s: Handling GError domain=%d, code=%d (certificatae), message=%s",
+ __FUNCTION__, error->domain, error->code, error->message);
+ prompt = g_strdup_printf(
+ _("Certificate Problem:\n%s"),
+ error->message);
+ break;
+
case TNY_ACCOUNT_ERROR_TRY_CONNECT:
/* 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);
+ /* This debug output is useful. Please keep it uncommented until
+ * we have fixed the problems in this function: */
+ 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);
+
+ /* Note: If the password was wrong then get_password() would be called again,
+ * instead of this vfunc being called. */
+
break;
+
default:
g_warning ("%s: Unhandled GError code: %d, message=%s",
__FUNCTION__, error->code, error->message);
if (!prompt)
return FALSE;
- gboolean retval = FALSE;
#ifdef MODEST_PLATFORM_MAEMO
/* The Tinymail documentation says that we should show Yes and No buttons,
- * but these never seem to be questions: */
- GtkWidget *dialog = GTK_WIDGET (hildon_note_new_information (NULL, prompt));
+ * when it is a question.
+ * Obviously, we need tinymail to use more specific error codes instead,
+ * so we know what buttons to show. */
+ GtkWidget *dialog = NULL;
+ if (question) {
+ dialog = GTK_WIDGET (hildon_note_new_confirmation (NULL,
+ prompt));
+ } else {
+ dialog = GTK_WIDGET (hildon_note_new_information (NULL,
+ prompt));
+ }
#else
GtkMessageType gtktype = GTK_MESSAGE_ERROR;
break;
}
- GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+ GtkWidget *dialog = gtk_message_dialog_new (NULL, 0,
gtktype, GTK_BUTTONS_YES_NO, prompt);
#endif /* #ifdef MODEST_PLATFORM_MAEMO */
- if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
- retval = TRUE;
+ gboolean retval = TRUE;
+ const int response = gtk_dialog_run (GTK_DIALOG (dialog));
+ if (question) {
+ retval = (response == GTK_RESPONSE_YES) ||
+ (response == GTK_RESPONSE_OK);
+ }
gtk_widget_destroy (dialog);
/* TODO: Don't free this when we no longer strdup the message for testers. */
g_free (prompt);
+
+ /* printf("DEBUG: %s: returning %d\n", __FUNCTION__, retval); */
return retval;
}
}
TnySessionCamel*
-tny_account_store_get_session (TnyAccountStore *self)
+modest_tny_account_store_get_session (TnyAccountStore *self)
{
g_return_val_if_fail (self, NULL);
return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self)->session;
}
+
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;
+ TnyList* list;
+
+
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);
+ /* fill the caches, as that may not have happened yet */
+ list = TNY_LIST(tny_simple_list_new());
+ modest_tny_account_store_get_accounts (TNY_ACCOUNT_STORE(self),
+ list, TNY_ACCOUNT_STORE_BOTH);
+ g_object_unref (list);
+
+
+
+ /* 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_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), str)) {
+ 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_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));
+ else {
+ /* Warn if nothing was found. This is generally unusual. */
+ switch (type) {
+ case MODEST_TNY_ACCOUNT_STORE_QUERY_ID:
+ g_warning("%s: Failed to find account with ID=%s\n", __FUNCTION__, str);
+ break;
+ case MODEST_TNY_ACCOUNT_STORE_QUERY_URL:
+ g_warning("%s: Failed to find account with URL=%s\n", __FUNCTION__, str);
+ break;
+ }
+ }
return account;
}
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)
{
TnyAccount *account = NULL;
- ModestAccountData *account_data;
- const gchar *id = NULL;
+ gchar *id = NULL;
ModestTnyAccountStorePrivate *priv;
g_return_val_if_fail (self, NULL);
NULL);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
- account_data = modest_account_mgr_get_account_data (priv->account_mgr, account_name);
- if (!account_data) {
- g_printerr ("modest: cannot get account data for account '%s'\n", account_name);
- return NULL;
- }
- if (type == TNY_ACCOUNT_TYPE_STORE && account_data->store_account)
- id = account_data->store_account->account_name;
- else if (account_data->transport_account)
- id = account_data->transport_account->account_name;
+ /* Special case for the local account */
+ 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);
+ return NULL;
+ }
+
+ if (type == TNY_ACCOUNT_TYPE_STORE && account_data->store_account)
+ id = g_strdup (account_data->store_account->account_name);
+ else if (type == TNY_ACCOUNT_TYPE_TRANSPORT && account_data->transport_account)
+ id = g_strdup (account_data->transport_account->account_name);
+
+ modest_account_mgr_free_account_data (priv->account_mgr, account_data);
+ }
if (!id)
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 : "<none>");
+ g_free (id);
- modest_account_mgr_free_account_data (priv->account_mgr, account_data);
return account;
}
-static TnyAccount* get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self, const gchar *account_name)
+static TnyAccount*
+get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self,
+ const gchar *account_name)
{
/* Get the current connection: */
TnyDevice *device = modest_runtime_get_device ();
if (!tny_device_is_online (device))
return NULL;
+ g_return_val_if_fail (self, NULL);
+ g_return_val_if_fail (account_name, NULL);
+
+
#ifdef MODEST_PLATFORM_MAEMO
g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device));
TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device);
const gchar* iap_id = tny_maemo_conic_device_get_current_iap_id (maemo_device);
+ /* printf ("DEBUG: %s: iap_id=%s\n", __FUNCTION__, iap_id); */
if (!iap_id)
return NULL;
return NULL;
const gchar *connection_name = con_ic_iap_get_name (connection);
+ /* printf ("DEBUG: %s: connection_name=%s\n", __FUNCTION__, connection_name); */
if (!connection_name)
return NULL;
ModestAccountMgr *account_manager = modest_runtime_get_account_mgr ();
gchar* server_account_name = modest_account_mgr_get_connection_specific_smtp (account_manager,
account_name, connection_name);
-
- if (!server_account_name)
+
+ /* printf ("DEBUG: %s: server_account_name=%s\n", __FUNCTION__, server_account_name); */
+ if (!server_account_name) {
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);
/* Unref the get()ed object, as required by the tny_maemo_conic_device_get_iap() documentation. */
}
-TnyAccount* modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAccountStore *self,
- const gchar *account_name)
+TnyAccount*
+modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAccountStore *self,
+ const gchar *account_name)
{
+ g_return_val_if_fail (self, NULL);
+ g_return_val_if_fail (account_name, NULL);
+
+ if (!account_name || !self)
+ return NULL;
+
/* Get the connection-specific transport acccount, if any: */
- TnyAccount *account = get_smtp_specific_transport_account_for_open_connection (self, account_name);
+ TnyAccount *account =
+ get_smtp_specific_transport_account_for_open_connection (self, account_name);
/* If there is no connection-specific transport account (the common case),
* just get the regular transport account: */
- if (!account) {
- account = modest_tny_account_store_get_tny_account_by_account (self, account_name,
+ if (!account) {
+ /* printf("DEBUG: %s: using regular transport account for account %s.\n", __FUNCTION__, 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_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)
+{
+ if (!self)
+ return FALSE;
+
+ const gchar* account_id = tny_account_get_id (self);
+ if (!account_id)
+ return FALSE;
+
+ return (strcmp (account_id, MODEST_MMC_ACCOUNT_ID) == 0);
+}
+
+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;
+}
+
+
projects / modest / blobdiff