X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=3d70bb0221c5e72a0d81b0dc72d2e494fa1b1ec1;hp=19d5b46ac1dce7de22aee5187158273d68b2119c;hb=976c05744180efac28a9dc421acefcff18659d67;hpb=fd54149b68b3777ce63ebf25346bbc485cd84ec8 diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 19d5b46..3d70bb0 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -34,16 +34,17 @@ #include #include #include -#include #include #include #include #include #include + +#include #include #include #include - +#include #include #include @@ -52,6 +53,10 @@ #include #include +#ifdef MODEST_PLATFORM_MAEMO +#include +#endif + /* 'private'/'protected' functions */ static void modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass); //static void modest_tny_account_store_init (ModestTnyAccountStore *obj); @@ -59,38 +64,33 @@ static void modest_tny_account_store_finalize (GObject *obj); /* implementations for tny-account-store-iface */ static void modest_tny_account_store_instance_init (ModestTnyAccountStore *obj); -static void modest_tny_account_store_init (gpointer g, gpointer iface_data); +static void modest_tny_account_store_init (gpointer g, gpointer iface_data); /* list my signals */ enum { ACCOUNT_UPDATE_SIGNAL, + PASSWORD_REQUESTED_SIGNAL, LAST_SIGNAL }; typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate; struct _ModestTnyAccountStorePrivate { - - gchar *cache_dir; - + gchar *cache_dir; GHashTable *password_hash; - TnyDevice *device; - TnySessionCamel *tny_session_camel; - ModestAccountMgr *account_mgr; - TnyAccount *local_folders; + TnySessionCamel *session; + TnyDevice *device; + + /* we cache them here */ + GSList *store_accounts; + GSList *transport_accounts; }; #define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_TNY_ACCOUNT_STORE, \ ModestTnyAccountStorePrivate)) -static void on_password_requested (ModestTnyAccountStore *account_store, - const gchar* account_name, - gchar **password, - gboolean *cancel, - gboolean *remember); - /* globals */ static GObjectClass *parent_class = NULL; @@ -142,7 +142,7 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass) g_type_class_add_private (gobject_class, sizeof(ModestTnyAccountStorePrivate)); - signals[ACCOUNT_UPDATE_SIGNAL] = + signals[ACCOUNT_UPDATE_SIGNAL] = g_signal_new ("account_update", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_FIRST, @@ -150,7 +150,16 @@ modest_tny_account_store_class_init (ModestTnyAccountStoreClass *klass) NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); - + + signals[PASSWORD_REQUESTED_SIGNAL] = + g_signal_new ("password_requested", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(ModestTnyAccountStoreClass, password_requested), + NULL, NULL, + modest_marshal_VOID__STRING_POINTER_POINTER_POINTER, + G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER, + G_TYPE_POINTER); } @@ -162,76 +171,52 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) priv->cache_dir = NULL; priv->account_mgr = NULL; - priv->tny_session_camel = NULL; + priv->session = NULL; priv->device = NULL; priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - - priv->local_folders = NULL; } -/* we need these dummy functions, or tinymail will complain */ -static gchar* -get_password_dummy (TnyAccount *account, const gchar *prompt, gboolean *cancel) -{ - return NULL; -} + static void -forget_password_dummy (TnyAccount *account) +account_list_free (GSList *accounts) { - return; -} - -/* 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; + GSList *cursor = accounts; + + while (cursor) { + if (G_IS_OBJECT(cursor->data)) { /* check twice... */ + const gchar *id = tny_account_get_id(TNY_ACCOUNT(cursor->data)); + modest_runtime_verify_object_last_ref(cursor->data,id); + } + g_object_unref (G_OBJECT(cursor->data)); + cursor = cursor->next; } - - 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); - tny_account_set_forget_pass_func (TNY_ACCOUNT(tny_account), forget_password_dummy); - tny_account_set_pass_func (TNY_ACCOUNT(tny_account), get_password_dummy); - - camel_url_free (url); - g_free (maildir); - g_free (url_string); - - return TNY_ACCOUNT(tny_account); + g_slist_free (accounts); } - static void on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean server_account, gpointer user_data) { - ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); + ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + /* FIXME: make this more finegrained; changes do not really affect _all_ + * accounts, and some do not affect tny accounts at all (such as 'last_update') + */ + + + account_list_free (priv->store_accounts); + priv->store_accounts = NULL; + + account_list_free (priv->transport_accounts); + priv->transport_accounts = NULL; + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, account); - } @@ -240,7 +225,21 @@ on_account_changed (ModestAccountMgr *acc_mgr, const gchar *account, gboolean se const gchar *key, gpointer user_data) { ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data); + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + /* FIXME: make this more finegrained; changes do not really affect _all_ + * accounts, and some do not affect tny accounts at all (such as 'last_update') + */ + if (priv->store_accounts) { + account_list_free (priv->store_accounts); + priv->store_accounts = NULL; + } + if (priv->transport_accounts) { + account_list_free (priv->transport_accounts); + priv->transport_accounts = NULL; + } + g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, account); } @@ -253,60 +252,6 @@ get_account_store_for_account (TnyAccount *account) "account_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); -} - static gchar* get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) { @@ -317,7 +262,6 @@ get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) gchar *pwd = NULL; gpointer pwd_ptr; gboolean already_asked; - key = tny_account_get_id (account); account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account)); @@ -336,8 +280,7 @@ get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) /* 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); + key, MODEST_ACCOUNT_PASSWORD,TRUE); g_hash_table_insert (priv->password_hash, g_strdup (key), g_strdup (pwd)); } @@ -346,17 +289,17 @@ get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) /* we don't have it yet. Get the password from the user */ const gchar* name = tny_account_get_name (account); - gboolean remember; + gboolean remember = FALSE; pwd = NULL; - - on_password_requested (self, name, &pwd, cancel, &remember); - + + 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); + modest_account_mgr_set_string (priv->account_mgr,key, + MODEST_ACCOUNT_PASSWORD, + pwd, TRUE); /* We need to dup the string even knowing that it's already a dup of the contents of an entry, because it if it's wrong, then camel @@ -369,7 +312,7 @@ get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) } } else *cancel = FALSE; - + return pwd; } @@ -398,115 +341,20 @@ forget_password (TnyAccount *account) /* Remove from configuration system */ modest_account_mgr_unset (priv->account_mgr, - key, MODEST_ACCOUNT_PASSWORD, - TRUE, NULL); + key, MODEST_ACCOUNT_PASSWORD, TRUE); } -/* 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, TnyAccountType type) -{ - TnyAccount *tny_account; - ModestTnyAccountStorePrivate *priv; - - g_return_val_if_fail (self, NULL); - g_return_val_if_fail (account_data, NULL); - - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - /* sanity checks */ - if (account_data->proto == MODEST_PROTOCOL_UNKNOWN) { - g_printerr ("modest: '%s' does not provide a protocol\n", - account_data->account_name); - return NULL; - } - if ((account_data->proto == MODEST_PROTOCOL_TYPE_TRANSPORT && type != TNY_ACCOUNT_TYPE_TRANSPORT) || - (account_data->proto == MODEST_PROTOCOL_TYPE_STORE && type != TNY_ACCOUNT_TYPE_STORE)) { - g_printerr ("modest: protocol types do not match <%d,%d>\n", account_data->proto, type); - return NULL; - } - - switch (account_data->proto) { - case MODEST_PROTOCOL_TRANSPORT_SENDMAIL: - case MODEST_PROTOCOL_TRANSPORT_SMTP: - tny_account = TNY_ACCOUNT(tny_camel_transport_account_new ()); break; - case MODEST_PROTOCOL_STORE_POP: - tny_account = TNY_ACCOUNT(tny_camel_pop_store_account_new ()); break; - case MODEST_PROTOCOL_STORE_IMAP: - tny_account = TNY_ACCOUNT(tny_camel_imap_store_account_new ()); break; - case MODEST_PROTOCOL_STORE_MAILDIR: - case MODEST_PROTOCOL_STORE_MBOX: - tny_account = TNY_ACCOUNT(tny_camel_store_account_new()); break; - default: - g_return_val_if_reached (NULL); - } - - if (!tny_account) { - g_printerr ("modest: could not create tny account for '%s'\n", - account_data->account_name); - return NULL; - } - tny_account_set_id (tny_account, account_data->account_name); - - /* - * FIXME --> bug in tinymail - */ - if (type == TNY_ACCOUNT_TYPE_TRANSPORT) { - g_printerr ("modest: BUG: cannot create transports accounts... stay tuned\n"); - g_object_unref (G_OBJECT(tny_account)); - return NULL; - } - - tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), priv->tny_session_camel); - tny_account_set_forget_pass_func (tny_account, forget_password); - tny_account_set_pass_func (tny_account, get_password); - - /* Proto */ - tny_account_set_proto (tny_account, - modest_protocol_info_get_protocol_name(account_data->proto)); - g_object_set_data (G_OBJECT(tny_account), "account_store", (gpointer)self); - - if (account_data->uri) - tny_account_set_url_string (TNY_ACCOUNT(tny_account), account_data->uri); - else { - if (account_data->options) { - GSList *options = account_data->options; - while (options) { - tny_camel_account_add_option (TNY_CAMEL_ACCOUNT (tny_account), - options->data); - options = g_slist_next (options); - } - } - if (account_data->username) - tny_account_set_user (tny_account, account_data->username); - if (account_data->hostname) - tny_account_set_hostname (tny_account, account_data->hostname); - } - 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->tny_session_camel) { - camel_object_unref (CAMEL_OBJECT(priv->tny_session_camel)); - priv->tny_session_camel = NULL; - } + + //gboolean debug = modest_runtime_get_debug_flags() & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS; 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); @@ -514,38 +362,58 @@ modest_tny_account_store_finalize (GObject *obj) } if (priv->account_mgr) { - g_object_unref (priv->account_mgr); + g_object_unref (G_OBJECT(priv->account_mgr)); priv->account_mgr = NULL; } + + if (priv->device) { + g_object_unref (G_OBJECT(priv->device)); + priv->device = NULL; + } + + /* this includes the local folder */ + account_list_free (priv->store_accounts); + priv->store_accounts = NULL; + + account_list_free (priv->transport_accounts); + priv->transport_accounts = NULL; + + if (priv->session) { + camel_object_unref (CAMEL_OBJECT(priv->session)); + priv->session = NULL; + } G_OBJECT_CLASS(parent_class)->finalize (obj); } ModestTnyAccountStore* -modest_tny_account_store_new (ModestAccountMgr *account_mgr) { +modest_tny_account_store_new (ModestAccountMgr *account_mgr, TnyDevice *device) { GObject *obj; ModestTnyAccountStorePrivate *priv; + TnyList *list; g_return_val_if_fail (account_mgr, NULL); + g_return_val_if_fail (device, NULL); obj = G_OBJECT(g_object_new(MODEST_TYPE_TNY_ACCOUNT_STORE, NULL)); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj); - priv->account_mgr = account_mgr; - g_object_ref (G_OBJECT(priv->account_mgr)); + priv->account_mgr = g_object_ref (G_OBJECT(account_mgr)); + priv->device = g_object_ref (device); - /* 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; - } + priv->session = tny_session_camel_new (TNY_ACCOUNT_STORE(obj)); - tny_session_camel_set_ui_locker (priv->tny_session_camel, tny_gtk_lockable_new ()); + tny_session_camel_set_ui_locker (priv->session, tny_gtk_lockable_new ()); /* FIXME: unref this in the end? */ + tny_session_camel_set_async_connecting (priv->session, TRUE); + + /* force a cache fill... ugly */ + list = TNY_LIST(tny_simple_list_new()); + tny_account_store_get_accounts (TNY_ACCOUNT_STORE(obj), list, + TNY_ACCOUNT_STORE_BOTH); + g_object_unref(list); /* Connect signals */ g_signal_connect (G_OBJECT(account_mgr), "account_changed", @@ -557,105 +425,113 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr) { } -static TnyAccount* -get_tny_account_from_account (ModestTnyAccountStore *self, ModestAccountData *account_data, - TnyAccountType type) +static void +get_cached_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) { - TnyAccount *tny_account = NULL; - ModestServerAccountData *server_account = NULL; + ModestTnyAccountStorePrivate *priv; + GSList *accounts, *cursor; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + accounts = (type == TNY_ACCOUNT_TYPE_STORE ? priv->store_accounts : priv->transport_accounts); - if (type == TNY_ACCOUNT_TYPE_STORE && account_data->store_account) - server_account = account_data->store_account; - else if (type == TNY_ACCOUNT_TYPE_TRANSPORT && account_data->transport_account) - server_account = account_data->transport_account; - - if (!server_account) { - g_printerr ("modest: no %s account defined for '%s'\n", - type == TNY_ACCOUNT_TYPE_STORE ? "store" : "transport", - account_data->display_name); - return NULL; + cursor = accounts; + while (cursor) { + tny_list_prepend (list, G_OBJECT(cursor->data)); + cursor = cursor->next; } +} + + + +/* this function fills the TnyList, and also returns a GSList of the accounts, + * for caching purposes + */ +static GSList* +get_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) +{ + ModestTnyAccountStorePrivate *priv = NULL; + GSList *account_names = NULL, *cursor = NULL; + GSList *accounts = NULL; - 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 (%s)\n", - account_data->account_name, server_account->account_name); - return NULL; + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + account_names = modest_account_mgr_account_names (priv->account_mgr, + TRUE /* including disabled accounts */); + + for (cursor = account_names; cursor; cursor = cursor->next) { + + gchar *account_name = (gchar*)cursor->data; + + /* only return enabled accounts */ + if (modest_account_mgr_get_enabled(priv->account_mgr, account_name)) { + TnyAccount *tny_account = + modest_tny_account_new_from_account (priv->account_mgr, + account_name, + type, priv->session, + get_password, + forget_password); + if (tny_account) { + g_object_set_data (G_OBJECT(tny_account), "account_store", + (gpointer)self); + tny_list_prepend (list, G_OBJECT(tny_account)); + accounts = g_slist_append (accounts, tny_account); /* cache it */ + } else + g_printerr ("modest: failed to create account for %s\n", + account_name); + } + g_free (account_name); } + g_slist_free (account_names); - /* this name is what shows up in the folder view -- so for some POP/IMAP/... server - * account, we set its name to the acount of which it is part */ - if (account_data->display_name) - tny_account_set_name (tny_account, account_data->display_name); - - return tny_account; -} + /* also, add the local folder pseudo-account */ + if (type == TNY_ACCOUNT_TYPE_STORE) { + TnyAccount *tny_account = + modest_tny_account_new_for_local_folders (priv->account_mgr, priv->session); + tny_list_prepend (list, G_OBJECT(tny_account)); + accounts = g_slist_append (accounts, tny_account); /* cache it */ + } + return accounts; +} static void -modest_tny_account_store_get_accounts (TnyAccountStore *account_store, TnyList *list, +modest_tny_account_store_get_accounts (TnyAccountStore *self, TnyList *list, TnyGetAccountsRequestType request_type) { - TnyAccountType type; - ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; - GSList *accounts, *cursor; - g_return_if_fail (account_store); + g_return_if_fail (self); g_return_if_fail (TNY_IS_LIST(list)); - g_return_if_fail (request_type == TNY_ACCOUNT_STORE_STORE_ACCOUNTS || - request_type == TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS || - request_type == TNY_ACCOUNT_STORE_BOTH); - self = MODEST_TNY_ACCOUNT_STORE(account_store); - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); if (request_type == TNY_ACCOUNT_STORE_BOTH) { - modest_tny_account_store_get_accounts (account_store, list, + modest_tny_account_store_get_accounts (self, list, TNY_ACCOUNT_STORE_STORE_ACCOUNTS); - modest_tny_account_store_get_accounts (account_store, list, + modest_tny_account_store_get_accounts (self, list, TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS); return; } - - /* - * confusingly, tinymail uses both TnyAccountRequestType and TnyAccountType - */ - switch (request_type) { - case TNY_ACCOUNT_STORE_STORE_ACCOUNTS : type = TNY_ACCOUNT_TYPE_STORE; break; - case TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS: type = TNY_ACCOUNT_TYPE_TRANSPORT; break; - default: g_return_if_reached (); /* 'BOTH' is not possible here */ - } - 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->is_enabled) { - tny_account = get_tny_account_from_account (self, account_data, type); - if (tny_account) { - tny_list_prepend (list, G_OBJECT(tny_account)); - g_object_unref (G_OBJECT(tny_account)); - } - } - g_free (cursor->data); - modest_account_mgr_free_account_data (priv->account_mgr, account_data); - } - g_slist_free (accounts); - - /* also, add the local folder pseudo-account */ - if (request_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)); - } + if (request_type == TNY_ACCOUNT_STORE_STORE_ACCOUNTS) { + + if (!priv->store_accounts) + priv->store_accounts = get_accounts (self, list, TNY_ACCOUNT_TYPE_STORE); + else + get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_STORE); + + } else if (request_type == TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS) { + + if (!priv->transport_accounts) + priv->transport_accounts = + get_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT); + else + get_cached_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT); + } else + g_return_if_reached (); /* incorrect req type */ } + static const gchar* modest_tny_account_store_get_cache_dir (TnyAccountStore *self) { @@ -664,9 +540,7 @@ modest_tny_account_store_get_cache_dir (TnyAccountStore *self) if (!priv->cache_dir) priv->cache_dir = g_build_filename (g_get_home_dir(), - MODEST_DIR, - MODEST_CACHE_DIR, - "cache", NULL); + MODEST_DIR, MODEST_CACHE_DIR, NULL); return priv->cache_dir; } @@ -679,13 +553,49 @@ modest_tny_account_store_get_device (TnyAccountStore *self) { ModestTnyAccountStorePrivate *priv; - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + g_return_val_if_fail (self, NULL); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + if (priv->device) + return g_object_ref (G_OBJECT(priv->device)); + else + return NULL; +} + - if (!priv->device) - priv->device = tny_platform_factory_new_device - (modest_tny_platform_factory_get_instance()); +static TnyAccount* +modest_tny_account_store_find_account_by_url (TnyAccountStore *self, const gchar* url_string) +{ + TnyAccount *account = NULL; + ModestTnyAccountStorePrivate *priv; + GSList *cursor; - return g_object_ref (G_OBJECT(priv->device)); + g_return_val_if_fail (self, NULL); + g_return_val_if_fail (url_string, NULL); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) { + if (tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), url_string)) { + account = TNY_ACCOUNT(cursor->data); + break; + } + } + + if (!account) { + for (cursor = priv->transport_accounts; !account && cursor ; cursor = cursor->next) { + if (tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), url_string)) { + account = TNY_ACCOUNT(cursor->data); + break; + } + } + } + + if (account) + g_object_ref (G_OBJECT(account)); + + return account; } @@ -724,26 +634,6 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, } - -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 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 void modest_tny_account_store_init (gpointer g, gpointer iface_data) { @@ -755,16 +645,14 @@ modest_tny_account_store_init (gpointer g, gpointer iface_data) klass->get_accounts_func = modest_tny_account_store_get_accounts; - klass->add_transport_account_func = - modest_tny_account_store_add_transport_account; - klass->add_store_account_func = - modest_tny_account_store_add_store_account; klass->get_cache_dir_func = modest_tny_account_store_get_cache_dir; klass->get_device_func = modest_tny_account_store_get_device; klass->alert_func = modest_tny_account_store_alert; + klass->find_account_func = + modest_tny_account_store_find_account_by_url; } void @@ -778,15 +666,145 @@ modest_tny_account_store_set_get_pass_func (ModestTnyAccountStore *self, 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; + g_return_val_if_fail (self, NULL); + return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self)->session; } TnyAccount* -modest_tny_account_store_get_local_folders_account (ModestTnyAccountStore *self) +modest_tny_account_store_get_tny_account_by_id (ModestTnyAccountStore *self, const gchar *id) +{ + TnyAccount *account = NULL; + ModestTnyAccountStorePrivate *priv; + GSList *cursor; + + g_return_val_if_fail (self, NULL); + g_return_val_if_fail (id, NULL); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + for (cursor = priv->store_accounts; cursor ; cursor = cursor->next) { + const gchar *acc_id = tny_account_get_id (TNY_ACCOUNT(cursor->data)); + if (acc_id && strcmp (acc_id, id) == 0) { + account = TNY_ACCOUNT(cursor->data); + break; + } + } + + /* if we already found something, no need to search the transport accounts */ + for (cursor = priv->transport_accounts; !account && cursor ; cursor = cursor->next) { + const gchar *acc_id = tny_account_get_id (TNY_ACCOUNT(cursor->data)); + if (acc_id && strcmp (acc_id, id) == 0) { + account = TNY_ACCOUNT(cursor->data); + break; + } + } + + if (account) + g_object_ref (G_OBJECT(account)); + + return account; +} + +TnyAccount* +modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self, + const gchar *account_name, + TnyAccountType type) { + TnyAccount *account = NULL; + ModestAccountData *account_data; + const gchar *id = NULL; + ModestTnyAccountStorePrivate *priv; + g_return_val_if_fail (self, NULL); + g_return_val_if_fail (account_name, NULL); + g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE || type == TNY_ACCOUNT_TYPE_TRANSPORT, + NULL); + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + account_data = modest_account_mgr_get_account_data (priv->account_mgr, account_name); + if (!account_data) { + g_printerr ("modest: cannot get account data for account '%s'\n", account_name); + return NULL; + } + + if (type == TNY_ACCOUNT_TYPE_STORE && account_data->store_account) + id = account_data->store_account->account_name; + else if (account_data->transport_account) + id = account_data->transport_account->account_name; + + if (!id) + g_printerr ("modest: could not get an id for account %s\n", + account_name); + else + account = modest_tny_account_store_get_tny_account_by_id (self, id); + + if (!account) + g_printerr ("modest: could not get tny %s account for %s (id=%s)\n", + type == TNY_ACCOUNT_TYPE_STORE? "store" : "transport", + account_name, id ? id : ""); + + modest_account_mgr_free_account_data (priv->account_mgr, account_data); + return account; +} + +static TnyAccount* get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self, const gchar *account_name) +{ + /* Get the current connection: */ + TnyDevice *device = modest_runtime_get_device (); + + if (!tny_device_is_online (device)) + return NULL; + +#ifdef MODEST_PLATFORM_MAEMO + g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device)); + TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device); + const gchar* iap_id = tny_maemo_conic_device_get_current_iap_id (maemo_device); + if (!iap_id) + return NULL; + + ConIcIap* connection = tny_maemo_conic_device_get_iap (maemo_device, iap_id); + if (!connection) + return NULL; + + const gchar *connection_name = con_ic_iap_get_name (connection); + if (!connection_name) + return NULL; + + /* Get the connection-specific transport acccount, if any: */ + ModestAccountMgr *account_manager = modest_runtime_get_account_mgr (); + gchar* server_account_name = modest_account_mgr_get_connection_specific_smtp (account_manager, + account_name, connection_name); + + if (!server_account_name) + return NULL; /* No connection-specific SMTP server was specified for this connection. */ + + TnyAccount* account = modest_tny_account_store_get_tny_account_by_id (self, server_account_name); + g_free (server_account_name); + + /* Unref the get()ed object, as required by the tny_maemo_conic_device_get_iap() documentation. */ + g_object_unref (connection); - return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self)->local_folders; + return account; +#else + return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */ +#endif /* MODEST_PLATFORM_MAEMO */ +} + + +TnyAccount* modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAccountStore *self, + const gchar *account_name) +{ + /* Get the connection-specific transport acccount, if any: */ + TnyAccount *account = get_smtp_specific_transport_account_for_open_connection (self, account_name); + + /* If there is no connection-specific transport account (the common case), + * just get the regular transport account: */ + if (!account) { + account = modest_tny_account_store_get_tny_account_by_account (self, account_name, + TNY_ACCOUNT_TYPE_TRANSPORT); + } + + return account; }