* Fix some detected memory leaks
[modest] / src / modest-tny-account-store.c
index 3bb21dd..3d70bb0 100644 (file)
 #include <tny-account-store.h>
 #include <tny-store-account.h>
 #include <tny-transport-account.h>
-#include <tny-device.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-account-mgr.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-tny-account-store.h"
 #include "modest-tny-platform-factory.h"
 #include <tny-gtk-lockable.h>
 #include <camel/camel.h>
 
+#ifdef MODEST_PLATFORM_MAEMO
+#include <tny-maemo-conic-device.h>
+#endif
+
 /* 'private'/'protected' functions */
 static void modest_tny_account_store_class_init   (ModestTnyAccountStoreClass *klass);
 //static void modest_tny_account_store_init         (ModestTnyAccountStore *obj);
@@ -54,34 +64,33 @@ 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_init                     (gpointer g, gpointer iface_data);
-static void    modest_tny_account_store_add_store_account       (TnyAccountStore *self,
-                                                                TnyStoreAccount *account);
-static void    modest_tny_account_store_add_transport_account   (TnyAccountStore *self,
-                                                                TnyTransportAccount *account);
-static void    modest_tny_account_store_get_accounts            (TnyAccountStore *iface, TnyList *list,
-                                                                TnyGetAccountsRequestType type);
 /* list my signals */
 enum {
-       PASSWORD_REQUESTED_SIGNAL,
        ACCOUNT_UPDATE_SIGNAL,
+       PASSWORD_REQUESTED_SIGNAL,
        LAST_SIGNAL
 };
 
 typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate;
 struct _ModestTnyAccountStorePrivate {
-       GMutex             *store_lock; 
-       gchar              *cache_dir;
+       gchar              *cache_dir;  
        GHashTable         *password_hash;
+       ModestAccountMgr   *account_mgr;
+       TnySessionCamel    *session;
        TnyDevice          *device;
-       TnyPlatformFactory *platform_fact;
-       TnySessionCamel    *tny_session_camel;
+       
+       /* 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;
 
@@ -133,16 +142,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,
-                             modest_marshal_VOID__STRING_POINTER_POINTER_POINTER,
-                             G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER);
-       
-       signals[ACCOUNT_UPDATE_SIGNAL] =
+        signals[ACCOUNT_UPDATE_SIGNAL] =
                g_signal_new ("account_update",
                              G_TYPE_FROM_CLASS (gobject_class),
                              G_SIGNAL_RUN_FIRST,
@@ -150,9 +150,19 @@ 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_instance_init (ModestTnyAccountStore *obj)
 {
@@ -160,8 +170,8 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj)
                MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj);
 
        priv->cache_dir              = NULL;
-       priv->platform_fact          = NULL;
-       priv->tny_session_camel      = 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,
@@ -169,15 +179,44 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj)
 }
 
 
+
+static void
+account_list_free (GSList *accounts)
+{
+       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);
+}
+
+
 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);
-       
 }
 
 
@@ -186,7 +225,21 @@ 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')
+        */
+       if (priv->store_accounts) {
+               account_list_free (priv->store_accounts);
+               priv->store_accounts = NULL;
+       }
+       
+       if (priv->transport_accounts) {
+               account_list_free (priv->transport_accounts);
+               priv->transport_accounts = NULL;
+       }
+
        g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
                       account);
 }
@@ -195,66 +248,58 @@ on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean se
 static ModestTnyAccountStore*
 get_account_store_for_account (TnyAccount *account)
 {
-       return MODEST_TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account), "account_store"));
-}
-
-
-
-static void
-set_account_store_for_account (TnyAccount *account, ModestTnyAccountStore *store)
-{
-       g_object_set_data (G_OBJECT(account), "account_store", (gpointer)store);
+       return MODEST_TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account),
+                                                          "account_store"));
 }
 
 static gchar*
 get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel)
 {
        const gchar *key;
-       ModestAccountMgr *account_mgr;
        const TnyAccountStore *account_store;
        ModestTnyAccountStore *self;
        ModestTnyAccountStorePrivate *priv;
        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));
-
+       
        self = MODEST_TNY_ACCOUNT_STORE (account_store);
         priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
        
