* all:
[modest] / src / modest-tny-account-store.c
index d4f3205..9868a51 100644 (file)
  */
 
 #include <string.h>
+#include <glib/gi18n.h>
 
-#include <tny-account-iface.h>
-#include <tny-account-store-iface.h>
-#include <tny-store-account-iface.h>
-#include <tny-transport-account-iface.h>
-#include <tny-device-iface.h>
-#include <tny-device.h>
+#include <tny-account.h>
 #include <tny-account-store.h>
-
 #include <tny-store-account.h>
 #include <tny-transport-account.h>
+#include <tny-simple-list.h>
+#include <tny-account-store.h>
+#include <tny-camel-transport-account.h>
+#include <tny-camel-imap-store-account.h>
+#include <tny-camel-pop-store-account.h>
+#include <modest-runtime.h>
+#include <modest-marshal.h>
+#include <modest-protocol-info.h>
+#include <modest-local-folder-info.h>
+#include <modest-tny-account.h>
+#include <modest-account-mgr.h>
+#include <modest-account-mgr-helpers.h>
 
-#include "modest-account-mgr.h"
 #include "modest-tny-account-store.h"
+#include "modest-tny-platform-factory.h"
+#include <tny-gtk-lockable.h>
+#include <camel/camel.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         (ModestTnyAccountStore *obj);
 static void modest_tny_account_store_finalize     (GObject *obj);
 
 /* implementations for tny-account-store-iface */
-static void    modest_tny_account_store_iface_init              (gpointer g_iface, gpointer iface_data);
-static void    modest_tny_account_store_add_store_account       (TnyAccountStoreIface *self,
-                                                                TnyStoreAccountIface *account);
-static void    modest_tny_account_store_add_transport_account   (TnyAccountStoreIface *self,
-                                                                TnyTransportAccountIface *account);
-static void    modest_tny_account_store_get_accounts            (TnyAccountStoreIface *iface, TnyListIface *list,
-                                                                TnyGetAccountsRequestType type);
+static void    modest_tny_account_store_instance_init (ModestTnyAccountStore *obj);
+static void    modest_tny_account_store_init          (gpointer g, gpointer iface_data);
+
+
 /* list my signals */
 enum {
-       PASSWORD_REQUESTED_SIGNAL,
        ACCOUNT_UPDATE_SIGNAL,
+       PASSWORD_REQUESTED_SIGNAL,
        LAST_SIGNAL
 };
 
-/* Password Status */
-enum {
-        PW_NOT_INVALID,
-        PW_INVALID
-};
-
 typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate;
 struct _ModestTnyAccountStorePrivate {
-
-       GMutex *store_lock;     
-       gchar *cache_dir;
-
-       TnySessionCamel *tny_session_camel;
-       TnyDeviceIface  *device;
-
-        ModestAccountMgr *account_mgr;
-        gint pw_invalid;
-        ModestTnyGetPassFunc get_pass_func;
+       gchar              *cache_dir;  
+       GHashTable         *password_hash;
+       ModestAccountMgr   *account_mgr;
+       TnySessionCamel    *session;
+       TnyDevice          *device;
+       
+       /* we cache them here */
+       GSList             *store_accounts;
+       GSList             *transport_accounts;
 };
+
 #define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                       MODEST_TYPE_TNY_ACCOUNT_STORE, \
                                                       ModestTnyAccountStorePrivate))
+
 /* globals */
 static GObjectClass *parent_class = NULL;
 
