X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-tny-account-store.c;h=bce01577541f321a8ff7848fb56f5844af63208e;hb=b09daad954384d34091b51a04eda7fd3a57a5f22;hp=c0fe0d34687a44bb14a3aa23b49332e2de90ca9c;hpb=688b5c743afca998e5e371a4de0ebb1acab5c5e1;p=modest diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index c0fe0d3..bce0157 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -29,59 +29,57 @@ #include -#include -#include -#include -#include -#include -#include +#include #include - #include #include - +#include +#include +#include +#include +#include +#include #include "modest-account-mgr.h" #include "modest-tny-account-store.h" +#include "modest-tny-platform-factory.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, +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_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, - UPDATE_ACCOUNTS_SIGNAL, + ACCOUNT_UPDATE_SIGNAL, LAST_SIGNAL }; -/* Password Status */ -enum { - PW_NOT_INVALID, - PW_INVALID -}; - typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate; struct _ModestTnyAccountStorePrivate { GMutex *store_lock; gchar *cache_dir; + gulong sig1, sig2; + GHashTable *password_hash; + TnySessionCamel *tny_session_camel; - TnyDeviceIface *device; - + TnyDevice *device; + ModestAccountMgr *account_mgr; - gint pw_invalid; - ModestTnyGetPassFunc get_pass_func; }; + #define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_TNY_ACCOUNT_STORE, \ ModestTnyAccountStorePrivate)) @@ -94,6 +92,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 +102,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; @@ -140,14 +140,14 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass) 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[UPDATE_ACCOUNTS_SIGNAL] = - g_signal_new ("update_accounts", + 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", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET(ModestTnyAccountStoreClass, update_accounts), + G_STRUCT_OFFSET(ModestTnyAccountStoreClass, account_update), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); @@ -155,19 +155,18 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass) } 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->account_mgr = NULL; priv->device = NULL; priv->cache_dir = NULL; - 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; + + priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, g_free); } @@ -177,7 +176,7 @@ on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean se { ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); - g_signal_emit (G_OBJECT(self), signals[UPDATE_ACCOUNTS_SIGNAL], 0, + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, account); } @@ -189,76 +188,134 @@ on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean se { ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); - g_signal_emit (G_OBJECT(self), signals[UPDATE_ACCOUNTS_SIGNAL], 0, + 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 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) { - 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; + gboolean already_asked; - key = tny_account_iface_get_id (account); - account_store = tny_account_iface_get_account_store(account); + g_return_val_if_fail (account, NULL); + + 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); - 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, - key, - MODEST_ACCOUNT_PASSWORD, - retval, TRUE, - NULL); - } - } - return retval; + /* 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 (priv->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) { + + /* we don't have it yet. we emit a signal to get the password somewhere */ + const gchar* name = tny_account_get_name (account); + gboolean remember; + pwd = NULL; + + gdk_threads_enter (); + + 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, 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; + } + gdk_threads_leave (); + } else + *cancel = FALSE; + + return pwd; } static void -forget_password (TnyAccountIface *account) { +forget_password (TnyAccount *account) { ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; - const TnyAccountStoreIface *account_store; + const TnyAccountStore *account_store; + gchar *pwd; + const gchar *key; - account_store = tny_account_iface_get_account_store(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); + 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); + } - priv->pw_invalid=PW_INVALID; + /* Remove from configuration system */ + modest_account_mgr_unset (priv->account_mgr, + key, MODEST_ACCOUNT_PASSWORD, + TRUE, NULL); } + /* create a tnyaccount for the server account connected to the account with name 'key' */ -static TnyAccountIface* +static TnyAccount* tny_account_from_name (ModestTnyAccountStore *self, const gchar *account, - const gchar *server_account, ModestProtoType modest_type) + const gchar *server_account, ModestProtocolType modest_type) { - TnyAccountIface *tny_account; + TnyAccount *tny_account; ModestTnyAccountStorePrivate *priv; gchar *val; - + GSList *options = NULL; + GError *error = NULL; + g_return_val_if_fail (self, NULL); g_return_val_if_fail (account, NULL); g_return_val_if_fail (server_account, NULL); @@ -266,10 +323,10 @@ tny_account_from_name (ModestTnyAccountStore *self, const gchar *account, 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 ()); + if (modest_type == MODEST_PROTOCOL_TYPE_STORE) + tny_account = TNY_ACCOUNT(tny_camel_store_account_new ()); + else if (modest_type == MODEST_PROTOCOL_TYPE_TRANSPORT) + tny_account = TNY_ACCOUNT(tny_camel_transport_account_new ()); else g_assert_not_reached (); @@ -279,17 +336,33 @@ tny_account_from_name (ModestTnyAccountStore *self, const gchar *account, return NULL; } - tny_account_iface_set_account_store (TNY_ACCOUNT_IFACE(tny_account), - TNY_ACCOUNT_STORE_IFACE(self)); + set_account_store_for_account (TNY_ACCOUNT(tny_account), self); + + /* session */ + tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), + priv->tny_session_camel); + /* id */ - tny_account_iface_set_id (tny_account, server_account); - tny_account_iface_set_name (tny_account, account); + tny_account_set_id (tny_account, server_account); + + /* name */ + val = modest_account_mgr_get_string (priv->account_mgr, account, + MODEST_ACCOUNT_DISPLAY_NAME, FALSE, NULL); + if (val) { + tny_account_set_name (tny_account, val); + g_free (val); + } else { + g_printerr ("modest: display name not defined for '%s:%s'\n", + account, server_account); + g_object_unref (G_OBJECT(tny_account)); + return NULL; + } /* 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); + tny_account_set_proto (tny_account, val); g_free (val); } else { g_printerr ("modest: protocol not defined for '%s:%s'\n", @@ -298,12 +371,34 @@ tny_account_from_name (ModestTnyAccountStore *self, const gchar *account, return NULL; } + /* Options */ + options = modest_account_mgr_get_list (priv->account_mgr, + tny_account_get_id (tny_account), + MODEST_ACCOUNT_OPTIONS, + MODEST_CONF_VALUE_STRING, + TRUE, + &error); + + if (error) { + g_warning ("Error retrieving account %s options: %s", + tny_account_get_id (tny_account), error->message); + g_error_free (error); + } else { + GSList *tmp = options; + while (options) { + tny_camel_account_add_option (TNY_CAMEL_ACCOUNT (tny_account), options->data); + g_free (options->data); + options = g_slist_next (options); + } + g_slist_free (tmp); + } + /* 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); + tny_account_set_hostname (tny_account, val); g_free (val); } @@ -312,12 +407,12 @@ tny_account_from_name (ModestTnyAccountStore *self, const gchar *account, MODEST_ACCOUNT_USERNAME, TRUE, NULL); if (val) { - tny_account_iface_set_user (tny_account, val); + tny_account_set_user (tny_account, val); g_free (val); } - 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; } @@ -332,14 +427,16 @@ modest_tny_account_store_finalize (GObject *obj) 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; } - if (priv->tny_session_camel) { -// FIXME: how to kill a camel - //g_object_unref (G_OBJECT(priv->tny_session_camel)); + // FIXME: how to kill a camel priv->tny_session_camel = NULL; } @@ -353,6 +450,13 @@ modest_tny_account_store_finalize (GObject *obj) g_free (priv->cache_dir); priv->cache_dir = NULL; + + if (priv->password_hash) { + g_hash_table_destroy (priv->password_hash); + priv->password_hash = NULL; + } + + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -361,7 +465,8 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr) { 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)); @@ -371,21 +476,29 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr) { g_object_ref(G_OBJECT(account_mgr)); priv->account_mgr = account_mgr; - 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->sig1 = 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_CALLBACK (on_account_removed), obj); + priv->store_lock = g_mutex_new (); - priv->device = (TnyDeviceIface*)tny_device_new(); + pfact = TNY_PLATFORM_FACTORY (modest_tny_platform_factory_get_instance()); + if (!pfact) { + g_printerr ("modest: cannot create platform factory\n"); + g_object_unref (obj); + return NULL; + } + + priv->device = TNY_DEVICE(tny_platform_factory_new_device(pfact)); if (!priv->device) { g_printerr ("modest: cannot create device instance\n"); g_object_unref (obj); return NULL; } + tny_device_force_online (priv->device); - 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"); @@ -398,9 +511,8 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr) { static gboolean -add_account (TnyAccountStoreIface *self, TnyAccountIface *account) { +add_account (TnyAccountStore *self, TnyAccount *account) { - TnyAccountIface *account_iface; ModestTnyAccountStore *account_store; ModestTnyAccountStorePrivate *priv; @@ -410,19 +522,18 @@ add_account (TnyAccountStoreIface *self, TnyAccountIface *account) { 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); + account_name = tny_account_get_id(account); if (!account_name) { g_printerr ("modest: failed to retrieve account name\n"); return FALSE; } - hostname = tny_account_iface_get_hostname(account_iface); - username = tny_account_iface_get_user(account_iface); - proto = tny_account_iface_get_proto(account_iface); + 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 (priv->account_mgr, account_name, @@ -432,26 +543,38 @@ add_account (TnyAccountStoreIface *self, TnyAccountIface *account) { static void -modest_tny_account_store_add_store_account (TnyAccountStoreIface *self, - TnyStoreAccountIface *account) +modest_tny_account_store_add_store_account (TnyAccountStore *self, + TnyStoreAccount *account) { - if (!add_account (self, TNY_ACCOUNT_IFACE(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 store account\n"); } static void -modest_tny_account_store_add_transport_account (TnyAccountStoreIface *self, - TnyTransportAccountIface *account) +modest_tny_account_store_add_transport_account (TnyAccountStore *self, + TnyTransportAccount *account) { - if (!add_account (self, TNY_ACCOUNT_IFACE(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"); } static gchar* get_server_account_for_account (ModestTnyAccountStore *self, const gchar *account_name, - ModestProtoType modest_type) + ModestProtocolType modest_type) { ModestTnyAccountStorePrivate *priv; gchar *server; @@ -459,9 +582,9 @@ get_server_account_for_account (ModestTnyAccountStore *self, const gchar *accoun priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - if (modest_type == MODEST_PROTO_TYPE_STORE) + if (modest_type == MODEST_PROTOCOL_TYPE_STORE) key = MODEST_ACCOUNT_STORE_ACCOUNT; - else if (modest_type == MODEST_PROTO_TYPE_STORE) + else if (modest_type == MODEST_PROTOCOL_TYPE_TRANSPORT) key = MODEST_ACCOUNT_TRANSPORT_ACCOUNT; else g_assert_not_reached(); @@ -471,26 +594,24 @@ get_server_account_for_account (ModestTnyAccountStore *self, const gchar *accoun 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, +modest_tny_account_store_get_accounts (TnyAccountStore *iface, + TnyList *list, TnyGetAccountsRequestType type) { ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; GSList *accounts, *cursor; - ModestProtoType modest_type; + ModestProtocolType modest_type; g_return_if_fail (iface); @@ -498,54 +619,71 @@ modest_tny_account_store_get_accounts (TnyAccountStoreIface *iface, priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); switch (type) { - case TNY_ACCOUNT_STORE_IFACE_TRANSPORT_ACCOUNTS: - modest_type = MODEST_PROTO_TYPE_TRANSPORT; + case TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS: + modest_type = MODEST_PROTOCOL_TYPE_TRANSPORT; break; - case TNY_ACCOUNT_STORE_IFACE_STORE_ACCOUNTS: - modest_type = MODEST_PROTO_TYPE_STORE; + case TNY_ACCOUNT_STORE_STORE_ACCOUNTS: + modest_type = MODEST_PROTOCOL_TYPE_STORE; break; - case TNY_ACCOUNT_STORE_IFACE_BOTH: - modest_type = MODEST_PROTO_TYPE_ANY; + case TNY_ACCOUNT_STORE_BOTH: + modest_type = MODEST_PROTOCOL_TYPE_ANY; 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; - account_name = (gchar*)cursor->data; + while (cursor) { + gchar *account_name; + gchar *server_account; + TnyAccount *account; + gboolean is_server_account; + + account_name = (gchar*)cursor->data; + account = NULL; + is_server_account = FALSE; + + 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) { + if (modest_type == MODEST_PROTOCOL_TYPE_TRANSPORT || modest_type == MODEST_PROTOCOL_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, + MODEST_PROTOCOL_TYPE_TRANSPORT); + if (server_account) { + account = 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); + MODEST_PROTOCOL_TYPE_TRANSPORT); + is_server_account = TRUE; + } + + if (!account) + g_printerr ("modest: no transport account for '%s'\n", + account_name); else - tny_list_iface_prepend (list, account_iface); + tny_list_prepend (list, G_OBJECT(account)); + g_free (server_account); } - if (modest_type == MODEST_PROTO_TYPE_STORE || MODEST_PROTO_TYPE_ANY) { + if (modest_type == MODEST_PROTOCOL_TYPE_STORE || modest_type == MODEST_PROTOCOL_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, + MODEST_PROTOCOL_TYPE_STORE); + if (server_account) { + account = 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); + MODEST_PROTOCOL_TYPE_STORE); + is_server_account = TRUE; + } + + if (!account) + g_printerr ("modest: no store account for '%s'\n", + account_name); else - tny_list_iface_prepend (list, account_iface); + tny_list_prepend (list, G_OBJECT(account)); g_free (server_account); } @@ -555,55 +693,67 @@ modest_tny_account_store_get_accounts (TnyAccountStoreIface *iface, g_slist_free (accounts); - tny_session_camel_set_current_accounts (priv->tny_session_camel, - list); + tny_session_camel_set_account_store (priv->tny_session_camel, iface); } +/* + * 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 (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); + ".modest", + "cache", + NULL); return priv->cache_dir; } -static const 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; + 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) { - return TRUE; /* FIXME: implement this */ + g_printerr ("modest: alert [%d]: %s", + 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; @@ -619,6 +769,7 @@ void modest_tny_account_store_set_get_pass_func (ModestTnyAccountStore *self, ModestTnyGetPassFunc func) { + g_warning (__FUNCTION__); return; /* not implemented, we use signals */ } @@ -626,9 +777,7 @@ modest_tny_account_store_set_get_pass_func (ModestTnyAccountStore *self, TnySessionCamel* tny_account_store_get_session (TnyAccountStore *self) { - ModestTnyAccountStorePrivate *priv; - - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - return priv->tny_session_camel; + g_return_val_if_fail (self, NULL); + + return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self)->tny_session_camel; }