-       account_mgr = modest_tny_platform_factory_get_account_mgr_instance
-               (MODEST_TNY_PLATFORM_FACTORY(priv->platform_fact));
-       
        /* 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, NULL, (gpointer *) &pwd);
+                                                     key,
+                                                     NULL,
+                                                     (gpointer*)&pwd_ptr);
 
        /* if the password is not already there, try ModestConf */
        if (!already_asked) {
-               pwd  = modest_account_mgr_get_string (account_mgr,
-                                                     key, MODEST_ACCOUNT_PASSWORD,
-                                                     TRUE, NULL);
+               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));
        }
 
        /* if it was already asked, it must have been wrong, so ask again */
        if (already_asked || !pwd || strlen(pwd) == 0) {
 
-               /* we don't have it yet. we emit a signal to get the password somewhere */
+               /* we don't have it yet. Get the password from the user */
                const gchar* name = tny_account_get_name (account);
-               gboolean remember;
+               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 (account_mgr,
-                                                              key, MODEST_ACCOUNT_PASSWORD,
-                                                              pwd,
-                                                              TRUE, NULL);
+                               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
@@ -267,20 +312,19 @@ get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel)
                }
        } else
                *cancel = FALSE;
-
        return pwd;
 }
 
 
 static void
-forget_password (TnyAccount *account) {
-
+forget_password (TnyAccount *account)
+{
        ModestTnyAccountStore *self;
        ModestTnyAccountStorePrivate *priv;
        const TnyAccountStore *account_store;
        gchar *pwd;
        const gchar *key;
-       ModestAccountMgr *account_mgr;
        
         account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account));
        self = MODEST_TNY_ACCOUNT_STORE (account_store);
@@ -295,112 +339,48 @@ forget_password (TnyAccount *account) {
                g_hash_table_insert (priv->password_hash, g_strdup (key), NULL);
        }
 
-       account_mgr = modest_tny_platform_factory_get_account_mgr_instance
-               (MODEST_TNY_PLATFORM_FACTORY(priv->platform_fact));
-
        /* Remove from configuration system */
-       modest_account_mgr_unset (account_mgr,
-                                 key, MODEST_ACCOUNT_PASSWORD,
-                                 TRUE, NULL);
-}
-
-
-
-/* instantiate the correct tny account subclass */
-static TnyAccount*
-tny_account_for_proto (ModestProtocol proto) 
-{
-       ModestProtocolType type;        
-       TnyAccount *tny_account = NULL;
-       
-       type  = modest_protocol_info_get_protocol_type (proto);
-
-       if (type == MODEST_PROTOCOL_TYPE_TRANSPORT) 
-               tny_account = TNY_ACCOUNT(tny_camel_transport_account_new ());
-       else if (proto == MODEST_PROTOCOL_STORE_POP)
-               tny_account = TNY_ACCOUNT(tny_camel_pop_store_account_new ());
-       else if (proto == MODEST_PROTOCOL_STORE_IMAP)
-               tny_account = TNY_ACCOUNT(tny_camel_imap_store_account_new ());
-       else
-               g_return_val_if_reached (NULL);
-       
-       if (tny_account)
-               tny_account_set_proto (tny_account,
-                                      modest_protocol_info_get_protocol_name(proto));
-       else
-               g_printerr ("modest: could not get tny account for %d\n",
-                           proto);    
-       return tny_account;
-}
-
-
-/* create a tnyaccount for the server account connected to the account with name 'key'
- */
-static TnyAccount*
-get_tny_account_from_server_account (ModestTnyAccountStore *self,
-                                    ModestServerAccountData *account_data,
-                                    ModestProtocolType modest_type)
-{
-       TnyAccount *tny_account;
-       ModestTnyAccountStorePrivate *priv;
-               
-       g_return_val_if_fail (self, NULL);
-       g_return_val_if_fail (account_data, NULL);
-
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       
-       /* proto */
-       tny_account = tny_account_for_proto (account_data->proto);
-       if (!tny_account) {
-               g_printerr ("modest: could not create tny account for '%s'\n",
-                           account_data->account_name);
-               return NULL;
-       }
-       
-       set_account_store_for_account (TNY_ACCOUNT(tny_account), self);
-       tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account),  /* session */
-                                      priv->tny_session_camel);        
-       tny_account_set_id            (tny_account, account_data->account_name); /* id */
-
-       if (account_data->hostname)
-               tny_account_set_hostname (tny_account, account_data->hostname);
-
-       if (account_data->username) 
-               tny_account_set_user (tny_account, account_data->username);
-
-       tny_account_set_pass_func (tny_account, get_password);
-        tny_account_set_forget_pass_func (tny_account, forget_password);
-
-       return tny_account;
+       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);
-
-       if (priv->tny_session_camel) {
-               camel_object_unref (CAMEL_OBJECT(priv->tny_session_camel));
-               priv->tny_session_camel = NULL;
-       }
-
-       if (priv->store_lock)
-               g_mutex_free (priv->store_lock);
+       
+       //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->device) {
-               g_object_unref (priv->device);
+               g_object_unref (G_OBJECT(priv->device));
                priv->device = NULL;
        }