@@ -94,6 +95,7 @@ GType
 modest_tny_account_store_get_type (void)
 {
        static GType my_type = 0;
+
        if (!my_type) {
                static const GTypeInfo my_info = {
                        sizeof(ModestTnyAccountStoreClass),
@@ -103,20 +105,21 @@ modest_tny_account_store_get_type (void)
                        NULL,           /* class finalize */
                        NULL,           /* class data */
                        sizeof(ModestTnyAccountStore),
-                       1,              /* n_preallocs */
-                       (GInstanceInitFunc) modest_tny_account_store_init,
+                       0,              /* n_preallocs */
+                       (GInstanceInitFunc) modest_tny_account_store_instance_init,
+                       NULL
                };
 
                static const GInterfaceInfo iface_info = {
-                       (GInterfaceInitFunc) modest_tny_account_store_iface_init,
+                       (GInterfaceInitFunc) modest_tny_account_store_init,
                        NULL,         /* interface_finalize */
                        NULL          /* interface_data */
                 };
                /* hack hack */
-               my_type = g_type_register_static (TNY_TYPE_ACCOUNT_STORE,
-                                                 "ModestTnyAccountStore", &my_info, 0);
-
-               g_type_add_interface_static (my_type, TNY_TYPE_ACCOUNT_STORE_IFACE,
+               my_type = g_type_register_static (G_TYPE_OBJECT,
+                                                 "ModestTnyAccountStore",
+                                                 &my_info, 0);
+               g_type_add_interface_static (my_type, TNY_TYPE_ACCOUNT_STORE,
                                             &iface_info);
        }
        return my_type;
@@ -134,16 +137,7 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass)
        g_type_class_add_private (gobject_class,
                                  sizeof(ModestTnyAccountStorePrivate));
 
-       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,
-                             g_cclosure_marshal_VOID__STRING,
-                             G_TYPE_NONE, 1, G_TYPE_STRING);
-
-       signals[ACCOUNT_UPDATE_SIGNAL] =
+        signals[ACCOUNT_UPDATE_SIGNAL] =
                g_signal_new ("account_update",
                              G_TYPE_FROM_CLASS (gobject_class),
                              G_SIGNAL_RUN_FIRST,
@@ -151,23 +145,49 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass)
                              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,
+                              G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER,
+                              G_TYPE_POINTER);
 }
 
+
 static void
-modest_tny_account_store_init (ModestTnyAccountStore *obj)
+modest_tny_account_store_instance_init (ModestTnyAccountStore *obj)
 {
        ModestTnyAccountStorePrivate *priv =
                MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
 
-       priv->account_mgr         = NULL;
-       priv->device                 = NULL;
        priv->cache_dir              = NULL;
+       priv->account_mgr            = NULL;
+       priv->session                = NULL;
+       priv->device                 = NULL;
+       
+       priv->password_hash          = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                                             g_free, g_free);
+}
 
-        priv->tny_session_camel      = NULL;
-        /* Meaning: if not indicated otherwise, we have valid password data */
-        priv->pw_invalid             = PW_NOT_INVALID;
-        priv->get_pass_func          = NULL;
+static void
+account_list_free (GSList *accounts)
+{
+       GSList *cursor = accounts;
+       gboolean debug = modest_runtime_get_debug_flags() & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS;
+
+       while (cursor) {
+               g_object_unref (G_OBJECT(cursor->data));
+               if (debug && G_IS_OBJECT(cursor->data))
+                       g_warning ("BUG: account %s still holds %d ref(s)",
+                                  tny_account_get_id (TNY_ACCOUNT(cursor->data)),
+                                  G_OBJECT(cursor->data)->ref_count);
+               cursor = cursor->next;
+       }
+       g_slist_free (accounts);
 }
 
 
@@ -175,11 +195,20 @@ static void
 on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean server_account,
                    gpointer user_data)
 {
-       ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
-
+       ModestTnyAccountStore *self        = MODEST_TNY_ACCOUNT_STORE(user_data);
+       ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       /* 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')
+        */
+       account_list_free (priv->store_accounts);
+       priv->store_accounts = NULL;
+       
+       account_list_free (priv->transport_accounts);
+       priv->transport_accounts = NULL;
+       
        g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
                       account);
-       
 }
 
 
@@ -188,428 +217,415 @@ on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean se
                    const gchar *key, gpointer user_data)
 {
        ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
+       ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       
+       /* 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')
+        */
+       account_list_free (priv->store_accounts);
+       priv->store_accounts = NULL;
        
+       account_list_free (priv->transport_accounts);
+       priv->transport_accounts = NULL;
+
        g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
                       account);
 }
 
 
+static ModestTnyAccountStore*
+get_account_store_for_account (TnyAccount *account)
+{
+       return MODEST_TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account),
+                                                          "account_store"));
+}
 
 static gchar*
-get_password (TnyAccountIface *account, const gchar *prompt, gboolean *cancel)
+get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel)
 {
-       
        const gchar *key;
-       const TnyAccountStoreIface *account_store;
+       const TnyAccountStore *account_store;
        ModestTnyAccountStore *self;
        ModestTnyAccountStorePrivate *priv;
-       gchar *retval;
-
-       g_return_val_if_fail (account, NULL);
+       gchar *pwd = NULL;
+       gpointer pwd_ptr;
+       gboolean already_asked;
+       
+       key           = tny_account_get_id (account);
+       account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account));
        
