*/
#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-device.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-marshal.h>
-
+#include <modest-protocol-info.h>
+#include <modest-local-folder-info.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,
typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate;
struct _ModestTnyAccountStorePrivate {
- GMutex *store_lock;
- gchar *cache_dir;
- gulong sig1, sig2;
+ gchar *cache_dir;
- TnySessionCamel *tny_session_camel;
- TnyDeviceIface *device;
-
- ModestAccountMgr *account_mgr;
+ GHashTable *password_hash;
+ TnyDevice *device;
+ TnyPlatformFactory *platform_fact;
+ TnySessionCamel *tny_session_camel;
};
#define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
modest_tny_account_store_get_type (void)
{
static GType my_type = 0;
+
if (!my_type) {
static const GTypeInfo my_info = {
sizeof(ModestTnyAccountStoreClass),
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;
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET(ModestTnyAccountStoreClass, password_requested),
NULL, NULL,
- modest_marshal_VOID__STRING_POINTER_POINTER,
- G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER);
+ 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] =
g_signal_new ("account_update",
}
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->tny_session_camel = NULL;
+
+ priv->platform_fact = NULL;
+ priv->tny_session_camel = NULL;
+ priv->device = NULL;
+
+ priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
+ g_free, g_free);
}
}
+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);
+}
static gchar*
-get_password (TnyAccountIface *account, const gchar *prompt, gboolean *cancel)
+get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel)
{
- gchar *key;
- const TnyAccountStoreIface *account_store;
+ const gchar *key;
+ ModestAccountMgr *account_mgr;
+ const TnyAccountStore *account_store;
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
gchar *pwd = NULL;
- gboolean remember_pwd;
-
- g_return_val_if_fail (account, NULL);
-
- key = tny_account_iface_get_id (account);
- account_store = tny_account_iface_get_account_store(account);
+ 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... */
+ already_asked = g_hash_table_lookup_extended (priv->password_hash,
+ key, NULL, (gpointer *) &pwd);
+
+ /* 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);
+ 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) {
- /* is it in the conf? */
- pwd = modest_account_mgr_get_string (priv->account_mgr,
- key, MODEST_ACCOUNT_PASSWORD,
- TRUE, NULL);
- if (!pwd || strlen(pwd) == 0) {
/* we don't have it yet. we emit a signal to get the password somewhere */
- const gchar* name = tny_account_iface_get_name (account);
- *cancel = TRUE;
- pwd = NULL;
+ const gchar* name = tny_account_get_name (account);
+ gboolean remember;
+ pwd = NULL;
+
g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0,
- name, &pwd, cancel);
- if (!*cancel) /* remember the password */
- modest_account_mgr_set_string (priv->account_mgr,
- key, MODEST_ACCOUNT_PASSWORD,
- pwd, TRUE, NULL);
+ name, &pwd, cancel, &remember);
+
+ if (!*cancel) {
+ if (remember)
+ modest_account_mgr_set_string (account_mgr,
+ key, MODEST_ACCOUNT_PASSWORD,
+ pwd,
+ TRUE, NULL);
+ /* 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;
+ return pwd;
}
static void
-forget_password (TnyAccountIface *account) {
+forget_password (TnyAccount *account) {
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
- const TnyAccountStoreIface *account_store;
-
- account_store = tny_account_iface_get_account_store(account);
+ 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);
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);
+ }
+
+ 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 TnyAccountIface*
-tny_account_from_name (ModestTnyAccountStore *self, const gchar *account,
- const gchar *server_account, ModestProtoType modest_type)
+static TnyAccount*
+get_tny_account_from_server_account (ModestTnyAccountStore *self,
+ ModestServerAccountData *account_data,
+ ModestProtocolType modest_type)
{
- TnyAccountIface *tny_account;
+ TnyAccount *tny_account;
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);
+ g_return_val_if_fail (account_data, 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;
- }
- 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));
+ 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 */
- /* 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);
- }
+ if (account_data->hostname)
+ tny_account_set_hostname (tny_account, account_data->hostname);
- /* 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);
- }
+ if (account_data->username)
+ tny_account_set_user (tny_account, account_data->username);
- tny_account_iface_set_pass_func (tny_account, get_password);
- tny_account_iface_set_forget_pass_func (tny_account, forget_password);
+ tny_account_set_pass_func (tny_account, get_password);
+ tny_account_set_forget_pass_func (tny_account, forget_password);
return tny_account;
}
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->account_mgr) {
- g_signal_handler_disconnect (G_OBJECT(priv->account_mgr),
- priv->sig1);
- g_signal_handler_disconnect (G_OBJECT(priv->account_mgr),
- priv->sig2);
- g_object_unref (G_OBJECT(priv->account_mgr));
- priv->account_mgr = NULL;
- }
+ ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(obj);
+ ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
if (priv->tny_session_camel) {
- // FIXME: how to kill a camel
+ camel_object_unref (CAMEL_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;
+ if (priv->device) {
+ g_object_unref (priv->device);
+ priv->device = NULL;
+ }
+
+ if (priv->password_hash) {
+ g_hash_table_destroy (priv->password_hash);
+ priv->password_hash = NULL;
+ }
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
GObject *obj;
ModestTnyAccountStorePrivate *priv;
-
+ TnyPlatformFactory *pfact;
+
g_return_val_if_fail (account_mgr, 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;
-
- priv->sig1 = g_signal_connect (G_OBJECT(account_mgr), "account_changed",
+ g_signal_connect (G_OBJECT(account_mgr), "account_changed",
G_CALLBACK (on_account_changed), obj);
- priv->sig2 = g_signal_connect (G_OBJECT(account_mgr), "account_removed",
+ 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");
+ 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_IFACE(obj));
-
+ 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 void
+modest_tny_account_store_add_store_account (TnyAccountStore *self,
+ TnyStoreAccount *account)
+{
+ /* we should not need this...*/
+ g_printerr ("modest: add_store_account_func not implemented\n");
+}
-static gboolean
-add_account (TnyAccountStoreIface *self, TnyAccountIface *account) {
-
- TnyAccountIface *account_iface;
- ModestTnyAccountStore *account_store;
- ModestTnyAccountStorePrivate *priv;
- const gchar *account_name;
- const gchar *hostname, *username, *proto;
+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");
+}
- 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);
+/* create a pseudo-account for our local folders */
+static TnyAccount*
+get_local_folder_account (ModestTnyAccountStore *self)
+{
+ TnyStoreAccount *tny_account;
+ CamelURL *url;
+ gchar *maildir, *url_string;
+ ModestTnyAccountStorePrivate *priv;
- account_name = tny_account_iface_get_id(account_iface);
- if (!account_name) {
- g_printerr ("modest: failed to retrieve account name\n");
- return FALSE;
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ tny_account = tny_camel_store_account_new ();
+ if (!tny_account) {
+ g_printerr ("modest: cannot create account for local folders");
+ return NULL;
}
- hostname = tny_account_iface_get_hostname(account_iface);
- username = tny_account_iface_get_user(account_iface);
- proto = tny_account_iface_get_proto(account_iface);
-
- return modest_account_mgr_add_server_account (priv->account_mgr,
- account_name,
- hostname, username, NULL,
- proto);
-}
+ maildir = modest_local_folder_info_get_maildir_path ();
+
+ url = camel_url_new ("maildir:", NULL);
+ camel_url_set_path (url, maildir);
+ url_string = camel_url_to_string (url, 0);
+ tny_account_set_url_string (TNY_ACCOUNT(tny_account), url_string);
-static void
-modest_tny_account_store_add_store_account (TnyAccountStoreIface *self,
- TnyStoreAccountIface *account)
-{
- if (!add_account (self, TNY_ACCOUNT_IFACE(account)))
- g_printerr ("modest: failed to add store account\n");
-}
+ tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account),
+ priv->tny_session_camel);
+ tny_account_set_name (TNY_ACCOUNT(tny_account), _("Local folders"));
+
+ camel_url_free (url);
+ g_free (maildir);
+ g_free (url_string);
-static void
-modest_tny_account_store_add_transport_account (TnyAccountStoreIface *self,
- TnyTransportAccountIface *account)
-{
- if (!add_account (self, TNY_ACCOUNT_IFACE(account)))
- g_printerr ("modest: failed to add transport account\n");
+ return TNY_ACCOUNT(tny_account);
}
-static gchar*
-get_server_account_for_account (ModestTnyAccountStore *self, const gchar *account_name,
- ModestProtoType modest_type)
+static TnyAccount*
+get_tny_account_from_account (ModestTnyAccountStore *self, ModestAccountData *account_data,
+ TnyGetAccountsRequestType type)
{
- ModestTnyAccountStorePrivate *priv;
- gchar *server;
- gchar *key;
-
- priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+ TnyAccount *tny_account = NULL;
+ ModestServerAccountData *server_account;
- 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 (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_assert_not_reached();
+ g_return_val_if_reached (NULL);
- server = modest_account_mgr_get_string (priv->account_mgr,
- account_name,
- key, FALSE, NULL);
- if (!server)
+ 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;
- if (!modest_account_mgr_account_exists (priv->account_mgr,
- server, TRUE, NULL)) {
- g_free (server);
+ }
+
+ 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;
}
-
- return server;
-}
+
+ if (account_data->display_name)
+ tny_account_set_name (tny_account, account_data->display_name);
+ return tny_account;
+}
static void
-modest_tny_account_store_get_accounts (TnyAccountStoreIface *iface,
- TnyListIface *list,
+modest_tny_account_store_get_accounts (TnyAccountStore *iface, TnyList *list,
TnyGetAccountsRequestType type)
{
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
GSList *accounts, *cursor;
- ModestProtoType modest_type;
+ ModestAccountMgr *account_mgr;
+ TnyAccount *local_folder_account;
g_return_if_fail (iface);
+ g_return_if_fail (TNY_IS_LIST(list));
- 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;
- break;
- case TNY_ACCOUNT_STORE_IFACE_STORE_ACCOUNTS:
- modest_type = MODEST_PROTO_TYPE_STORE;
- break;
- case TNY_ACCOUNT_STORE_IFACE_BOTH:
- modest_type = MODEST_PROTO_TYPE_ANY;
- break;
- default:
- g_assert_not_reached ();
+ 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);
}
-
- cursor = accounts = modest_account_mgr_account_names (priv->account_mgr, NULL);
- while (cursor) {
- gchar *account_name;
- gchar *server_account;
- TnyAccountIface *account_iface;
-
- account_name = (gchar*)cursor->data;
-
- 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, G_OBJECT(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, G_OBJECT(account_iface));
- g_free (server_account);
+
+ 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 (account_name);
- cursor = cursor->next;
+ g_free (cursor->data);
+ modest_account_mgr_free_account_data (account_mgr, account_data);
}
-
g_slist_free (accounts);
- tny_session_camel_set_current_accounts (priv->tny_session_camel,
- list);
+ /* also, add the local folder pseudo-account */
+ local_folder_account = get_local_folder_account (MODEST_TNY_ACCOUNT_STORE(self));
+ if (!local_folder_account)
+ g_printerr ("modest: failed to add local folders account\n");
+ else
+ tny_list_prepend (list, G_OBJECT(local_folder_account));
+
+ tny_session_camel_set_account_store (priv->tny_session_camel, iface);
}
-
static const gchar*
-modest_tny_account_store_get_cache_dir (TnyAccountStoreIface *self)
+modest_tny_account_store_get_cache_dir (TnyAccountStore *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);
+ priv->cache_dir = g_build_filename (g_get_home_dir(),
+ MODEST_DIR,
+ MODEST_CACHE_DIR,
+ "cache", NULL);
return priv->cache_dir;
}
-static TnyDeviceIface*
-modest_tny_account_store_get_device (TnyAccountStoreIface *self)
+/*
+ * callers need to unref
+ */
+static TnyDevice*
+modest_tny_account_store_get_device (TnyAccountStore *self)
{
ModestTnyAccountStorePrivate *priv;
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
- return priv->device;
+ if (!priv->device)
+ priv->device = tny_platform_factory_new_device (priv->platform_fact);
+
+ return g_object_ref (G_OBJECT(priv->device));
}
+
static gboolean
-modest_tny_account_store_alert (TnyAccountStoreIface *self, TnyAlertType type,
+modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type,
const gchar *prompt)
{
- g_printerr ("modest: alert [%d]: %s", type, prompt);
- return TRUE; /* FIXME: implement this */
+ g_printerr ("modest: alert_func not implemented (%d, %s)\n",
+ type, prompt);
+ return TRUE;
}
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;
modest_tny_account_store_set_get_pass_func (ModestTnyAccountStore *self,
ModestTnyGetPassFunc func)
{
- g_warning (__FUNCTION__);
+ g_message (__FUNCTION__);
return; /* not implemented, we use signals */
}
+
TnySessionCamel*
tny_account_store_get_session (TnyAccountStore *self)
{
- g_return_val_if_fail (self, NULL);
-
+ g_return_val_if_fail (self, NULL);
return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self)->tny_session_camel;
}
projects / modest / blobdiff