+
+       /* this includes the local folder */
+       account_list_free (priv->store_accounts);
+       priv->store_accounts = NULL;
        
-       if (priv->password_hash) {
-               g_hash_table_destroy (priv->password_hash);
-               priv->password_hash = NULL;
+       account_list_free (priv->transport_accounts);
+       priv->transport_accounts = NULL;
+
+       if (priv->session) {
+               camel_object_unref (CAMEL_OBJECT(priv->session));
+               priv->session = NULL;
        }
        
        G_OBJECT_CLASS(parent_class)->finalize (obj);
@@ -408,188 +388,150 @@ modest_tny_account_store_finalize (GObject *obj)
 
 
 ModestTnyAccountStore*
-modest_tny_account_store_new (ModestAccountMgr *account_mgr) {
+modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device) {
 
        GObject *obj;
        ModestTnyAccountStorePrivate *priv;
-       TnyPlatformFactory *pfact;
+       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);
 
+       priv->account_mgr = g_object_ref (G_OBJECT(account_mgr));
+       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);
-       priv->store_lock = g_mutex_new ();
-
-       pfact = TNY_PLATFORM_FACTORY (modest_tny_platform_factory_get_instance());
-       if (!pfact) {
-               g_printerr ("modest: cannot get platform factory instance\n");
-               g_object_unref (obj);
-               return NULL;
-       } else
-               priv->platform_fact = pfact;
-       
-       priv->tny_session_camel = tny_session_camel_new (TNY_ACCOUNT_STORE(obj));
-       if (!priv->tny_session_camel) {
-               g_printerr ("modest: cannot create TnySessionCamel instance\n");
-               g_object_unref (obj);
-               return NULL;
-       }
-
-       tny_session_camel_set_ui_locker (priv->tny_session_camel, tny_gtk_lockable_new ());
 
        return MODEST_TNY_ACCOUNT_STORE(obj);
 }
 
 
-static gboolean
-add_account  (TnyAccountStore *self, TnyAccount *account) {
-
-       ModestTnyAccountStore *account_store;
-       ModestTnyAccountStorePrivate *priv;
-       ModestAccountMgr *account_mgr;  
-       const gchar *account_name;
-       const gchar *hostname, *username, *proto;
-
-       g_return_val_if_fail (self, FALSE);
-       g_return_val_if_fail (account, FALSE);
-
-       account_store  = MODEST_TNY_ACCOUNT_STORE(self);
-       priv           = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       account_mgr    = modest_tny_platform_factory_get_account_mgr_instance
-                           (MODEST_TNY_PLATFORM_FACTORY(priv->platform_fact));
-       
-       
-       account_name   = tny_account_get_id(account);
-       if (!account_name) {
-               g_printerr ("modest: failed to retrieve account name\n");
-               return FALSE;
-       }
-
-       hostname =  tny_account_get_hostname(account);
-       username =  tny_account_get_user(account);
-       proto    =  tny_account_get_proto(account);
-
-       return modest_account_mgr_add_server_account (account_mgr,
-                                                     account_name,
-                                                     hostname, username, NULL,
-                                                     modest_protocol_info_get_protocol(proto));
-}
-
-
 static void
-modest_tny_account_store_add_store_account  (TnyAccountStore *self,
-                                            TnyStoreAccount *account)
+get_cached_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type)
 {
        ModestTnyAccountStorePrivate *priv;
-
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(account),
-                                      priv->tny_session_camel);
+       GSList                       *accounts, *cursor;
        
-       if (!add_account (self, TNY_ACCOUNT(account)))
-               g_printerr ("modest: failed to add store account\n");
-}
+       priv     = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       accounts = (type == TNY_ACCOUNT_TYPE_STORE ? priv->store_accounts : priv->transport_accounts);
 
-
-static void
-modest_tny_account_store_add_transport_account  (TnyAccountStore *self,
-                                                TnyTransportAccount *account)
-{
-       ModestTnyAccountStorePrivate *priv;
-       
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(account),
-                                      priv->tny_session_camel);        
-       if (!add_account (self, TNY_ACCOUNT(account)))
-               g_printerr ("modest: failed to add transport account\n");
+       cursor = accounts;
+       while (cursor) {
+               tny_list_prepend (list, G_OBJECT(cursor->data));
+               cursor = cursor->next;
+       }
 }
 
 
