#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 <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_finalize (GObject *obj);
+static void modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass);
+
+static void modest_tny_account_store_finalize (GObject *obj);
-/* implementations for tny-account-store-iface */
static void modest_tny_account_store_instance_init (ModestTnyAccountStore *obj);
+
static void modest_tny_account_store_init (gpointer g, gpointer iface_data);
+static void modest_tny_account_store_base_init (gpointer g_class);
+
+static void on_account_inserted (ModestAccountMgr *acc_mgr,
+ const gchar *account,
+ gpointer user_data);
+
+static void add_existing_accounts (ModestTnyAccountStore *self);
+
+static void insert_account (ModestTnyAccountStore *self,
+ const gchar *account,
+ gboolean notify);
+
+static void on_account_removed (ModestAccountMgr *acc_mgr,
+ const gchar *account,
+ gpointer user_data);
+
+static gchar* get_password (TnyAccount *account,
+ const gchar * prompt_not_used,
+ gboolean *cancel);
+
+static void forget_password (TnyAccount *account);
-static void get_server_accounts (TnyAccountStore *self,
- TnyList *list,
- TnyAccountType type);
+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_forget_password_in_memory (ModestTnyAccountStore *self,
+ const gchar *server_account_name);
+
+static void add_connection_specific_transport_accounts (ModestTnyAccountStore *self,
+ const gchar *account_name);
/* list my signals */
enum {
- ACCOUNT_UPDATE_SIGNAL,
+ ACCOUNT_CHANGED_SIGNAL,
+ ACCOUNT_INSERTED_SIGNAL,
+ ACCOUNT_REMOVED_SIGNAL,
+
PASSWORD_REQUESTED_SIGNAL,
LAST_SIGNAL
};
struct _ModestTnyAccountStorePrivate {
gchar *cache_dir;
GHashTable *password_hash;
+ GHashTable *account_settings_dialog_hash;
ModestAccountMgr *account_mgr;
TnySessionCamel *session;
TnyDevice *device;
+
+ gulong acc_inserted_handler;
+ gulong acc_changed_handler;
+ gulong acc_removed_handler;
+ gulong volume_mounted_handler;
+ gulong volume_unmounted_handler;
- /* 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;
+ /* We cache the lists of accounts here */
+ TnyList *store_accounts;
+ TnyList *transport_accounts;
+ TnyList *store_accounts_outboxes;
};
#define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
if (!my_type) {
static const GTypeInfo my_info = {
sizeof(ModestTnyAccountStoreClass),
- NULL, /* base init */
+ modest_tny_account_store_base_init, /* base init */
NULL, /* base finalize */
(GClassInitFunc) modest_tny_account_store_class_init,
NULL, /* class finalize */
return my_type;
}
+
+static void
+modest_tny_account_store_base_init (gpointer g_class)
+{
+ static gboolean tny_account_store_initialized = FALSE;
+
+ if (!tny_account_store_initialized) {
+
+ signals[ACCOUNT_CHANGED_SIGNAL] =
+ g_signal_new ("account_changed",
+ MODEST_TYPE_TNY_ACCOUNT_STORE,
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (ModestTnyAccountStoreClass, account_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT);
+
+ signals[ACCOUNT_INSERTED_SIGNAL] =
+ g_signal_new ("account_inserted",
+ MODEST_TYPE_TNY_ACCOUNT_STORE,
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (ModestTnyAccountStoreClass, account_inserted),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT);
+
+ signals[ACCOUNT_REMOVED_SIGNAL] =
+ g_signal_new ("account_removed",
+ MODEST_TYPE_TNY_ACCOUNT_STORE,
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (ModestTnyAccountStoreClass, account_removed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT);
+
+/* signals[TNY_ACCOUNT_STORE_CONNECTING_FINISHED] = */
+/* g_signal_new ("connecting_finished", */
+/* TNY_TYPE_ACCOUNT_STORE, */
+/* G_SIGNAL_RUN_FIRST, */
+/* G_STRUCT_OFFSET (TnyAccountStoreIface, connecting_finished), */
+/* NULL, NULL, */
+/* g_cclosure_marshal_VOID__VOID, */
+/* G_TYPE_NONE, 0); */
+
+ signals[PASSWORD_REQUESTED_SIGNAL] =
+ g_signal_new ("password_requested",
+ MODEST_TYPE_TNY_ACCOUNT_STORE,
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET(ModestTnyAccountStoreClass, password_requested),
+ NULL, NULL,
+ modest_marshal_VOID__STRING_POINTER_POINTER_POINTER_POINTER,
+ G_TYPE_NONE, 5, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER,
+ G_TYPE_POINTER);
+
+ tny_account_store_initialized = TRUE;
+ }
+}
+
+
static void
modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass)
{
g_type_class_add_private (gobject_class,
sizeof(ModestTnyAccountStorePrivate));
-
- signals[ACCOUNT_UPDATE_SIGNAL] =
- g_signal_new ("account_update",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET(ModestTnyAccountStoreClass, account_update),
- NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE, 1, G_TYPE_STRING);
-
- signals[PASSWORD_REQUESTED_SIGNAL] =
- g_signal_new ("password_requested",
- G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET(ModestTnyAccountStoreClass, password_requested),
- NULL, NULL,
- modest_marshal_VOID__STRING_POINTER_POINTER_POINTER_POINTER,
- G_TYPE_NONE, 5, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER,
- G_TYPE_POINTER);
}
-
-
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)
{
- ModestTnyAccountStorePrivate *priv =
- MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
+ GnomeVFSVolumeMonitor* monitor = NULL;
+ ModestTnyAccountStorePrivate *priv;
+
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
priv->cache_dir = NULL;
priv->account_mgr = NULL;
* for passwords that are not remembered in the configuration,
* so they need to be asked for from the user once in each session:
*/
- priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
- g_free, g_free);
+ 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);
+ monitor = gnome_vfs_get_volume_monitor();
+
+ priv->volume_mounted_handler = g_signal_connect (G_OBJECT(monitor),
+ "volume-mounted",
+ G_CALLBACK(on_vfs_volume_mounted),
+ obj);
+
+ priv->volume_unmounted_handler = g_signal_connect (G_OBJECT(monitor), "volume-unmounted",
+ G_CALLBACK(on_vfs_volume_unmounted),
+ obj);
}
+/* disconnect the list of TnyAccounts */
static void
-account_list_free (GSList *accounts)
+foreach_account_disconnect (gpointer data,
+ gpointer user_data)
{
- GSList *cursor = accounts;
-
- while (cursor) {
- if (G_IS_OBJECT(cursor->data)) { /* check twice... */
- const gchar *id = tny_account_get_id(TNY_ACCOUNT(cursor->data));
- modest_runtime_verify_object_last_ref(cursor->data,id);
- }
- g_object_unref (G_OBJECT(cursor->data));
- cursor = cursor->next;
- }
- g_slist_free (accounts);
+ tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(data), FALSE, NULL);
}
+
static void
-recreate_all_accounts (ModestTnyAccountStore *self)
+foreach_account_append_to_list (gpointer data,
+ gpointer user_data)
{
- 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);
- }
+ TnyList *list;
+
+ list = TNY_LIST (user_data);
+ tny_list_append (list, G_OBJECT (data));
}
+/********************************************************************/
+/* Control the state of the MMC local account */
+/********************************************************************/
static void
on_vfs_volume_mounted(GnomeVFSVolumeMonitor *volume_monitor,
- GnomeVFSVolume *volume, gpointer user_data)
+ GnomeVFSVolume *volume,
+ gpointer user_data)
{
- ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
+ ModestTnyAccountStore *self;
+ ModestTnyAccountStorePrivate *priv;
+
+ gchar *uri = NULL;
+
+ self = MODEST_TNY_ACCOUNT_STORE(user_data);
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
/* 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);
+ uri = gnome_vfs_volume_get_activation_uri (volume);
+
+ if (uri && (!strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI))) {
+ TnyAccount *mmc_account;
+
+ mmc_account = modest_tny_account_new_for_local_folders (priv->account_mgr,
+ priv->session,
+ MODEST_MCC1_VOLUMEPATH);
+
+ /* Add to the list of store accounts */
+ tny_list_append (priv->store_accounts, G_OBJECT (mmc_account));
+
+ g_signal_emit (G_OBJECT (self),
+ signals [ACCOUNT_INSERTED_SIGNAL],
+ 0, mmc_account);
+ /* Free */
+ g_object_unref (mmc_account);
}
-
g_free (uri);
}
static void
on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor,
- GnomeVFSVolume *volume, gpointer user_data)
+ GnomeVFSVolume *volume,
+ gpointer user_data)
{
- ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
+ ModestTnyAccountStore *self;
+ ModestTnyAccountStorePrivate *priv;
+ gchar *uri = NULL;
+
+ self = MODEST_TNY_ACCOUNT_STORE(user_data);
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
/* Check whether this was the external MMC1 card: */
- gchar *uri = gnome_vfs_volume_get_activation_uri (volume);
+ 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);
+ TnyAccount *mmc_account = NULL;
+ gboolean found = FALSE;
+ TnyIterator *iter = NULL;
+
+ iter = tny_list_create_iterator (priv->store_accounts);
+ while (!tny_iterator_is_done (iter) && !found) {
+ TnyAccount *account;
+
+ account = TNY_ACCOUNT (tny_iterator_get_current (iter));
+ if (modest_tny_account_is_memory_card_account (account)) {
+ found = TRUE;
+ mmc_account = g_object_ref (account);
+ }
+ g_object_unref (account);
+ tny_iterator_next (iter);
+ }
+ g_object_unref (iter);
+
+ if (found) {
+ /* Remove from the list */
+ tny_list_remove (priv->store_accounts, G_OBJECT (mmc_account));
+
+ /* Notify observers */
+ g_signal_emit (G_OBJECT (self),
+ signals [ACCOUNT_REMOVED_SIGNAL],
+ 0, mmc_account);
+
+ g_object_unref (mmc_account);
+ } else {
+ g_warning ("%s: there was no store account for the unmounted MMC",
+ __FUNCTION__);
+ }
}
-
g_free (uri);
}
+/**
+ * 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
-on_account_removed (ModestAccountMgr *acc_mgr,
- const gchar *account,
- gboolean server_account,
- gpointer user_data)
+modest_tny_account_store_forget_password_in_memory (ModestTnyAccountStore *self, const gchar * server_account_name)
{
- 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));
-
- g_signal_emit (G_OBJECT (self),
- tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNT_REMOVED],
- 0, store_account);
+ /* printf ("DEBUG: %s\n", __FUNCTION__); */
+ ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- g_object_unref (store_account);
- } else
- g_printerr ("modest: cannot find server account for %s", account);
+ if (server_account_name && priv->password_hash) {
+ g_hash_table_remove (priv->password_hash, server_account_name);
+ }
+}
+
+
+static gboolean
+update_tny_account_for_account (ModestTnyAccountStore *self, ModestAccountMgr *acc_mgr,
+ const gchar *account_name, TnyAccountType type)
+{
+ ModestTnyAccountStorePrivate *priv;
+ TnyList* account_list;
+ gboolean found = FALSE;
+ TnyIterator *iter = NULL;
+
+ g_return_val_if_fail (self, FALSE);
+ g_return_val_if_fail (account_name, FALSE);
+ g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE ||
+ type == TNY_ACCOUNT_TYPE_TRANSPORT,
+ FALSE);
+
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+ account_list = (type == TNY_ACCOUNT_TYPE_STORE ? priv->store_accounts : priv->transport_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')
- */
- recreate_all_accounts (self);
+ iter = tny_list_create_iterator (account_list);
+ while (!tny_iterator_is_done (iter) && !found) {
+ TnyAccount *tny_account;
+ tny_account = TNY_ACCOUNT (tny_iterator_get_current (iter));
+ if (tny_account) {
+ const gchar* parent_name =
+ modest_tny_account_get_parent_modest_account_name_for_server_account (tny_account);
+ if (parent_name && strcmp (parent_name, account_name) == 0) {
+ found = TRUE;
+ modest_tny_account_update_from_account (tny_account, acc_mgr, account_name, type);
+ g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, tny_account);
+ }
+ g_object_unref (tny_account);
+ }
+ tny_iterator_next (iter);
+ }
- g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
- account);
+ if (iter)
+ g_object_unref (iter);
+
+ return found;
}
-static void
-on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account,
- const GSList *keys, gboolean server_account, gpointer user_data)
+static void
+on_account_changed (ModestAccountMgr *acc_mgr,
+ const gchar *account_name,
+ gpointer user_data)
{
ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
-
+
+ g_debug ("DEBUG: modest: %s\n", __FUNCTION__);
+
/* 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;
+// if (key && g_str_has_suffix ((const gchar *) key, MODEST_ACCOUNT_LAST_UPDATED))
+// return;
+
+ if (!update_tny_account_for_account (self, acc_mgr, account_name, TNY_ACCOUNT_TYPE_STORE))
+ g_warning ("%s: failed to update store account for %s", __FUNCTION__, account_name);
+ if (!update_tny_account_for_account (self, acc_mgr, account_name, TNY_ACCOUNT_TYPE_TRANSPORT))
+ g_warning ("%s: failed to update transport account for %s", __FUNCTION__, account_name);
+}
- /* FIXME: make this more finegrained; changes do not really affect _all_
- * accounts
- */
- recreate_all_accounts (self);
+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);
+}
- g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
- account);
+static void
+show_password_warning_only ()
+{
+ ModestWindow *main_window =
+ modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
+
+ /* Show an explanatory temporary banner: */
+ hildon_banner_show_information (
+ GTK_WIDGET(main_window), NULL, _("mcen_ib_username_pw_incorrect"));
}
+
+static void
+show_wrong_password_dialog (TnyAccount *account)
+{
+ /* 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__);
+ }
+
+ /* 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 ());
+
+ 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));
+ }
+}
+
-static ModestTnyAccountStore*
-get_account_store_for_account (TnyAccount *account)
+static void
+request_password_and_wait (ModestTnyAccountStore *account_store,
+ const gchar* server_account_id,
+ gchar **username,
+ gchar **password,
+ gboolean *cancel,
+ gboolean *remember)
{
- return MODEST_TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account),
- "account_store"));
+ g_signal_emit (G_OBJECT(account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0,
+ server_account_id, /* server_account_name */
+ username, password, cancel, remember);
}
/* This callback will be called by Tinymail when it needs the password
- * from the user, for instance if the password was not remembered.
- * It also calls forget_password() before calling this,
+ * 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_not_used, gboolean *cancel)
{
- /* Initialize the output parameter: */
+ /* 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 gchar *key;
- const TnyAccountStore *account_store;
- ModestTnyAccountStore *self;
+ const TnyAccountStore *account_store = NULL;
+ ModestTnyAccountStore *self = NULL;
ModestTnyAccountStorePrivate *priv;
gchar *username = NULL;
gchar *pwd = NULL;
- gpointer pwd_ptr;
- gboolean already_asked;
+ gpointer pwd_ptr = NULL;
+ gboolean already_asked = FALSE;
+ /* Initialize the output parameter: */
if (cancel)
*cancel = FALSE;
- key = tny_account_get_id (account);
- account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account));
+ const gchar *server_account_name = tny_account_get_id (account);
+ account_store = TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account),
+ "account_store"));
- if (!key || !account_store) {
- g_warning ("BUG: could not retrieve account_store for account %s",
- key ? key : "<NULL>");
+ 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;
}
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 = priv->password_hash &&
g_hash_table_lookup_extended (priv->password_hash,
- key,
+ 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 */
- /* 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 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: */
+ show_wrong_password_dialog (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;
- g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0,
- account_id, /* server_account_name */
+ if (already_asked) {
+ /* Show an info banner, before we show the protected password dialog: */
+ show_password_warning_only();
+ }
+
+ request_password_and_wait (self, account_id,
&username, &pwd, cancel, &remember);
if (!*cancel) {
* but we need to tell tinymail about the username too: */
tny_account_set_user (account, username);
+ /* Do not save the password in gconf,
+ * because the UI spec says "The password will never be saved in the account": */
+ /*
if (remember) {
printf ("%s: Storing username=%s, password=%s\n",
__FUNCTION__, username, pwd);
- modest_account_mgr_set_string (priv->account_mgr,key,
- MODEST_ACCOUNT_USERNAME,
- username, TRUE);
- modest_account_mgr_set_string (priv->account_mgr,key,
- MODEST_ACCOUNT_PASSWORD,
- pwd, TRUE);
+ 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;
gchar *pwd;
const gchar *key;
- account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account));
+ account_store = TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account),
+ "account_store"));
self = MODEST_TNY_ACCOUNT_STORE (account_store);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
key = tny_account_get_id (account);
}
/* Remove from configuration system */
+ /*
modest_account_mgr_unset (priv->account_mgr,
key, MODEST_ACCOUNT_PASSWORD, TRUE);
+ */
}
-
static void
modest_tny_account_store_finalize (GObject *obj)
{
+ GnomeVFSVolumeMonitor *volume_monitor;
ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(obj);
ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
- //gboolean debug = modest_runtime_get_debug_flags() & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS;
g_free (priv->cache_dir);
priv->cache_dir = NULL;
priv->password_hash = NULL;
}
+ /* Disconnect VFS signals */
+ volume_monitor = gnome_vfs_get_volume_monitor ();
+ if (g_signal_handler_is_connected (volume_monitor,
+ priv->volume_mounted_handler))
+ g_signal_handler_disconnect (volume_monitor,
+ priv->volume_mounted_handler);
+ if (g_signal_handler_is_connected (volume_monitor,
+ priv->volume_unmounted_handler))
+ g_signal_handler_disconnect (volume_monitor,
+ priv->volume_unmounted_handler);
+
if (priv->account_mgr) {
+ /* Disconnect signals */
+ if (g_signal_handler_is_connected (priv->account_mgr,
+ priv->acc_inserted_handler))
+ g_signal_handler_disconnect (priv->account_mgr,
+ priv->acc_inserted_handler);
+ if (g_signal_handler_is_connected (priv->account_mgr,
+ priv->acc_changed_handler))
+ g_signal_handler_disconnect (priv->account_mgr,
+ priv->acc_changed_handler);
+ if (g_signal_handler_is_connected (priv->account_mgr,
+ priv->acc_removed_handler))
+ g_signal_handler_disconnect (priv->account_mgr,
+ priv->acc_removed_handler);
+
g_object_unref (G_OBJECT(priv->account_mgr));
priv->account_mgr = NULL;
}
priv->device = NULL;
}
- /* this includes the local folder */
- account_list_free (priv->store_accounts);
- priv->store_accounts = NULL;
-
- account_list_free (priv->transport_accounts);
- priv->transport_accounts = NULL;
+ /* Destroy all accounts. Disconnect all accounts before they are destroyed */
+ if (priv->store_accounts) {
+ tny_list_foreach (priv->store_accounts, foreach_account_disconnect, NULL);
+ g_object_unref (priv->store_accounts);
+ priv->store_accounts = NULL;
+ }
+
+ if (priv->transport_accounts) {
+ tny_list_foreach (priv->transport_accounts, foreach_account_disconnect, NULL);
+ g_object_unref (priv->transport_accounts);
+ priv->transport_accounts = NULL;
+ }
+ if (priv->store_accounts_outboxes) {
+ g_object_unref (priv->store_accounts_outboxes);
+ priv->store_accounts_outboxes = NULL;
+ }
+
if (priv->session) {
camel_object_unref (CAMEL_OBJECT(priv->session));
priv->session = NULL;
ModestTnyAccountStore*
-modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device) {
-
+modest_tny_account_store_new (ModestAccountMgr *account_mgr,
+ TnyDevice *device)
+{
GObject *obj;
ModestTnyAccountStorePrivate *priv;
-// TnyList *list;
+ TnyAccount *local_account = NULL;
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));
-
- 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);
- g_signal_connect (G_OBJECT(account_mgr), "account_removed",
- G_CALLBACK (on_account_removed), 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)
-{
- ModestTnyAccountStorePrivate *priv;
- GSList *accounts, *cursor;
-
- priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- accounts = (type == TNY_ACCOUNT_TYPE_STORE ? priv->store_accounts : priv->transport_accounts);
-
- cursor = accounts;
- while (cursor) {
- if (cursor->data) {
- GObject *object = G_OBJECT(cursor->data);
- tny_list_prepend (list, object);
- }
-
- cursor = cursor->next;
+ if (!priv->session) {
+ g_warning ("failed to get TnySessionCamel");
+ return NULL;
}
-}
-static void
-create_per_account_local_outbox_folders (TnyAccountStore *self)
-{
- g_return_if_fail (self);
-
- 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;
+ /* Set the ui locker */
+ tny_session_camel_set_ui_locker (priv->session, tny_gtk_lockable_new ());
- /* 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 */
- };
+ /* Connect signals */
+ priv->acc_inserted_handler = g_signal_connect (G_OBJECT(account_mgr), "account_inserted",
+ G_CALLBACK (on_account_inserted), obj);
+ priv->acc_changed_handler = g_signal_connect (G_OBJECT(account_mgr), "account_changed",
+ G_CALLBACK (on_account_changed), obj);
+ priv->acc_removed_handler = g_signal_connect (G_OBJECT(account_mgr), "account_removed",
+ G_CALLBACK (on_account_removed), obj);
+
+ /* Create the lists of accounts */
+ priv->store_accounts = tny_simple_list_new ();
+ priv->transport_accounts = tny_simple_list_new ();
+ priv->store_accounts_outboxes = tny_simple_list_new ();
+
+ /* Create the local folders account */
+ local_account =
+ modest_tny_account_new_for_local_folders (priv->account_mgr, priv->session, NULL);
+ tny_list_append (priv->store_accounts, G_OBJECT(local_account));
+ g_object_unref (local_account);
+
+ /* Add the other remote accounts. Do this before adding the
+ local account, because we need to add our outboxes to the
+ global OUTBOX hosted in the local account */
+ add_existing_accounts (MODEST_TNY_ACCOUNT_STORE (obj));
- modest_account_mgr_free_account_names (account_names);
- account_names = NULL;
-
- priv->store_accounts_outboxes = accounts;
+ return MODEST_TNY_ACCOUNT_STORE(obj);
}
-/* 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;
-
- /* 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,
- type, priv->session,
- get_password,
- forget_password);
- 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 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_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, 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);
- }
- }
-
- /* 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, 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;
- }
-}
-
-
-static void
-modest_tny_account_store_get_accounts (TnyAccountStore *self, TnyList *list,
+modest_tny_account_store_get_accounts (TnyAccountStore *self,
+ TnyList *list,
TnyGetAccountsRequestType request_type)
{
ModestTnyAccountStorePrivate *priv;
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- if (request_type == TNY_ACCOUNT_STORE_BOTH) {
- modest_tny_account_store_get_accounts (self, list,
- TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
- modest_tny_account_store_get_accounts (self, list,
- TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS);
- return;
+ switch (request_type) {
+ case TNY_ACCOUNT_STORE_BOTH:
+ tny_list_foreach (priv->store_accounts, foreach_account_append_to_list, list);
+ tny_list_foreach (priv->transport_accounts, foreach_account_append_to_list, list);
+ break;
+ case TNY_ACCOUNT_STORE_STORE_ACCOUNTS:
+ tny_list_foreach (priv->store_accounts, foreach_account_append_to_list, list);
+ break;
+ case TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS:
+ tny_list_foreach (priv->transport_accounts, foreach_account_append_to_list, list);
+ break;
+ default:
+ g_return_if_reached ();
}
-
- if (request_type == TNY_ACCOUNT_STORE_STORE_ACCOUNTS) {
- if (!priv->store_accounts)
- get_server_accounts (self, list, TNY_ACCOUNT_TYPE_STORE);
- else
- get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_STORE);
-
- } else if (request_type == TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS) {
- if (!priv->transport_accounts)
- get_server_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT);
- else
- get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT);
- } else
- g_return_if_reached (); /* incorrect req type */
+
+ /* Initialize session. Why do we need this ??? */
+ tny_session_camel_set_initialized (priv->session);
}
static gboolean
-modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
+modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, 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)
&& (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) {
+ 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:
+ case TNY_ACCOUNT_ERROR_TRY_CONNECT_SERVICE_UNAVAILABLE:
+ /* 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.
* 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: */
_("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
+ /* Note: If the password was wrong then get_password() would be called again,
+ * instead of this vfunc being called. */
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",
if (!prompt)
return FALSE;
-#ifdef MODEST_PLATFORM_MAEMO
- /* The Tinymail documentation says that we should show Yes and No buttons,
- * 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,
+ ModestWindow *main_window =
+ modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
+ gboolean retval = TRUE;
+ if (question) {
+ /* The Tinymail documentation says that we should show Yes and No buttons,
+ * 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 = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (main_window),
prompt));
+ const int response = gtk_dialog_run (GTK_DIALOG (dialog));
+ if (question) {
+ retval = (response == GTK_RESPONSE_YES) ||
+ (response == GTK_RESPONSE_OK);
+ }
+
+ gtk_widget_destroy (dialog);
+
} else {
- dialog = GTK_WIDGET (hildon_note_new_information (NULL,
- prompt));
+ /* Just show the error text and use the default response: */
+ modest_maemo_show_information_note_and_forget(GTK_WINDOW (main_window),
+ prompt);
}
-#else
-
- GtkMessageType gtktype = GTK_MESSAGE_ERROR;
- switch (type)
- {
- case TNY_ALERT_TYPE_INFO:
- gtktype = GTK_MESSAGE_INFO;
- break;
- case TNY_ALERT_TYPE_WARNING:
- gtktype = GTK_MESSAGE_WARNING;
- break;
- case TNY_ALERT_TYPE_ERROR:
- default:
- gtktype = GTK_MESSAGE_ERROR;
- break;
- }
-
- GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
- gtktype, GTK_BUTTONS_YES_NO, prompt);
-#endif /* #ifdef MODEST_PLATFORM_MAEMO */
-
- 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);
return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self)->session;
}
-
-static void
-fill_server_account_cache_if_needed (ModestTnyAccountStore *self)
+static TnyAccount*
+get_tny_account_by (TnyList *accounts,
+ ModestTnyAccountStoreQueryType type,
+ const gchar *str)
{
- /* cache if needed */
- ModestTnyAccountStorePrivate *priv;
- priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+ TnyIterator *iter = NULL;
+ gboolean found = FALSE;
+ TnyAccount *retval = NULL;
- TnyList* list = TNY_LIST(tny_simple_list_new());
- if (!priv->store_accounts)
- modest_tny_account_store_get_accounts (TNY_ACCOUNT_STORE(self),
- list, TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
- g_object_unref (list);
-
- list = TNY_LIST(tny_simple_list_new());
- if (!priv->transport_accounts)
- modest_tny_account_store_get_accounts (TNY_ACCOUNT_STORE(self),
- list, TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS);
- g_object_unref (list);
-}
+ iter = tny_list_create_iterator (accounts);
+ while (!tny_iterator_is_done (iter) && !found) {
+ TnyAccount *tmp_account = NULL;
+ const gchar *val = NULL;
+ tmp_account = TNY_ACCOUNT (tny_iterator_get_current (iter));
+ switch (type) {
+ case MODEST_TNY_ACCOUNT_STORE_QUERY_ID:
+ val = tny_account_get_id (tmp_account);
+ break;
+ case MODEST_TNY_ACCOUNT_STORE_QUERY_URL:
+ val = tny_account_get_url_string (tmp_account);
+ break;
+ }
+
+ if (type == MODEST_TNY_ACCOUNT_STORE_QUERY_URL &&
+ tny_account_matches_url_string (tmp_account, str)) {
+ retval = g_object_ref (tmp_account);
+ found = TRUE;
+ } else {
+ if (strcmp (val, str) == 0) {
+ retval = g_object_ref (tmp_account);
+ found = TRUE;
+ }
+ }
+ g_object_unref (tmp_account);
+ tny_iterator_next (iter);
+ }
+ g_object_unref (iter);
+
+ return retval;
+}
TnyAccount*
modest_tny_account_store_get_tny_account_by (ModestTnyAccountStore *self,
{
TnyAccount *account = NULL;
ModestTnyAccountStorePrivate *priv;
- GSList *cursor;
- const gchar *val = NULL;
-
+
g_return_val_if_fail (self, NULL);
g_return_val_if_fail (str, NULL);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
- fill_server_account_cache_if_needed (self);
-
+
/* Search in store accounts */
- for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) {
- 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), str)) {
- account = TNY_ACCOUNT (cursor->data);
- goto end;
- } else {
- if (strcmp (val, str) == 0) {
- account = TNY_ACCOUNT(cursor->data);
- goto end;
- }
- }
+ account = get_tny_account_by (priv->store_accounts, type, str);
+
+ /* If we already found something, no need to search the transport accounts */
+ if (!account) {
+ account = get_tny_account_by (priv->transport_accounts, type, str);
+
+ /* If we already found something, no need to search the
+ per-account outbox accounts */
+ if (!account)
+ account = get_tny_account_by (priv->store_accounts_outboxes, type, str);
}
-
- /* if we already found something, no need to search the transport accounts */
- for (cursor = priv->transport_accounts; !account && cursor ; cursor = cursor->next) {
- 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;
- }
- }
+
+ /* Warn if nothing was found. This is generally unusual. */
+ if (!account) {
+ g_warning("%s: Failed to find account with %s=%s\n",
+ __FUNCTION__,
+ (type == MODEST_TNY_ACCOUNT_STORE_QUERY_ID) ? "ID" : "URL",
+ str);
}
- end:
- if (account)
- g_object_ref (G_OBJECT(account));
-
+
+ /* Returns a new reference to the account if found */
return account;
}
TnyAccount*
modest_tny_account_store_get_server_account (ModestTnyAccountStore *self,
- const gchar *account_name,
- TnyAccountType type)
+ const gchar *account_name,
+ TnyAccountType type)
{
- TnyAccount *account = NULL;
- gchar *id = NULL;
- ModestTnyAccountStorePrivate *priv;
+ ModestTnyAccountStorePrivate *priv = NULL;
+ TnyAccount *retval = NULL;
+ TnyList *account_list = NULL;
+ TnyIterator *iter = NULL;
+ gboolean found;
g_return_val_if_fail (self, NULL);
g_return_val_if_fail (account_name, NULL);
- g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE || type == TNY_ACCOUNT_TYPE_TRANSPORT,
+ g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE ||
+ type == TNY_ACCOUNT_TYPE_TRANSPORT,
NULL);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- /* 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 (account_data->transport_account)
- id = g_strdup (account_data->transport_account->account_name);
+ account_list = (type == TNY_ACCOUNT_TYPE_STORE) ?
+ priv->store_accounts :
+ priv->transport_accounts;
- modest_account_mgr_free_account_data (priv->account_mgr, account_data);
+ if (!account_list) {
+ g_printerr ("%s: No server accounts of type %s\n", __FUNCTION__,
+ (type == TNY_ACCOUNT_TYPE_STORE) ? "store" : "transport");
+ return NULL;
+ }
+
+ /* Look for the server account */
+ found = FALSE;
+ iter = tny_list_create_iterator (account_list);
+ while (!tny_iterator_is_done (iter) && !found) {
+ const gchar *modest_acc_name;
+ TnyAccount *tmp_account;
+
+ tmp_account = TNY_ACCOUNT (tny_iterator_get_current (iter));
+ modest_acc_name =
+ modest_tny_account_get_parent_modest_account_name_for_server_account (tmp_account);
+
+ if (!strcmp (account_name, modest_acc_name)) {
+ found = TRUE;
+ retval = g_object_ref (tmp_account);
+ }
+ /* Free and continue */
+ g_object_unref (tmp_account);
+ tny_iterator_next (iter);
}
- 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 (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",
- account_name, id ? id : "<none>");
+ if (!found) {
+ g_printerr ("modest: %s: could not get tny %s account for %s\n." \
+ "Number of server accounts of this type=%d\n", __FUNCTION__,
+ (type == TNY_ACCOUNT_TYPE_STORE) ? "store" : "transport",
+ account_name, tny_list_get_length (account_list));
+ }
- return account;
+ /* Returns a new reference */
+ return retval;
}
static TnyAccount*
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);
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) {
- /* 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;
return account;
}
-gboolean
-modest_tny_account_is_virtual_local_folders (TnyAccount *self)
+TnyAccount*
+modest_tny_account_store_get_local_folders_account (ModestTnyAccountStore *self)
{
- /* We should make this more sophisticated if we ever use ModestTnyLocalFoldersAccount
- * for anything else. */
- return MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (self);
-}
+ TnyAccount *account = NULL;
+ ModestTnyAccountStorePrivate *priv;
+ TnyIterator *iter;
+ gboolean found;
+ g_return_val_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (self), NULL);
+
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-gboolean
-modest_tny_account_is_memory_card_account (TnyAccount *self)
-{
- if (!self)
- return FALSE;
+ found = FALSE;
+ iter = tny_list_create_iterator (priv->store_accounts);
+ while (!tny_iterator_is_done (iter) && !found) {
+ TnyAccount *tmp_account;
- const gchar* account_id = tny_account_get_id (self);
- if (!account_id)
- return FALSE;
+ tmp_account = TNY_ACCOUNT (tny_iterator_get_current (iter));
+ if (modest_tny_account_is_virtual_local_folders (tmp_account)) {
+ account = g_object_ref (tmp_account);
+ found = TRUE;
+ }
+ g_object_unref (tmp_account);
+ tny_iterator_next (iter);
+ }
+ g_object_unref (iter);
+
+ /* Returns a new reference to the account */
+ return account;
+}
+
+/*********************************************************************************/
+static void
+add_existing_accounts (ModestTnyAccountStore *self)
+{
+ GSList *account_names = NULL, *iter = NULL;
+ ModestTnyAccountStorePrivate *priv = NULL;
- return (strcmp (account_id, MODEST_MMC_ACCOUNT_ID) == 0);
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ /* These are account names, not server_account names */
+ account_names = modest_account_mgr_account_names (priv->account_mgr, FALSE);
+
+ for (iter = account_names; iter != NULL; iter = g_slist_next (iter)) {
+ const gchar *account_name = (const gchar*) iter->data;
+
+ /* Insert all enabled accounts without notifying */
+ if (modest_account_mgr_get_enabled (priv->account_mgr, account_name))
+ insert_account (self, account_name, FALSE);
+ }
+ modest_account_mgr_free_account_names (account_names);
}
-TnyAccount*
-modest_tny_account_store_get_local_folders_account (TnyAccountStore *self)
+static TnyAccount*
+create_tny_account (ModestTnyAccountStore *self,
+ const gchar *name,
+ TnyAccountType type)
{
TnyAccount *account = NULL;
- ModestTnyAccountStorePrivate *priv;
- GSList *cursor;
+ ModestTnyAccountStorePrivate *priv = NULL;
+
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- g_return_val_if_fail (self, NULL);
+ account = modest_tny_account_new_from_account (priv->account_mgr,
+ name, type,
+ priv->session,
+ get_password,
+ forget_password);
+
+ if (account) {
+ /* Forget any cached password for the account, so that
+ we use a new account if any */
+ modest_tny_account_store_forget_password_in_memory (self,
+ tny_account_get_id (account));
+ /* Set the account store */
+ g_object_set_data (G_OBJECT(account), "account_store", self);
+ } else {
+ g_printerr ("modest: failed to create account for %s\n", name);
+ }
+
+ return account;
+}
+
+/*
+ * This function will be used for both adding new accounts and for the
+ * initialization. In the initialization we do not want to emit
+ * signals so notify will be FALSE, in the case of account additions
+ * we do want to notify the observers
+ */
+static void
+insert_account (ModestTnyAccountStore *self,
+ const gchar *account,
+ gboolean notify)
+{
+ ModestTnyAccountStorePrivate *priv = NULL;
+ TnyAccount *store_account = NULL, *transport_account = 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;
- }
+ /* Get the server and the transport account */
+ store_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_STORE);
+ transport_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT);
+
+ /* Add to the list, and notify the observers */
+ if (store_account) {
+ tny_list_append (priv->store_accounts, G_OBJECT (store_account));
+ if (notify)
+ g_signal_emit (G_OBJECT (self), signals [ACCOUNT_INSERTED_SIGNAL], 0, store_account);
+ g_object_unref (store_account);
}
- if (account)
- g_object_ref (G_OBJECT(account));
+ /* Add to the list, and notify the observers */
+ if (transport_account) {
+ TnyAccount *account_outbox = NULL, *local_account = NULL;
+ TnyFolder *per_account_outbox = NULL;
+ TnyList *folders;
+ TnyIterator *iter_folders;
+
+ /* Add account to the list */
+ tny_list_append (priv->transport_accounts, G_OBJECT (transport_account));
+
+ /* Add connection-specific transport accounts */
+ add_connection_specific_transport_accounts (self, account);
+
+ /* Create per account local outbox */
+ account_outbox =
+ modest_tny_account_new_for_per_account_local_outbox_folder (priv->account_mgr,
+ account,
+ priv->session);
+ tny_list_append (priv->store_accounts_outboxes, G_OBJECT (account_outbox));
+
+ /* Get the outbox folder */
+ folders = tny_simple_list_new ();
+ tny_folder_store_get_folders (TNY_FOLDER_STORE (account_outbox),
+ folders, NULL, NULL);
+ g_assert (tny_list_get_length (folders) == 1);
+
+ iter_folders = tny_list_create_iterator (folders);
+ per_account_outbox = TNY_FOLDER (tny_iterator_get_current (iter_folders));
+ g_object_unref (iter_folders);
+ g_object_unref (account_outbox);
+
+ /* Add the outbox of the new per-account-local-outbox
+ account to the global local merged OUTBOX of the
+ local folders account */
+ local_account = modest_tny_account_store_get_local_folders_account (MODEST_TNY_ACCOUNT_STORE (self));
+ modest_tny_local_folders_account_add_folder_to_outbox (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (local_account),
+ per_account_outbox);
+ g_object_unref (local_account);
+ g_object_unref (per_account_outbox);
+
+ /* Notify the observers */
+ if (notify)
+ g_signal_emit (G_OBJECT (self), signals [ACCOUNT_INSERTED_SIGNAL], 0, transport_account);
+ g_object_unref (transport_account);
+ }
+}
+
+static void
+on_account_inserted (ModestAccountMgr *acc_mgr,
+ const gchar *account,
+ gpointer user_data)
+{
+ /* Insert the account and notify the observers */
+ insert_account (MODEST_TNY_ACCOUNT_STORE (user_data), account, TRUE);
+}
+
+static void
+on_account_removed (ModestAccountMgr *acc_mgr,
+ const gchar *account,
+ gpointer user_data)
+{
+ TnyAccount *store_account = NULL, *transport_account = NULL;
+ ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
- return account;
+ /* Get the server and the transport account */
+ store_account =
+ modest_tny_account_store_get_server_account (self, account, TNY_ACCOUNT_TYPE_STORE);
+ transport_account =
+ modest_tny_account_store_get_server_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT);
+
+ /* If there was any problem creating the account, for example,
+ with the configuration system this could not exist */
+ if (store_account) {
+ /* Clear the cache */
+ tny_store_account_delete_cache (TNY_STORE_ACCOUNT (store_account));
+
+ /* Notify the observers */
+ g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, store_account);
+ g_object_unref (store_account);
+ } else {
+ g_warning ("There is no store account for account %s\n", account);
+ }
+
+ /* If there was any problem creating the account, for example,
+ with the configuration system this could not exist */
+ if (transport_account) {
+ /* Notify the observers */
+ g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, transport_account);
+ g_object_unref (transport_account);
+ } else {
+ g_warning ("There is no transport account for account %s\n", account);
+ }
}
+static void
+add_connection_specific_transport_accounts (ModestTnyAccountStore *self,
+ const gchar *account_name)
+{
+ ModestTnyAccountStorePrivate *priv = NULL;
+ GSList *list_specifics = NULL, *iter = NULL;
+
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+ 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: */
+ iter = list_specifics;
+ while (iter) {
+ /* The list alternates between the connection name and the transport name: */
+ 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) {
+ modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account,
+ account_name);
+ g_object_set_data (G_OBJECT(tny_account),
+ "account_store",
+ (gpointer)self);
+
+ tny_list_append (priv->transport_accounts, G_OBJECT (tny_account));
+ } else
+ g_printerr ("modest: failed to create smtp-specific account for %s\n",
+ transport_account_name);
+ }
+ }
+ iter = g_slist_next (iter);
+ }
+}
projects / modest / blobdiff