-       key = tny_account_iface_get_id (account);
-       account_store = tny_account_iface_get_account_store(account);
-
        self = MODEST_TNY_ACCOUNT_STORE (account_store);
         priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
-        if (priv->pw_invalid==PW_NOT_INVALID) {
-                retval = modest_account_mgr_get_string (priv->account_mgr,
-                                                       key,
-                                                       MODEST_ACCOUNT_PASSWORD,
-                                                       TRUE,
-                                                       NULL);
-        } else {
-                retval = priv->get_pass_func(account, prompt, cancel);
-                if (!*cancel) {
-                        priv->pw_invalid=PW_NOT_INVALID;
-                        modest_account_mgr_set_string(priv->account_mgr,
+       
+       /* 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,
-                                                     MODEST_ACCOUNT_PASSWORD,
-                                                     retval, TRUE, 
-                                                     NULL);
-                }
-        }
-        return retval;
-}
-
+                                                     NULL,
+                                                     (gpointer*)&pwd_ptr);
+
+       /* 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));
+       }
 
-static void
-forget_password (TnyAccountIface *account) {
+       /* if it was already asked, it must have been wrong, so ask again */
+       if (already_asked || !pwd || strlen(pwd) == 0) {
 
-       ModestTnyAccountStore *self;
-       ModestTnyAccountStorePrivate *priv;
-       const TnyAccountStoreIface *account_store;
-
-        account_store = tny_account_iface_get_account_store(account);
-       self = MODEST_TNY_ACCOUNT_STORE (account_store);
-        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
-        priv->pw_invalid=PW_INVALID;
+               /* we don't have it yet. Get the password from the user */
+               const gchar* name = tny_account_get_name (account);
+               gboolean remember = FALSE;
+               pwd = NULL;
+               
+               g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0,
+                              name, &pwd, cancel, &remember);
+               
+               if (!*cancel) {
+                       if (remember)
+                               modest_account_mgr_set_string (priv->account_mgr,key,
+                                                              MODEST_ACCOUNT_PASSWORD,
+                                                              pwd, TRUE);
+                       /* 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));
+               } else {
+                       g_hash_table_remove (priv->password_hash, key);
+                       g_free (pwd);
+                       pwd = NULL;
+               }
+       } else
+               *cancel = FALSE;
+       return pwd;
 }
 
 
-/* create a tnyaccount for the server account connected to the account with name 'key'
- */
-static TnyAccountIface*
-tny_account_from_name (ModestTnyAccountStore *self, const gchar *account, 
-                      const gchar *server_account, ModestProtoType modest_type)
+static void
+forget_password (TnyAccount *account)
 {
-       TnyAccountIface *tny_account;
+       ModestTnyAccountStore *self;
        ModestTnyAccountStorePrivate *priv;
-       gchar *val;
-
-       g_return_val_if_fail (self, NULL);
-       g_return_val_if_fail (account, NULL);
-       g_return_val_if_fail (server_account, NULL);
-
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
-       /* is it a store or a transport? */
-       if  (modest_type == MODEST_PROTO_TYPE_STORE) 
-               tny_account = TNY_ACCOUNT_IFACE(tny_store_account_new ());
-       else if (modest_type == MODEST_PROTO_TYPE_TRANSPORT)
-               tny_account = TNY_ACCOUNT_IFACE(tny_transport_account_new ());
-       else
-               g_assert_not_reached ();
-
-       if (!tny_account) {
-               g_printerr ("modest: failed to create new tny account for '%s:%s'\n",
-                           account, server_account);
-               return NULL;
-       }
+       const TnyAccountStore *account_store;
+       gchar *pwd;
+       const gchar *key;
        
-       tny_account_iface_set_account_store (TNY_ACCOUNT_IFACE(tny_account),
-                                            TNY_ACCOUNT_STORE_IFACE(self));
-       /* id */
-       tny_account_iface_set_id (tny_account, server_account);
-       tny_account_iface_set_name (tny_account, account);
-
-       /* proto */
-       val = modest_account_mgr_get_string (priv->account_mgr, server_account,
-                                            MODEST_ACCOUNT_PROTO, TRUE, NULL);
-       if (val) {
-               tny_account_iface_set_proto (tny_account, val);
-               g_free (val);
-       } else {
-               g_printerr ("modest: protocol not defined for '%s:%s'\n", 
-                           account, server_account);
-               g_object_unref (G_OBJECT(tny_account));
-               return NULL;
-       }
-
-       /* hostname */
-       val = modest_account_mgr_get_string (priv->account_mgr, server_account,
-                                            MODEST_ACCOUNT_HOSTNAME, TRUE,
-                                            NULL);
-       if (val) {
-               tny_account_iface_set_hostname (tny_account, val);
-               g_free (val);
-       }
-
-       /* username */
-       val = modest_account_mgr_get_string (priv->account_mgr, server_account,
-                                            MODEST_ACCOUNT_USERNAME, TRUE,
-                                            NULL);
-       if (val) {
-               tny_account_iface_set_user (tny_account, val);
-               g_free (val);
+        account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account));
+       self = MODEST_TNY_ACCOUNT_STORE (account_store);
+        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       key  = tny_account_get_id (account);
+
+       /* Do not remove the key, this will allow us to detect that we
+          have already asked for it at least once */
+       pwd = g_hash_table_lookup (priv->password_hash, key);
+       if (pwd) {
+               memset (pwd, 0, strlen (pwd));
+               g_hash_table_insert (priv->password_hash, g_strdup (key), NULL);
        }
 
-       tny_account_iface_set_pass_func (tny_account, get_password);
-        tny_account_iface_set_forget_pass_func (tny_account, forget_password);
-
-       return tny_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)
 {
-       ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(obj);
-       ModestTnyAccountStorePrivate *priv =
-               MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       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;
+       
+       if (priv->password_hash) {
+               g_hash_table_destroy (priv->password_hash);
+               priv->password_hash = NULL;
+       }
 
        if (priv->account_mgr) {
                g_object_unref (G_OBJECT(priv->account_mgr));
                priv->account_mgr = NULL;
        }
 
-       
-       if (priv->tny_session_camel) {
-// FIXME: how to kill a camel
-               //g_object_unref (G_OBJECT(priv->tny_session_camel));
-               priv->tny_session_camel = NULL;
-       }
-
        if (priv->device) {
                g_object_unref (G_OBJECT(priv->device));
                priv->device = NULL;
        }
 
-       if (priv->store_lock)
-               g_mutex_free (priv->store_lock);
-
-       g_free (priv->cache_dir);
-       priv->cache_dir = 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;
+
+       if (priv->session) {
+               camel_object_unref (CAMEL_OBJECT(priv->session));
+               if (debug && CAMEL_IS_OBJECT(priv->session))
+                               g_warning ("BUG: TnyCamelSession still holds %d ref(s)",
+                                  CAMEL_OBJECT(priv->session)->ref_count);     
+               priv->session = NULL;
+       }
+       
+       G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
 
 ModestTnyAccountStore*
-modest_tny_account_store_new (ModestAccountMgr *account_mgr) {
+modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device) {
 
        GObject *obj;
        ModestTnyAccountStorePrivate *priv;
-
+       TnyList *list;
+       
        g_return_val_if_fail (account_mgr, NULL);
+       g_return_val_if_fail (device, NULL);
 
        obj  = G_OBJECT(g_object_new(MODEST_TYPE_TNY_ACCOUNT_STORE, NULL));
-
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
 
-       g_object_ref(G_OBJECT(account_mgr));
        priv->account_mgr = account_mgr;
+       g_object_ref (G_OBJECT(priv->account_mgr));
 
+       priv->device = device;
+       g_object_ref (priv->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? */
+
+       /* 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_CALLBACK (on_account_changed), obj);
        g_signal_connect (G_OBJECT(account_mgr), "account_removed",
-                         G_CALLBACK (on_account_removed), obj);
-
-       priv->store_lock = g_mutex_new ();
-
-       priv->device = (TnyDeviceIface*)tny_device_new();
-       if (!priv->device) {
-               g_printerr ("modest: cannot create device instance\n");
-               g_object_unref (obj);
-               return NULL;
-       }
-       
-       priv->tny_session_camel = tny_session_camel_new (TNY_ACCOUNT_STORE_IFACE(obj));
-
-       if (!priv->tny_session_camel) {
-               g_printerr ("modest: cannot create TnySessionCamel instance\n");
-               g_object_unref (obj);
-               return NULL;
-       }
+                                      G_CALLBACK (on_account_removed), obj);
 
        return MODEST_TNY_ACCOUNT_STORE(obj);
 }
 
 
-static gboolean
-add_account  (TnyAccountStoreIface *self, TnyAccountIface *account) {
-
-       TnyAccountIface       *account_iface;
-       ModestTnyAccountStore *account_store;
+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);
 
-       const gchar *account_name;
-       const gchar *hostname, *username, *proto;
-
-       g_return_val_if_fail (self, FALSE);
-       g_return_val_if_fail (account, FALSE);
-
-       account_iface  = TNY_ACCOUNT_IFACE(account);
-       account_store  = MODEST_TNY_ACCOUNT_STORE(self);
-       priv           = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
-       account_name   = tny_account_iface_get_id(account_iface);
-       if (!account_name) {
-               g_printerr ("modest: failed to retrieve account name\n");
-               return FALSE;
+       cursor = accounts;
+       while (cursor) {
+               tny_list_prepend (list, G_OBJECT(cursor->data));
+               cursor = cursor->next;
        }
+}
 
-       hostname =  tny_account_iface_get_hostname(account_iface);
-       username =  tny_account_iface_get_user(account_iface);
-       proto    =  tny_account_iface_get_proto(account_iface);
+/* 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)
+{
+       ModestTnyAccountStorePrivate *priv;
+       GSList                       *account_names, *cursor;
+       GSList                       *accounts = NULL;
+       
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       account_names = modest_account_mgr_account_names (priv->account_mgr);
+       
+       for (cursor = account_names; cursor; cursor = cursor->next) {
+               
+               gchar *account_name = (gchar*)cursor->data;
+               
+               /* only return enabled accounts */
+               if (modest_account_mgr_get_enabled(priv->account_mgr, account_name)) {
+                       TnyAccount *tny_account = 
+                               modest_tny_account_new_from_account (priv->account_mgr,
+                                                                    account_name,
+                                                                    type, priv->session,
+                                                                    get_password,
+                                                                    forget_password);
+                       if (tny_account) { /* something went wrong */
+                               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 */
+                       } else
+                               g_printerr ("modest: failed to create account for %s\n",
+                                           account_name);
+               }
+               g_free (account_name);
+       }
+       g_slist_free (account_names);
+
+       /* also, add the local folder pseudo-account */
+       if (type == TNY_ACCOUNT_TYPE_STORE) {
+               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 modest_account_mgr_add_server_account (priv->account_mgr,
-                                                     account_name,
-                                                     hostname, username, NULL,
-                                                     proto);
+       return accounts;
 }
-
+       
 
 static void
-modest_tny_account_store_add_store_account  (TnyAccountStoreIface *self,
-                                            TnyStoreAccountIface *account)
+modest_tny_account_store_get_accounts  (TnyAccountStore *self, TnyList *list,
+                                       TnyGetAccountsRequestType request_type)
 {
-       if (!add_account (self, TNY_ACCOUNT_IFACE(account)))
-               g_printerr ("modest: failed to add store account\n");
+       ModestTnyAccountStorePrivate *priv;
+       
+       g_return_if_fail (self);
+       g_return_if_fail (TNY_IS_LIST(list));
+       
+       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;
+       }
+       
+       if (request_type == TNY_ACCOUNT_STORE_STORE_ACCOUNTS)  {
+               
+               if (!priv->store_accounts)
+                       priv->store_accounts = get_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)
+                       priv->transport_accounts =
+                               get_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 */
+               return;
+       }
 }
 
 
-static void
-modest_tny_account_store_add_transport_account  (TnyAccountStoreIface *self,
-                                                TnyTransportAccountIface *account)
+static const gchar*
+modest_tny_account_store_get_cache_dir (TnyAccountStore *self)
 {
-       if (!add_account (self, TNY_ACCOUNT_IFACE(account)))
-               g_printerr ("modest: failed to add transport account\n");
+       ModestTnyAccountStorePrivate *priv;
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       
+       if (!priv->cache_dir)
+               priv->cache_dir = g_build_filename (g_get_home_dir(), 
+                                                   MODEST_DIR,
+                                                   MODEST_CACHE_DIR,
+                                                   "cache", NULL);
+       return priv->cache_dir;
 }
 
 
-static gchar*
-get_server_account_for_account (ModestTnyAccountStore *self, const gchar *account_name,
-                               ModestProtoType modest_type)
+/*
+ * callers need to unref
+ */
+static TnyDevice*
+modest_tny_account_store_get_device (TnyAccountStore *self)
 {
        ModestTnyAccountStorePrivate *priv;
-       gchar *server;
-       gchar *key;
 
+       g_return_val_if_fail (self, NULL);
+       
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
 
-       if (modest_type == MODEST_PROTO_TYPE_STORE)
-               key = MODEST_ACCOUNT_STORE_ACCOUNT;
-       else if (modest_type == MODEST_PROTO_TYPE_STORE)
-               key = MODEST_ACCOUNT_TRANSPORT_ACCOUNT;
+       if (priv->device)
+               return g_object_ref (G_OBJECT(priv->device));
        else
-               g_assert_not_reached();
-       
-       server = modest_account_mgr_get_string (priv->account_mgr,
-                                               account_name,
-                                               key, FALSE, NULL);
-       if (!server)
-               return NULL;
-       if (!modest_account_mgr_account_exists (priv->account_mgr,
-                                               server, TRUE, NULL)) {
-               g_free (server);
                return NULL;
-       }
-          
-       return server;
 }
 
 
 
-static void
-modest_tny_account_store_get_accounts  (TnyAccountStoreIface *iface,
-                                       TnyListIface *list,
-                                       TnyGetAccountsRequestType type)
+static gboolean
+modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
+                               const gchar *prompt)
 {
-       ModestTnyAccountStore        *self;
-       ModestTnyAccountStorePrivate *priv;
-       GSList                       *accounts, *cursor;
-       ModestProtoType              modest_type;
-       
-       g_return_if_fail (iface);
-
-       self = MODEST_TNY_ACCOUNT_STORE(iface);
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
-       switch (type) {
-       case TNY_ACCOUNT_STORE_IFACE_TRANSPORT_ACCOUNTS:
-               modest_type = MODEST_PROTO_TYPE_TRANSPORT;
+       GtkMessageType gtktype;
+       gboolean retval = FALSE;
+       GtkWidget *dialog;
+
+       switch (type)
+       {
+               case TNY_ALERT_TYPE_INFO:
+               gtktype = GTK_MESSAGE_INFO;
                break;
-       case TNY_ACCOUNT_STORE_IFACE_STORE_ACCOUNTS:
-               modest_type = MODEST_PROTO_TYPE_STORE;
+               case TNY_ALERT_TYPE_WARNING:
+               gtktype = GTK_MESSAGE_WARNING;
                break;
-       case TNY_ACCOUNT_STORE_IFACE_BOTH:
-               modest_type = MODEST_PROTO_TYPE_ANY;
+               case TNY_ALERT_TYPE_ERROR:
+               default:
+               gtktype = GTK_MESSAGE_ERROR;
                break;
-       default:
-               g_assert_not_reached ();
        }
 
-       cursor = accounts = modest_account_mgr_account_names (priv->account_mgr, NULL); 
-       while (cursor) {
-               gchar           *account_name;
-               gchar           *server_account;
-               TnyAccountIface *account_iface;
+       dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+               gtktype, GTK_BUTTONS_YES_NO, prompt);
 
-               account_name =  (gchar*)cursor->data;
+       if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
+               retval = TRUE;
 
-               if (!modest_account_mgr_account_get_enabled (priv->account_mgr, account_name)) { 
-                       g_free (account_name); 
-                       cursor = cursor->next;
-                       continue;
-               } 
-               
-               if (modest_type == MODEST_PROTO_TYPE_TRANSPORT || MODEST_PROTO_TYPE_ANY) {
-                       server_account = get_server_account_for_account (self, account_name,
-                                                                        MODEST_PROTO_TYPE_TRANSPORT);
-                       if (server_account)
-                               account_iface = tny_account_from_name (self, account_name, 
-                                                                      server_account,
-                                                                      MODEST_PROTO_TYPE_TRANSPORT);
-                       if (!account_iface)
-                               g_printerr ("modest: failed to create account iface for '%s:%s'\n",
-                                           account_name, server_account);
-                       else
-                               tny_list_iface_prepend (list, account_iface);
-                       g_free (server_account);
-               }
-               
-               if (modest_type == MODEST_PROTO_TYPE_STORE || MODEST_PROTO_TYPE_ANY) {
-                       server_account = get_server_account_for_account (self, account_name,
-                                                                        MODEST_PROTO_TYPE_STORE);
-                       if (server_account)
-                               account_iface = tny_account_from_name (self, account_name, 
-                                                                      server_account,
-                                                                      MODEST_PROTO_TYPE_STORE);
-                       if (!account_iface)
-                               g_printerr ("modest: failed to create account iface for '%s:%s'\n",
-                                           account_name, server_account);
-                       else
-                               tny_list_iface_prepend (list, account_iface);
-                       g_free (server_account);
-               }
+       gtk_widget_destroy (dialog);
 
-               g_free (account_name);
-               cursor = cursor->next;
-       }
-
-       g_slist_free (accounts);
-
-       tny_session_camel_set_current_accounts (priv->tny_session_camel,
-                                               list);
+       return retval;
 }
 
 
-static const gchar*
-modest_tny_account_store_get_cache_dir (TnyAccountStoreIface *self)
-{
-       ModestTnyAccountStorePrivate *priv;
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
 
-       if (!priv->cache_dir)
-               priv->cache_dir = g_build_filename (g_get_home_dir(),
-                                                   ".modest", "cache", NULL);
-       return priv->cache_dir;
-}
-
-
-static const TnyDeviceIface*
-modest_tny_account_store_get_device (TnyAccountStoreIface *self)
+static void
+modest_tny_account_store_add_store_account  (TnyAccountStore *self,
+                                            TnyStoreAccount *account)
 {
-       ModestTnyAccountStorePrivate *priv;
-
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
-
-       return priv->device;
+       /* we should not need this...*/
+       g_printerr ("modest: add_store_account_func not implemented\n");
 }
 
 
-static gboolean
-modest_tny_account_store_alert (TnyAccountStoreIface *self, TnyAlertType type,
-                               const gchar *prompt)
-{
-       return TRUE; /* FIXME: implement this */
+static void
+modest_tny_account_store_add_transport_account  (TnyAccountStore *self,
+                                                TnyTransportAccount *account)
+{      
+       /* we should not need this...*/
+       g_printerr ("modest: add_transport_account_func not implemented\n");
 }
 
 
+
 static void
-modest_tny_account_store_iface_init (gpointer g_iface, gpointer iface_data)
+modest_tny_account_store_init (gpointer g, gpointer iface_data)
 {
-        TnyAccountStoreIfaceClass *klass;
+        TnyAccountStoreIface *klass;
 
-       g_return_if_fail (g_iface);
+       g_return_if_fail (g);
 
-       klass = (TnyAccountStoreIfaceClass *)g_iface;
+       klass = (TnyAccountStoreIface *)g;
 
        klass->get_accounts_func =
                modest_tny_account_store_get_accounts;
-       klass->add_transport_account_func  =
+       klass->add_transport_account_func =
                modest_tny_account_store_add_transport_account;
        klass->add_store_account_func =
                modest_tny_account_store_add_store_account;
@@ -625,16 +641,89 @@ void
 modest_tny_account_store_set_get_pass_func (ModestTnyAccountStore *self,
                                            ModestTnyGetPassFunc func)
 {
-       return; /* not implemented, we use signals */
+       /* not implemented, we use signals */
+       g_printerr ("modest: set_get_pass_func not implemented\n");
 }
 
-
 TnySessionCamel*
-tny_account_store_get_session    (TnyAccountStore *self)
+tny_account_store_get_session  (TnyAccountStore *self)
 {
-       ModestTnyAccountStorePrivate *priv;
+       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)
+{
+       TnyAccount *account = NULL;
+       ModestTnyAccountStorePrivate *priv;     
+       GSList *cursor;
+
+       g_return_val_if_fail (self, NULL);
+       g_return_val_if_fail (id, NULL);
+       
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
 
-       return priv->tny_session_camel;
+       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);
+                       break;
+               }
+       }
+
+       /* 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);
+                       break;
+               }
+       }
+
+       if (account)
+               g_object_ref (G_OBJECT(account));
+       
+       return account;
+}
+
+
+TnyAccount*
+modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self,
+                                                    const gchar *account_name,
+                                                    TnyAccountType type)
+{
+       TnyAccount *account = NULL;
+       ModestAccountData *account_data;
+       const gchar *id = NULL;
+       ModestTnyAccountStorePrivate *priv;     
+
+       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,
+                             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;
+
+       if (id) 
+               account =  modest_tny_account_store_get_tny_account_by_id  (self, 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>");
+
+       modest_account_mgr_free_account_data (priv->account_mgr, account_data);
+       return account; 
 }