-static TnyAccount*
-get_tny_account_from_account (ModestTnyAccountStore *self, ModestAccountData *account_data,
-                             TnyGetAccountsRequestType type) 
-{
-       TnyAccount *tny_account = NULL;
-       ModestServerAccountData *server_account;
 
-       if (type == TNY_ACCOUNT_STORE_STORE_ACCOUNTS && account_data->store_account)
-               server_account = account_data->store_account;
-       else if (type == TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS && account_data->transport_account)
-               server_account = account_data->transport_account;
-       else
-               g_return_val_if_reached (NULL);
+/* 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 = NULL;
+       GSList                       *account_names = NULL, *cursor = NULL;
+       GSList                       *accounts = NULL;
        
-       if (!server_account) {
-               g_printerr ("modest: no %s account defined for '%s'\n",
-                           type == TNY_ACCOUNT_STORE_STORE_ACCOUNTS ? "store" : "transport",
-                           account_data->display_name);
-               return NULL;
-       }
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+       account_names = modest_account_mgr_account_names (priv->account_mgr, 
+               TRUE /* including disabled accounts */);
        
-       tny_account = get_tny_account_from_server_account (self, server_account, type);
-       if (!tny_account) { 
-               g_printerr ("modest: failed to create tny account for %s\n",
-                           account_data->account_name);
-               return NULL;
+       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) {
+                               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);
        }
-       
-       if (account_data->display_name)
-               tny_account_set_name (tny_account, account_data->display_name); 
+       g_slist_free (account_names);
 
-       return tny_account;
-}
+       /* 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 accounts;
+}      
 
 
 static void
-modest_tny_account_store_get_accounts  (TnyAccountStore *iface, TnyList *list,
-                                       TnyGetAccountsRequestType type)
+modest_tny_account_store_get_accounts  (TnyAccountStore *self, TnyList *list,
+                                       TnyGetAccountsRequestType request_type)
 {
-       ModestTnyAccountStore        *self;
        ModestTnyAccountStorePrivate *priv;
-       GSList                       *accounts, *cursor;
-       ModestAccountMgr             *account_mgr; 
        
-       g_return_if_fail (iface);
+       g_return_if_fail (self);
        g_return_if_fail (TNY_IS_LIST(list));
-
-       self        = MODEST_TNY_ACCOUNT_STORE(iface);
-       priv        = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-       account_mgr = modest_tny_platform_factory_get_account_mgr_instance
-               (MODEST_TNY_PLATFORM_FACTORY(priv->platform_fact));
        
-       if (type == TNY_ACCOUNT_STORE_BOTH) {
-               modest_tny_account_store_get_accounts (iface, list, TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
-               modest_tny_account_store_get_accounts (iface, list, TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS);
-       }
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
        
-       accounts = modest_account_mgr_account_names (account_mgr, NULL); 
-       for (cursor = accounts; cursor; cursor = cursor->next) {
-               TnyAccount *tny_account;
-               ModestAccountData *account_data =
-                       modest_account_mgr_get_account_data (account_mgr, 
-                                                            (gchar*)cursor->data);
-               if (account_data && account_data->enabled) {
-                       tny_account = get_tny_account_from_account (self, account_data, type);
-                       if (tny_account)
-                               tny_list_prepend (list, G_OBJECT(tny_account));
-               }
-               g_free (cursor->data);
-               modest_account_mgr_free_account_data (account_mgr, account_data);
+       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;
        }
-       g_slist_free (accounts);
-       tny_session_camel_set_account_store (priv->tny_session_camel, iface);
+       
+       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 */
 }
 
 
-/*
- * the cache dir will be ~/.modest/cache
- * might want to change this in a simple #define...
- */
 static const gchar*
 modest_tny_account_store_get_cache_dir (TnyAccountStore *self)
 {
@@ -597,8 +539,8 @@ modest_tny_account_store_get_cache_dir (TnyAccountStore *self)
        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);
+               priv->cache_dir = g_build_filename (g_get_home_dir(), 
+                                                   MODEST_DIR, MODEST_CACHE_DIR, NULL);
        return priv->cache_dir;
 }
 
@@ -611,12 +553,49 @@ modest_tny_account_store_get_device (TnyAccountStore *self)
 {
        ModestTnyAccountStorePrivate *priv;
 
-       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+       g_return_val_if_fail (self, NULL);
+       
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       if (priv->device)
+               return g_object_ref (G_OBJECT(priv->device));
+       else
+               return NULL;
+}
+
 
