X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=f3384e02e35201273d7597c041f75ac239161c59;hp=ac083fa773e0d301061078cbc025b4f50dcbe8b5;hb=e08627af810496c08eaedba6e64fb056f812cd3e;hpb=2630f9550eb2fd5020317541c89dc8414ef4c621 diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index ac083fa..f3384e0 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -42,7 +43,7 @@ #include #include #include - +#include #include #include @@ -58,38 +59,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; - TnyPlatformFactory *platform_fact; - TnySessionCamel *tny_session_camel; - - TnyAccount *local_folders; + ModestAccountMgr *account_mgr; + TnySessionCamel *session; + + /* 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; @@ -141,7 +137,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, @@ -149,7 +145,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); } @@ -160,68 +165,44 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(obj); priv->cache_dir = NULL; - - priv->platform_fact = NULL; - priv->tny_session_camel = NULL; + priv->account_mgr = NULL; priv->device = NULL; + priv->session = 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) +static void +account_list_free (GSList *accounts) { - 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) { + g_object_unref (G_OBJECT(cursor->data)); + cursor = cursor->next; } - - 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_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), - priv->tny_session_camel); - 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); + 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); - } @@ -230,6 +211,17 @@ 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') + */ + 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); @@ -239,95 +231,27 @@ 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")); -} - - - -static void -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 (); + return MODEST_TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account), + "account_store")); } static gchar* get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) { const gchar *key; - ModestAccountMgr *account_mgr; const TnyAccountStore *account_store; ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; 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)); - + 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... */ pwd_ptr = (gpointer)&pwd; /* pwd_ptr so the compiler does not complained about * type-punned ptrs...*/ @@ -338,9 +262,8 @@ 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 (account_mgr, - key, MODEST_ACCOUNT_PASSWORD, - TRUE, NULL); + pwd = modest_account_mgr_get_string (priv->account_mgr, + key, MODEST_ACCOUNT_PASSWORD,TRUE); g_hash_table_insert (priv->password_hash, g_strdup (key), g_strdup (pwd)); } @@ -349,17 +272,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 (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 @@ -372,20 +295,19 @@ get_password (TnyAccount *account, const gchar *prompt, gboolean *cancel) } } 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; - ModestAccountMgr *account_mgr; account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account)); self = MODEST_TNY_ACCOUNT_STORE (account_store); @@ -400,121 +322,23 @@ forget_password (TnyAccount *account) { g_hash_table_insert (priv->password_hash, g_strdup (key), NULL); } - account_mgr = modest_tny_platform_factory_get_account_mgr_instance - (MODEST_TNY_PLATFORM_FACTORY(priv->platform_fact)); - /* Remove from configuration system */ - modest_account_mgr_unset (account_mgr, - key, MODEST_ACCOUNT_PASSWORD, - TRUE, NULL); -} - - - -/* instantiate the correct tny account subclass */ -static TnyAccount* -tny_account_for_proto (ModestProtocol proto) -{ - ModestProtocolType type; - TnyAccount *tny_account = NULL; - - type = modest_protocol_info_get_protocol_type (proto); - - if (type == MODEST_PROTOCOL_TYPE_TRANSPORT) - tny_account = TNY_ACCOUNT(tny_camel_transport_account_new ()); - else if (proto == MODEST_PROTOCOL_STORE_POP) - tny_account = TNY_ACCOUNT(tny_camel_pop_store_account_new ()); - else if (proto == MODEST_PROTOCOL_STORE_IMAP) - tny_account = TNY_ACCOUNT(tny_camel_imap_store_account_new ()); - else - g_return_val_if_reached (NULL); - - if (tny_account) - tny_account_set_proto (tny_account, - modest_protocol_info_get_protocol_name(proto)); - else - g_printerr ("modest: could not get tny account for %d\n", - proto); - return tny_account; + modest_account_mgr_unset (priv->account_mgr, + 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, - ModestProtocolType modest_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); - - /* 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: 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); - 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 */ - - /* 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); - - 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); - - 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; - } - g_free (priv->cache_dir); priv->cache_dir = NULL; if (priv->device) { - g_object_unref (priv->device); + g_object_unref (G_OBJECT(priv->device)); priv->device = NULL; } @@ -522,6 +346,24 @@ modest_tny_account_store_finalize (GObject *obj) g_hash_table_destroy (priv->password_hash); priv->password_hash = NULL; } + + if (priv->account_mgr) { + g_object_unref (G_OBJECT(priv->account_mgr)); + priv->account_mgr = 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); } @@ -532,30 +374,26 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr) { GObject *obj; ModestTnyAccountStorePrivate *priv; - TnyPlatformFactory *pfact; + TnyList *list; 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); - pfact = TNY_PLATFORM_FACTORY (modest_tny_platform_factory_get_instance()); - if (!pfact) { - g_printerr ("modest: cannot get platform factory instance\n"); - g_object_unref (obj); - return NULL; - } else - priv->platform_fact = pfact; + priv->account_mgr = account_mgr; + 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 ()); - priv->local_folders = get_local_folders_account (obj); /* FIXME: unref this in the end? */ + priv->session = tny_session_camel_new (TNY_ACCOUNT_STORE(obj)); + + tny_session_camel_set_ui_locker (priv->session, tny_gtk_lockable_new ()); + /* FIXME: unref this in the end? */ + + /* 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", @@ -566,108 +404,105 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr) { return MODEST_TNY_ACCOUNT_STORE(obj); } + static void -modest_tny_account_store_add_store_account (TnyAccountStore *self, - TnyStoreAccount *account) +get_cached_accounts (TnyAccountStore *self, TnyList *list, TnyAccountType type) { - /* we should not need this...*/ - g_printerr ("modest: add_store_account_func not implemented\n"); -} - + 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); -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"); + cursor = accounts; + while (cursor) { + tny_list_prepend (list, G_OBJECT(cursor->data)); + cursor = cursor->next; + } } - - -static TnyAccount* -get_tny_account_from_account (ModestTnyAccountStore *self, ModestAccountData *account_data, - TnyGetAccountsRequestType type) +/* 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) { - TnyAccount *tny_account = NULL; - ModestServerAccountData *server_account = NULL; - - 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; - - 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; - } + ModestTnyAccountStorePrivate *priv; + GSList *account_names, *cursor; + GSList *accounts = NULL; - if (account_data->display_name) - tny_account_set_name (tny_account, account_data->display_name); + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + account_names = modest_account_mgr_account_names (priv->account_mgr); - return tny_account; -} + 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) { /* something went wrong */ + 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); + /* 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, - TnyGetAccountsRequestType type) +modest_tny_account_store_get_accounts (TnyAccountStore *self, TnyList *list, + TnyGetAccountsRequestType request_type) { - ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; - GSList *accounts, *cursor; - ModestAccountMgr *account_mgr; - g_return_if_fail (account_store); + g_return_if_fail (self); g_return_if_fail (TNY_IS_LIST(list)); - - 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)); - 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); + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + if (request_type == TNY_ACCOUNT_STORE_BOTH) { + modest_tny_account_store_get_accounts (self, list, TNY_ACCOUNT_STORE_STORE_ACCOUNTS); + modest_tny_account_store_get_accounts (self, list, TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS); + return; } + + 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); - accounts = modest_account_mgr_account_names (account_mgr, NULL); - for (cursor = accounts; cursor; cursor = cursor->next) { - TnyAccount *tny_account = NULL; - 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); + } else if (request_type == TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS) { - /* also, add the local folder pseudo-account */ - if (type != TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS) { - if (!priv->local_folders) - g_printerr ("modest: no local folders account\n"); + if (!priv->transport_accounts) + priv->transport_accounts = get_accounts (self, list, TNY_ACCOUNT_TYPE_TRANSPORT); else - tny_list_prepend (list, G_OBJECT(priv->local_folders)); - } - tny_session_camel_set_account_store (priv->tny_session_camel, account_store); + 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) { @@ -694,7 +529,8 @@ 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 (priv->platform_fact); + priv->device = tny_platform_factory_new_device + (modest_tny_platform_factory_get_instance()); return g_object_ref (G_OBJECT(priv->device)); } @@ -705,13 +541,57 @@ static gboolean modest_tny_account_store_alert (TnyAccountStore *self, TnyAlertType type, const gchar *prompt) { - g_printerr ("modest: alert_func not implemented (%d, %s)\n", - type, prompt); - return TRUE; + GtkMessageType gtktype; + gboolean retval = FALSE; + GtkWidget *dialog; + + switch (type) + { + case TNY_ALERT_TYPE_INFO: + gtktype = GTK_MESSAGE_INFO; + break; + case TNY_ALERT_TYPE_WARNING: + gtktype = GTK_MESSAGE_WARNING; + break; + case TNY_ALERT_TYPE_ERROR: + default: + gtktype = GTK_MESSAGE_ERROR; + break; + } + + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, + gtktype, GTK_BUTTONS_YES_NO, prompt); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES) + retval = TRUE; + + gtk_widget_destroy (dialog); + + return retval; +} + + + +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) { TnyAccountStoreIface *klass; @@ -746,35 +626,81 @@ 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; + 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); - return MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self)->local_folders; + 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; } -/* for now, ignore the account ===> the special folders are the same, - * local folders for all accounts - * this might change, ie, IMAP might have server-side sent-items - */ -TnyFolder * -modest_tny_account_store_get_special_folder (ModestTnyAccountStore*self, TnyAccount *account, - TnyFolderType special_type) +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, NULL); - g_return_val_if_fail (0 <= special_type && special_type < TNY_FOLDER_TYPE_NUM, + g_return_val_if_fail (account_name, NULL); + g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE || type == TNY_ACCOUNT_TYPE_TRANSPORT, NULL); - //TnyAccount *local_account = - // tny_account_store_get_local_folders_account (self); + + 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) + 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 : ""); - /* FIXME: implement this */ - return NULL; + modest_account_mgr_free_account_data (priv->account_mgr, account_data); + return account; }