X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-tny-account-store.c;h=a3d588fb70f6e750eeca4c11de44d8ce47f520cd;hb=56a51fb8a595ca2260274794cdadd2666daf25a8;hp=0ad616a13cdad9ae69ab7eccf2fa65245c3db4eb;hpb=dc65f9ff58d0c6ac3d24c8023741e34e2b4cad58;p=modest diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 0ad616a..a3d588f 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -1,54 +1,81 @@ -/* modest-tny-account-store.c */ - -/* insert (c)/licensing information) */ +/* Copyright (c) 2006, Nokia Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Nokia Corporation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #include +#include -#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" +#include +#include /* '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_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 (TnyAccountStoreIface *self, - TnyStoreAccountIface *account); -static void modest_tny_account_store_add_transport_account (TnyAccountStoreIface *self, - TnyTransportAccountIface *account); -static const GList* modest_tny_account_store_get_store_accounts (TnyAccountStoreIface *iface); -static const GList* modest_tny_account_store_get_transport_accounts (TnyAccountStoreIface *iface); /* list my signals */ enum { PASSWORD_REQUESTED_SIGNAL, + ACCOUNT_UPDATE_SIGNAL, LAST_SIGNAL }; typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate; struct _ModestTnyAccountStorePrivate { - GList *store_accounts; - GList *transport_accounts; - gchar *cache_dir; - - TnySessionCamel *tny_session_camel; - - ModestAccountMgr *modest_acc_mgr; + gchar *cache_dir; + + 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_TYPE_TNY_ACCOUNT_STORE, \ ModestTnyAccountStorePrivate)) @@ -61,6 +88,7 @@ GType modest_tny_account_store_get_type (void) { static GType my_type = 0; + if (!my_type) { static const GTypeInfo my_info = { sizeof(ModestTnyAccountStoreClass), @@ -70,20 +98,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; @@ -105,453 +134,530 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass) g_signal_new ("password_requested", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET(ModestTnyAccountStoreClass,password_requested), + 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] = + g_signal_new ("account_update", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(ModestTnyAccountStoreClass, account_update), NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, G_TYPE_POINTER); + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING); + } 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->modest_acc_mgr = NULL; - - priv->store_accounts = NULL; - priv->transport_accounts = NULL; priv->cache_dir = 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 void -free_gobject (GObject *obj, gpointer user_data) +on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean server_account, + gpointer user_data) { - if (obj) - g_object_unref (obj); -} - + ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); -static GList* -free_gobject_list (GList *list) -{ - if (list) { - g_list_foreach (list, (GFunc)free_gobject, NULL); - g_list_free (list); - } - return NULL; + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, + account); + } static void -modest_tny_account_store_finalize (GObject *obj) +on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean server_account, + const gchar *key, gpointer user_data) { - ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(obj); - ModestTnyAccountStorePrivate *priv = - MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - if (priv->modest_acc_mgr) { - g_object_unref (G_OBJECT(priv->modest_acc_mgr)); - priv->modest_acc_mgr = NULL; - } - - if (priv->tny_session_camel) { - g_object_unref (G_OBJECT(priv->tny_session_camel)); - priv->tny_session_camel = NULL; - } - - priv->store_accounts = free_gobject_list (priv->store_accounts); - priv->transport_accounts = free_gobject_list (priv->store_accounts); - - g_free (priv->cache_dir); - priv->cache_dir = NULL; - - - + ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); + + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, + account); } -GObject* -modest_tny_account_store_new (ModestAccountMgr *modest_acc_mgr) -{ - GObject *obj; - ModestTnyAccountStorePrivate *priv; - - g_return_val_if_fail (modest_acc_mgr, NULL); - obj = G_OBJECT(g_object_new(MODEST_TYPE_TNY_ACCOUNT_STORE, NULL)); +static ModestTnyAccountStore* +get_account_store_for_account (TnyAccount *account) +{ + return MODEST_TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account), "account_store")); +} - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj); - g_object_ref(G_OBJECT(priv->modest_acc_mgr = modest_acc_mgr)); - priv->tny_session_camel = tny_session_camel_new - (TNY_ACCOUNT_STORE_IFACE(obj)); - if (!priv->tny_session_camel) { - g_warning ("cannot create TnySessionCamel instance"); - g_object_unref (obj); - return NULL; - } - return obj; +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) +get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) { const gchar *key; - const TnyAccountStoreIface *account_store; + ModestAccountMgr *account_mgr; + const TnyAccountStore *account_store; ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; - gchar *val; + gchar *pwd = NULL; + gboolean already_asked; + + key = tny_account_get_id (account); + account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account)); - g_message (__FUNCTION__); + 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)); + } - g_return_val_if_fail (account, NULL); + /* 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; + + 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); + /* 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; - key = tny_account_iface_get_id (account); - account_store = tny_account_iface_get_account_store(account); + return pwd; +} - self = MODEST_TNY_ACCOUNT_STORE (account_store); - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key, - MODEST_ACCOUNT_PASSWORD, - NULL); - if (!val || strlen(val)==0) - { - g_message("Key vor Aufruf: %s", key); - /* g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0, key); */ - g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0, key); +static void +forget_password (TnyAccount *account) { -<<<<<<< .mine + 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); + 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); } - return val; -======= - return val; ->>>>>>> .r67 + 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); } -static void -forget_password (TnyAccountIface *account) + +/* instantiate the correct tny account subclass */ +static TnyAccount* +tny_account_for_proto (ModestProtocol proto) { - g_warning (__FUNCTION__); + 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; } - -static gboolean -add_account (TnyAccountStoreIface *self, TnyAccountIface *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) { - TnyAccountIface *account_iface; - ModestTnyAccountStore *account_store; + TnyAccount *tny_account; ModestTnyAccountStorePrivate *priv; + + g_return_val_if_fail (self, NULL); + g_return_val_if_fail (account_data, NULL); - const gchar* account_name; - const gchar *hostname, *username, *proto; - - g_return_val_if_fail (self, FALSE); - g_return_val_if_fail (account, FALSE); + 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 */ - account_iface = TNY_ACCOUNT_IFACE(account); - account_store = MODEST_TNY_ACCOUNT_STORE(self); - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + if (account_data->hostname) + tny_account_set_hostname (tny_account, account_data->hostname); - account_name = tny_account_iface_get_id(account_iface); - if (!account_name) { - g_warning ("failed to retrieve account name"); - return FALSE; - } + if (account_data->username) + tny_account_set_user (tny_account, account_data->username); - hostname = tny_account_iface_get_hostname(account_iface); - username = tny_account_iface_get_user(account_iface); - proto = tny_account_iface_get_proto(account_iface); + tny_account_set_pass_func (tny_account, get_password); + tny_account_set_forget_pass_func (tny_account, forget_password); - return modest_account_mgr_add_server_account (priv->modest_acc_mgr, - account_name, - hostname, username, NULL, - proto); + return tny_account; } static void -modest_tny_account_store_add_store_account (TnyAccountStoreIface *self, - TnyStoreAccountIface *account) +modest_tny_account_store_finalize (GObject *obj) { - if (!add_account (self, TNY_ACCOUNT_IFACE(account))) - g_warning ("failed to add store account"); -} + 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; + } + g_free (priv->cache_dir); + priv->cache_dir = NULL; -static void -modest_tny_account_store_add_transport_account (TnyAccountStoreIface *self, - TnyTransportAccountIface *account) -{ - if (!add_account (self, TNY_ACCOUNT_IFACE(account))) - g_warning ("failed to add transport account"); + 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); } +ModestTnyAccountStore* +modest_tny_account_store_new (ModestAccountMgr *account_mgr) { -static TnyAccountIface* -tny_account_from_key (ModestTnyAccountStore *self, const gchar *key, - gboolean is_store) -{ - TnyAccountIface *tny_account; + GObject *obj; ModestTnyAccountStorePrivate *priv; - gchar *val; - - g_return_val_if_fail (self, NULL); - g_return_val_if_fail (key, NULL); + TnyPlatformFactory *pfact; + + g_return_val_if_fail (account_mgr, NULL); - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + obj = G_OBJECT(g_object_new(MODEST_TYPE_TNY_ACCOUNT_STORE, NULL)); + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj); - /* is it a store or a transport? */ - if (is_store) - tny_account = TNY_ACCOUNT_IFACE(tny_store_account_new ()); - else - tny_account = TNY_ACCOUNT_IFACE(tny_transport_account_new ()); + 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); - if (!tny_account) { - g_warning ("failed to create new tny %s account", - is_store ? "store" : "transport"); + 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; - } - - tny_account_iface_set_account_store (TNY_ACCOUNT_IFACE(tny_account), - TNY_ACCOUNT_STORE_IFACE(self)); - /* id */ - tny_account_iface_set_id (tny_account, key); - - /* proto */ - val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key, - MODEST_ACCOUNT_PROTO, NULL); - if (val) { - tny_account_iface_set_proto (tny_account, val); - g_free (val); - } else { - g_warning ("protocol not defined for %s", key); - g_object_unref (G_OBJECT(tny_account)); + } 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 ()); - /* hostname */ - val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key, - MODEST_ACCOUNT_HOSTNAME, - NULL); - if (val) { - tny_account_iface_set_hostname (tny_account, val); - g_free (val); - } - - - /* username */ - val = modest_account_mgr_get_server_account_string (priv->modest_acc_mgr, key, - MODEST_ACCOUNT_USERNAME, - NULL); - if (val) { - tny_account_iface_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); - - return tny_account; + return MODEST_TNY_ACCOUNT_STORE(obj); } - -static GList* -tny_accounts_from_server_accounts (ModestTnyAccountStore *self, GSList *accounts, - gboolean is_store) +static void +modest_tny_account_store_add_store_account (TnyAccountStore *self, + TnyStoreAccount *account) { - GSList *cursor = accounts; - GList *tny_accounts = NULL; - - g_return_val_if_fail (self, NULL); + /* we should not need this...*/ + g_printerr ("modest: add_store_account_func not implemented\n"); +} - while (cursor) { - TnyAccountIface *tny_account; - gchar *key = cursor->data; - tny_account = tny_account_from_key (self, (gchar*)cursor->data, - is_store); - if (!tny_account) { - g_warning ("could not create tnyaccount for %s", - (gchar*)cursor->data); - } else { - tny_accounts = - g_list_append (tny_accounts, tny_account); - } - cursor = cursor->next; - } - return tny_accounts; +static void +modest_tny_account_store_add_transport_account (TnyAccountStore *self, + TnyTransportAccount *account) +{ + /* we should not need this...*/ + g_printerr ("modest: add_transport_account_func not implemented\n"); } - -static const GList* -modest_tny_account_store_get_store_accounts (TnyAccountStoreIface *iface) +/* create a pseudo-account for our local folders */ +static TnyAccount* +get_local_folder_account (ModestTnyAccountStore *self) { - ModestTnyAccountStore *self; + TnyStoreAccount *tny_account; + CamelURL *url; + gchar *maildir, *url_string; ModestTnyAccountStorePrivate *priv; - GSList *accounts, *cursor; - GList *tny_accounts; - - g_return_val_if_fail (iface, NULL); - self = MODEST_TNY_ACCOUNT_STORE(iface); 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; + } - accounts = - modest_account_mgr_server_account_names (priv->modest_acc_mgr, - NULL, - MODEST_PROTO_TYPE_STORE, - NULL, FALSE); + maildir = modest_local_folder_info_get_maildir_path (); + + url = camel_url_new ("maildir:", NULL); + camel_url_set_path (url, maildir); - g_message ("accounts: %d", g_slist_length (accounts)); - tny_accounts = tny_accounts_from_server_accounts (self, accounts, TRUE); - g_slist_free (accounts); - g_message ("store accounts: %d", g_list_length (tny_accounts)); + url_string = camel_url_to_string (url, 0); + tny_account_set_url_string (TNY_ACCOUNT(tny_account), url_string); + tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), + priv->tny_session_camel); - /* - * FIXME: after gconf notification support is added, - * we can simply return priv->store_account - */ - priv->store_accounts = free_gobject_list (priv->store_accounts); - priv->store_accounts = tny_accounts; + tny_account_set_name (TNY_ACCOUNT(tny_account), _("Local folders")); + + camel_url_free (url); + g_free (maildir); + g_free (url_string); - return tny_accounts; + return TNY_ACCOUNT(tny_account); } - -static const GList* -modest_tny_account_store_get_transport_accounts (TnyAccountStoreIface *iface) +static TnyAccount* +get_tny_account_from_account (ModestTnyAccountStore *self, ModestAccountData *account_data, + TnyGetAccountsRequestType type) { - ModestTnyAccountStore *self; - ModestTnyAccountStorePrivate *priv; - GSList *accounts, *cursor; - GList *tny_accounts; - - g_return_val_if_fail (iface, NULL); - - self = MODEST_TNY_ACCOUNT_STORE(iface); - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - accounts = - modest_account_mgr_server_account_names (priv->modest_acc_mgr, - NULL, - MODEST_PROTO_TYPE_TRANSPORT, - NULL, FALSE); - tny_accounts = tny_accounts_from_server_accounts (self, accounts, FALSE); - g_warning ("transport accounts: %d", g_list_length (tny_accounts)); + TnyAccount *tny_account = NULL; + ModestServerAccountData *server_account; - g_slist_free (accounts); - - /* - * FIXME: after gconf notification support is added, - * we can simply return priv->store_account - */ - priv->transport_accounts = free_gobject_list (priv->transport_accounts); - priv->transport_accounts = tny_accounts; + 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); + + 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; + } + + 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; + } + + if (account_data->display_name) + tny_account_set_name (tny_account, account_data->display_name); - return tny_accounts; /* FIXME: who will free this? */ + return tny_account; } -ModestAccountMgr *modest_tny_account_store_get_accout_mgr(ModestTnyAccountStore *self) +static void +modest_tny_account_store_get_accounts (TnyAccountStore *iface, TnyList *list, + TnyGetAccountsRequestType type) { + ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; - g_return_val_if_fail (self, NULL); - - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + GSList *accounts, *cursor; + 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); + 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); + } + + 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); + } + g_slist_free (accounts); - return priv->modest_acc_mgr; + /* 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); } - - -TnySessionCamel* -tny_account_store_get_session (TnyAccountStore *self) +static const gchar* +modest_tny_account_store_get_cache_dir (TnyAccountStore *self) { ModestTnyAccountStorePrivate *priv; - g_return_val_if_fail (self, NULL); - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - g_message ("returning tny session camel %p", - priv->tny_session_camel); - - return priv->tny_session_camel; + + if (!priv->cache_dir) + priv->cache_dir = g_build_filename (g_get_home_dir(), + MODEST_DIR, + MODEST_CACHE_DIR, + "cache", NULL); + return priv->cache_dir; } - -/** - * modest_tny_account_store_get_cache_dir: - * @self: self a TnyAccountStoreIface instance - * - * returns the pathname of the cache directory - * - * Returns: a string with the value of the pathname - * to the cache directory or NULL if the environment variable $HOME is - * not set. string should _not_ be freed by caller +/* + * callers need to unref */ -static const gchar* -modest_tny_account_store_get_cache_dir (TnyAccountStoreIface *self) +static TnyDevice* +modest_tny_account_store_get_device (TnyAccountStore *self) { ModestTnyAccountStorePrivate *priv; - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - gchar *cache_dir; + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); - if (!priv->cache_dir) { - if (g_getenv("HOME") != NULL) - priv->cache_dir = g_strconcat(g_getenv("HOME"), - "/.modest/cache/", NULL); - } - return priv->cache_dir; + if (!priv->device) + priv->device = tny_platform_factory_new_device (priv->platform_fact); + + return g_object_ref (G_OBJECT(priv->device)); } -static const TnyDeviceIface* -modest_tny_account_store_get_device (TnyAccountStoreIface *self) +static gboolean +modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, + const gchar *prompt) { - return NULL; /* FIXME */ + 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->add_store_account_func = - modest_tny_account_store_add_store_account; - klass->get_store_accounts_func = - modest_tny_account_store_get_store_accounts; - klass->add_transport_account_func = + klass->get_accounts_func = + modest_tny_account_store_get_accounts; + klass->add_transport_account_func = modest_tny_account_store_add_transport_account; - klass->get_transport_accounts_func = - modest_tny_account_store_get_transport_accounts; + 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; +} +void +modest_tny_account_store_set_get_pass_func (ModestTnyAccountStore *self, + ModestTnyGetPassFunc func) +{ + g_message (__FUNCTION__); + return; /* not implemented, we use signals */ +} + + + +TnySessionCamel* +tny_account_store_get_session (TnyAccountStore *self) +{ + g_return_val_if_fail (self, NULL); + return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self)->tny_session_camel; }