X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=784d77a9c0fa21e2511a4b9558642ee0116d6f79;hp=a42323c0a703fe1a021e40a8fc2f0e737dc32c76;hb=31bb0518a45f4ca59a30a650475d3a3f9ff87610;hpb=9ad90e9053e1e0cc87885f714f513061ac734632 diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index a42323c..784d77a 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -28,20 +28,28 @@ */ #include +#include #include #include #include #include #include -#include #include -#include #include -#include +#include +#include #include -#include "modest-account-mgr.h" +#include +#include + +#include +#include + #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); @@ -50,17 +58,11 @@ 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, LAST_SIGNAL }; @@ -68,21 +70,26 @@ enum { typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate; struct _ModestTnyAccountStorePrivate { - GMutex *store_lock; - gchar *cache_dir; - gulong sig1, sig2; - - GHashTable *password_hash; + gchar *cache_dir; - TnySessionCamel *tny_session_camel; - TnyDevice *device; - - ModestAccountMgr *account_mgr; + GHashTable *password_hash; + TnyDevice *device; + TnySessionCamel *tny_session_camel; + + ModestAccountMgr *account_mgr; + TnyAccount *local_folders; }; #define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_TNY_ACCOUNT_STORE, \ ModestTnyAccountStorePrivate)) + +static void on_password_requested (ModestTnyAccountStore *account_store, + const gchar* account_name, + gchar **password, + gboolean *cancel, + gboolean *remember); + /* globals */ static GObjectClass *parent_class = NULL; @@ -134,15 +141,6 @@ 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, - G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER); - signals[ACCOUNT_UPDATE_SIGNAL] = g_signal_new ("account_update", G_TYPE_FROM_CLASS (gobject_class), @@ -154,22 +152,64 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass) } + static void modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) { ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj); + priv->cache_dir = NULL; priv->account_mgr = NULL; + priv->tny_session_camel = NULL; priv->device = NULL; - priv->cache_dir = NULL; - priv->tny_session_camel = NULL; - + priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + + priv->local_folders = NULL; +} + + + + +/* create a pseudo-account for our local folders */ +static TnyAccount* +get_local_folders_account (ModestTnyAccountStore *self) +{ + TnyStoreAccount *tny_account; + CamelURL *url; + gchar *maildir, *url_string; + ModestTnyAccountStorePrivate *priv; + + 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; + } + + tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account),priv->tny_session_camel); + + 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); + tny_account_set_name (TNY_ACCOUNT(tny_account), MODEST_LOCAL_FOLDERS_ACCOUNT_NAME); + tny_account_set_id (TNY_ACCOUNT(tny_account), MODEST_LOCAL_FOLDERS_ACCOUNT_NAME); + + camel_url_free (url); + g_free (maildir); + g_free (url_string); + + return TNY_ACCOUNT(tny_account); } + static void on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean server_account, gpointer user_data) @@ -196,7 +236,8 @@ 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")); + return MODEST_TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account), + "account_store")); } @@ -207,6 +248,61 @@ set_account_store_for_account (TnyAccount *account, ModestTnyAccountStore *store g_object_set_data (G_OBJECT(account), "account_store", (gpointer)store); } +static void +on_password_requested (ModestTnyAccountStore *account_store, + const gchar* account_name, + gchar **password, + gboolean *cancel, + gboolean *remember) +{ + gchar *txt; + GtkWidget *dialog, *entry, *remember_pass_check; + + dialog = gtk_dialog_new_with_buttons (_("Password requested"), + NULL, + GTK_DIALOG_MODAL, + GTK_STOCK_CANCEL, + GTK_RESPONSE_REJECT, + GTK_STOCK_OK, + GTK_RESPONSE_ACCEPT, + NULL); + + txt = g_strdup_printf (_("Please enter your password for %s"), account_name); + gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), gtk_label_new(txt), + FALSE, FALSE, 0); + g_free (txt); + + entry = gtk_entry_new_with_max_length (40); + gtk_entry_set_visibility (GTK_ENTRY(entry), FALSE); + gtk_entry_set_invisible_char (GTK_ENTRY(entry), 0x2022); /* bullet unichar */ + + gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), entry, + TRUE, FALSE, 0); + + remember_pass_check = gtk_check_button_new_with_label (_("Remember password")); + gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), remember_pass_check, + TRUE, FALSE, 0); + + gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); + + if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { + *password = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry))); + *cancel = FALSE; + } else { + *password = NULL; + *cancel = TRUE; + } + + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (remember_pass_check))) + *remember = TRUE; + else + *remember = FALSE; + + gtk_widget_destroy (dialog); + + while (gtk_events_pending ()) + gtk_main_iteration (); +} static gchar* get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) @@ -216,139 +312,175 @@ get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; gchar *pwd = NULL; + gpointer pwd_ptr; gboolean already_asked; - - 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); - + /* is it in the hash? if it's already there, it must be wrong... */ -// already_asked = g_hash_table_lookup (priv->password_hash, key) != NULL; -/* if (already_asked) */ -/* g_warning ("password already asked for or in config (%s)", */ -/* key); */ -/* else */ -/* g_warning ("password not yet asked for or in config (%s)", */ -/* key); */ + 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_ptr); /* if the password is not already there, try ModestConf */ -// if (!already_asked) + 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) { */ -/* g_warning ("emit signal to get pass for %s", key); */ - -/* /\* we don't have it yet. we emit a signal to get the password somewhere *\/ */ -/* const gchar* name = tny_account_get_name (account); */ -/* *cancel = TRUE; */ -/* 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); */ -/* } else */ -/* *cancel = FALSE; */ - -// g_hash_table_insert (priv->password_hash, (gpointer)key, (gpointer)pwd); - - return pwd; + if (already_asked || !pwd || strlen(pwd) == 0) { + + /* we don't have it yet. Get the password from the user */ + const gchar* name = tny_account_get_name (account); + gboolean remember; + pwd = NULL; + + on_password_requested (self, 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; + } + } 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; + 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); + } + + /* Remove from configuration system */ + modest_account_mgr_unset (priv->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* -tny_account_from_name (ModestTnyAccountStore *self, const gchar *account, - const gchar *server_account, ModestProtocolType modest_type) +get_tny_account_from_server_account (ModestTnyAccountStore *self, + ModestServerAccountData *account_data, + ModestProtocolType modest_type) { 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_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 (); - + + /* proto */ + if (account_data->proto == MODEST_PROTOCOL_UNKNOWN) { + g_printerr ("modest: '%s' does not provide a protocol\n", + account_data->account_name); + return NULL; + } + + tny_account = tny_account_for_proto (account_data->proto); if (!tny_account) { - g_printerr ("modest: failed to create new tny account for '%s:%s'\n", - account, server_account); + g_printerr ("modest: could not create tny account for '%s'\n", + account_data->account_name); return NULL; } + /* Set account store, session and id */ set_account_store_for_account (TNY_ACCOUNT(tny_account), self); - - /* session */ - tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), + tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), /* session */ priv->tny_session_camel); - - /* id */ - tny_account_set_id (tny_account, server_account); - tny_account_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_set_proto (tny_account, val); - g_free (val); - } else { - g_printerr ("modest: protocol not defined for '%s:%s'\n", - account, server_account); - g_object_unref (G_OBJECT(tny_account)); - return NULL; - } - - /* hostname */ - val = modest_account_mgr_get_string (priv->account_mgr, server_account, - MODEST_ACCOUNT_HOSTNAME, TRUE, - NULL); - if (val) { - tny_account_set_hostname (tny_account, val); - g_free (val); + tny_account_set_id (tny_account, account_data->account_name); /* id */ + + /* Options */ + if (account_data->options) { + GSList *tmp = account_data->options; + while (tmp) { + tny_camel_account_add_option (TNY_CAMEL_ACCOUNT (tny_account), + tmp->data); + tmp = g_slist_next (tmp); + } } + /* Hostname & Username */ + if (account_data->username) + tny_account_set_user (tny_account, account_data->username); - /* username */ - val = modest_account_mgr_get_string (priv->account_mgr, server_account, - MODEST_ACCOUNT_USERNAME, TRUE, - NULL); - if (val) { - tny_account_set_user (tny_account, val); - g_free (val); - } + if (account_data->hostname) + tny_account_set_hostname (tny_account, account_data->hostname); + /* Password functions */ tny_account_set_pass_func (tny_account, get_password); tny_account_set_forget_pass_func (tny_account, forget_password); @@ -360,40 +492,32 @@ tny_account_from_name (ModestTnyAccountStore *self, const gchar *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; } + if (priv->account_mgr) { + g_object_unref (priv->account_mgr); + priv->account_mgr = NULL; + } + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -403,237 +527,136 @@ 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)); - 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_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 (); - - /* FIXME: don't use GNOME */ - pfact = TNY_PLATFORM_FACTORY (tny_gnome_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); + g_object_ref (G_OBJECT(priv->account_mgr)); + /* The session needs the platform factory */ 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 ()); + /* FIXME: unref this in the end? */ + + /* 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); return MODEST_TNY_ACCOUNT_STORE(obj); } - -static gboolean -add_account (TnyAccountStore *self, TnyAccount *account) { - - ModestTnyAccountStore *account_store; - ModestTnyAccountStorePrivate *priv; - - 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_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 (priv->account_mgr, - account_name, - hostname, username, NULL, - proto); -} - - static void modest_tny_account_store_add_store_account (TnyAccountStore *self, TnyStoreAccount *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"); + /* we should not need this...*/ + g_printerr ("modest: add_store_account_func not implemented\n"); } 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"); +{ + /* we should not need this...*/ + g_printerr ("modest: add_transport_account_func not implemented\n"); } -static gchar* -get_server_account_for_account (ModestTnyAccountStore *self, const gchar *account_name, - ModestProtocolType modest_type) -{ - ModestTnyAccountStorePrivate *priv; - gchar *server; - gchar *key; - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); +static TnyAccount* +get_tny_account_from_account (ModestTnyAccountStore *self, ModestAccountData *account_data, + TnyGetAccountsRequestType type) +{ + TnyAccount *tny_account = NULL; + ModestServerAccountData *server_account = NULL; - if (modest_type == MODEST_PROTOCOL_TYPE_STORE) - key = MODEST_ACCOUNT_STORE_ACCOUNT; - else if (modest_type == MODEST_PROTOCOL_TYPE_TRANSPORT) - key = MODEST_ACCOUNT_TRANSPORT_ACCOUNT; - else - g_assert_not_reached(); + 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; - 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 (TnyAccountStore *iface, - TnyList *list, +modest_tny_account_store_get_accounts (TnyAccountStore *account_store, TnyList *list, TnyGetAccountsRequestType type) { ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; GSList *accounts, *cursor; - ModestProtocolType modest_type; - g_return_if_fail (iface); - - self = MODEST_TNY_ACCOUNT_STORE(iface); - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + g_return_if_fail (account_store); + g_return_if_fail (TNY_IS_LIST(list)); - switch (type) { - case TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS: - modest_type = MODEST_PROTOCOL_TYPE_TRANSPORT; - break; - case TNY_ACCOUNT_STORE_STORE_ACCOUNTS: - modest_type = MODEST_PROTOCOL_TYPE_STORE; - break; - case TNY_ACCOUNT_STORE_BOTH: - modest_type = MODEST_PROTOCOL_TYPE_ANY; - break; - default: - g_assert_not_reached (); + self = MODEST_TNY_ACCOUNT_STORE(account_store); + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + if (type == TNY_ACCOUNT_STORE_BOTH) { + modest_tny_account_store_get_accounts (account_store, list, + TNY_ACCOUNT_STORE_STORE_ACCOUNTS); + modest_tny_account_store_get_accounts (account_store, 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; - TnyAccount *account; - - account_name = (gchar*)cursor->data; - account = NULL; - - if (!modest_account_mgr_account_get_enabled (priv->account_mgr, account_name)) { - g_free (account_name); - cursor = cursor->next; - continue; - } - - if (modest_type == MODEST_PROTOCOL_TYPE_TRANSPORT || modest_type == MODEST_PROTOCOL_TYPE_ANY) { - server_account = get_server_account_for_account (self, account_name, - MODEST_PROTOCOL_TYPE_TRANSPORT); - if (server_account) - account = tny_account_from_name (self, account_name, - server_account, - MODEST_PROTOCOL_TYPE_TRANSPORT); - if (!account) - g_printerr ("modest: no transport account for '%s'\n", - account_name); - else - tny_list_prepend (list, G_OBJECT(account)); - - g_free (server_account); + accounts = modest_account_mgr_account_names (priv->account_mgr, NULL); + for (cursor = accounts; cursor; cursor = cursor->next) { + TnyAccount *tny_account = NULL; + ModestAccountData *account_data = + modest_account_mgr_get_account_data (priv->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)); } - - if (modest_type == MODEST_PROTOCOL_TYPE_STORE || modest_type == MODEST_PROTOCOL_TYPE_ANY) { - server_account = get_server_account_for_account (self, account_name, - MODEST_PROTOCOL_TYPE_STORE); - if (server_account) - account = tny_account_from_name (self, account_name, - server_account, - MODEST_PROTOCOL_TYPE_STORE); - if (!account) - g_printerr ("modest: no store account for '%s'\n", - account_name); - else - tny_list_prepend (list, G_OBJECT(account)); - g_free (server_account); - } - - g_free (account_name); - cursor = cursor->next; + g_free (cursor->data); + modest_account_mgr_free_account_data (priv->account_mgr, account_data); } - g_slist_free (accounts); - tny_session_camel_set_account_store (priv->tny_session_camel, iface); -/* tny_session_camel_set_current_accounts (priv->tny_session_camel, */ -/* list); */ + /* also, add the local folder pseudo-account */ + if (type != TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS) { + if (!priv->local_folders) + priv->local_folders = get_local_folders_account (self); + if (!priv->local_folders) + g_printerr ("modest: no local folders account\n"); + else + tny_list_prepend (list, G_OBJECT(priv->local_folders)); + } + tny_session_camel_set_account_store (priv->tny_session_camel, account_store); } - -/* - * 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) { @@ -641,10 +664,10 @@ 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, + "cache", NULL); return priv->cache_dir; } @@ -659,6 +682,10 @@ modest_tny_account_store_get_device (TnyAccountStore *self) priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + if (!priv->device) + priv->device = tny_platform_factory_new_device + (modest_tny_platform_factory_get_instance()); + return g_object_ref (G_OBJECT(priv->device)); } @@ -668,9 +695,8 @@ static gboolean modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, const gchar *prompt) { - g_printerr ("modest: alert [%d]: %s", + g_printerr ("modest: alert_func not implemented (%d, %s)\n", type, prompt); - return TRUE; } @@ -702,15 +728,23 @@ 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)->tny_session_camel; +} + + +TnyAccount* +modest_tny_account_store_get_local_folders_account (ModestTnyAccountStore *self) { g_return_val_if_fail (self, NULL); - return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self)->tny_session_camel; + return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self)->local_folders; } +