-       if (!priv->device) 
-               priv->device = tny_platform_factory_new_device (priv->platform_fact);
+static TnyAccount*
+modest_tny_account_store_find_account_by_url (TnyAccountStore *self, const gchar* url_string)
+{
+       TnyAccount *account = NULL;
+       ModestTnyAccountStorePrivate *priv;     
+       GSList *cursor;
        
-       return g_object_ref (G_OBJECT(priv->device));
+       g_return_val_if_fail (self, NULL);
+       g_return_val_if_fail (url_string, NULL);
+       
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) {
+               if (tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), url_string)) {
+                       account = TNY_ACCOUNT(cursor->data);
+                       break;
+               }
+       }
+
+       if (!account) {
+               for (cursor = priv->transport_accounts; !account && cursor ; cursor = cursor->next) {
+                       if (tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), url_string)) {
+                               account = TNY_ACCOUNT(cursor->data);
+                               break;
+                       }
+               }
+       }
+
+       if (account)
+               g_object_ref (G_OBJECT(account));
+
+       return account;
 }
 
 
@@ -625,8 +604,33 @@ static gboolean
 modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
                                const gchar *prompt)
 {
-       g_printerr ("modest: alert [%d]: %s", type, prompt);
-       return TRUE;
+       GtkMessageType gtktype;
+       gboolean retval = FALSE;
+       GtkWidget *dialog;
+
+       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;
+       }
+
+       dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+               gtktype, GTK_BUTTONS_YES_NO, prompt);
+
+       if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
+               retval = TRUE;
+
+       gtk_widget_destroy (dialog);
+
+       return retval;
 }
 
 
@@ -641,30 +645,166 @@ modest_tny_account_store_init (gpointer g, gpointer iface_data)
 
        klass->get_accounts_func =
                modest_tny_account_store_get_accounts;
-       klass->add_transport_account_func =
-               modest_tny_account_store_add_transport_account;
-       klass->add_store_account_func =
-               modest_tny_account_store_add_store_account;
        klass->get_cache_dir_func =
                modest_tny_account_store_get_cache_dir;
        klass->get_device_func =
                modest_tny_account_store_get_device;
        klass->alert_func =
                modest_tny_account_store_alert;
+       klass->find_account_func =
+               modest_tny_account_store_find_account_by_url;
 }
 
 void
 modest_tny_account_store_set_get_pass_func (ModestTnyAccountStore *self,
                                            ModestTnyGetPassFunc func)
 {
-       g_warning (__FUNCTION__);
-       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)
+{
+       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);
+
+       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)
+               g_printerr ("modest: could not get an id for account %s\n",
+                           account_name);
+       else    
+               account = modest_tny_account_store_get_tny_account_by_id (self, id);
+
+       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; 
+}
+
+static TnyAccount* get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self, const gchar *account_name)
+{
+       /* Get the current connection: */
+       TnyDevice *device = modest_runtime_get_device ();
+       
+       if (!tny_device_is_online (device))
+               return NULL;
+
+#ifdef MODEST_PLATFORM_MAEMO
+       g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device));
+       TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device);    
+       const gchar* iap_id = tny_maemo_conic_device_get_current_iap_id (maemo_device);
+       if (!iap_id)
+               return NULL;
+               
+       ConIcIap* connection = tny_maemo_conic_device_get_iap (maemo_device, iap_id);
+       if (!connection)
+               return NULL;
+               
+       const gchar *connection_name = con_ic_iap_get_name (connection);
+       if (!connection_name)
+               return NULL;
+       
+       /*  Get the connection-specific transport acccount, if any: */
+       ModestAccountMgr *account_manager = modest_runtime_get_account_mgr ();
+       gchar* server_account_name = modest_account_mgr_get_connection_specific_smtp (account_manager, 
+               account_name, connection_name);
+               
+       if (!server_account_name)
+               return NULL; /* No connection-specific SMTP server was specified for this connection. */
+               
+       TnyAccount* account = modest_tny_account_store_get_tny_account_by_id (self, server_account_name);
+       g_free (server_account_name);   
+
+       /* Unref the get()ed object, as required by the tny_maemo_conic_device_get_iap() documentation. */
+       g_object_unref (connection);
+       
+       return account;
+#else
+       return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */
+#endif /* MODEST_PLATFORM_MAEMO */
+}
+
+                                                                
+TnyAccount* modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAccountStore *self,
+                                                                const gchar *account_name)
 {
-       g_return_val_if_fail (self, NULL);      
-       return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self)->tny_session_camel;
+       /*  Get the connection-specific transport acccount, if any: */
+       TnyAccount *account = get_smtp_specific_transport_account_for_open_connection (self, account_name);
+                       
+       /* If there is no connection-specific transport account (the common case), 
+        * just get the regular transport account: */
+       if (!account) {         
+               account = modest_tny_account_store_get_tny_account_by_account (self, account_name, 
+                                                    TNY_ACCOUNT_TYPE_TRANSPORT);
+       }
+                            
+       return account;
 }