X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=662cd67ac92b887cfc2968c9c635ad475442e08d;hp=e0cd50b751bcb1fc9bc7055110b43968ce6223e4;hb=6176599f0b7cee7a6cef893d05688e1c09be521f;hpb=54d35f158a8ffa5a3bc4c13aeceff3b61070afab diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index e0cd50b..662cd67 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -40,11 +40,12 @@ #include #include #include - +#include "modest-text-utils.h" #include #include -#include +#include #include +#include "modest-account-protocol.h" #include #include #include @@ -53,16 +54,18 @@ #include #include +#include #include "modest-tny-account-store.h" #include "modest-tny-platform-factory.h" #include #include #include +#include "modest-ui-actions.h" +#include #ifdef MODEST_PLATFORM_MAEMO #include #include -#include #endif #include @@ -78,7 +81,7 @@ static void on_account_inserted (ModestAccountMgr *acc_mgr, const gchar *account, gpointer user_data); -static void add_existing_accounts (ModestTnyAccountStore *self); +static void add_existing_accounts (ModestTnyAccountStore *self); static void insert_account (ModestTnyAccountStore *self, const gchar *account, @@ -102,11 +105,15 @@ static void on_vfs_volume_unmounted (GnomeVFSVolumeMonitor *volume_monito GnomeVFSVolume *volume, gpointer user_data); -static void modest_tny_account_store_forget_password_in_memory (ModestTnyAccountStore *self, - const gchar *server_account_name); +static void forget_password_in_memory (ModestTnyAccountStore *self, + const gchar *server_account_name); static void add_connection_specific_transport_accounts (ModestTnyAccountStore *self); +static void remove_connection_specific_transport_accounts (ModestTnyAccountStore *self); + +static inline gboolean only_local_accounts (ModestTnyAccountStore *self); + /* list my signals */ enum { ACCOUNT_CHANGED_SIGNAL, @@ -121,9 +128,6 @@ typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate; struct _ModestTnyAccountStorePrivate { gchar *cache_dir; GHashTable *password_hash; -#ifdef MODEST_PLATFORM_MAEMO - GHashTable *account_settings_dialog_hash; -#endif ModestAccountMgr *account_mgr; TnySessionCamel *session; TnyDevice *device; @@ -137,6 +141,9 @@ struct _ModestTnyAccountStorePrivate { /* Matches transport accounts and outbox folder */ GHashTable *outbox_of_transport; + + /* is sending mail blocked? */ + gboolean send_mail_blocked; }; #define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -258,6 +265,7 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) priv->session = NULL; priv->device = NULL; priv->sighandlers = NULL; + priv->send_mail_blocked = FALSE; priv->outbox_of_transport = g_hash_table_new_full (g_direct_hash, g_direct_equal, @@ -271,13 +279,6 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); -#ifdef MODEST_PLATFORM_MAEMO - /* A hash-map of modest account names to dialog pointers, - * so we can avoid showing the account settings twice for the same modest account: */ - priv->account_settings_dialog_hash = g_hash_table_new_full (g_str_hash, g_str_equal, - g_free, NULL); -#endif - /* Respond to volume mounts and unmounts, such * as the insertion/removal of the memory card: */ /* This is a singleton, so it does not need to be unrefed. */ @@ -296,15 +297,6 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) /* disconnect the list of TnyAccounts */ static void -account_disconnect (TnyAccount *account) -{ - g_return_if_fail (account && TNY_IS_ACCOUNT(account)); - tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(account), FALSE, NULL, NULL); -} - - -/* disconnect the list of TnyAccounts */ -static void account_verify_last_ref (TnyAccount *account, const gchar *str) { gchar *txt; @@ -316,9 +308,6 @@ account_verify_last_ref (TnyAccount *account, const gchar *str) g_free (txt); } - - - static void foreach_account_append_to_list (gpointer data, gpointer user_data) @@ -342,8 +331,8 @@ add_mmc_account(ModestTnyAccountStore *self, gboolean emit_insert_signal) g_return_if_fail (priv->session); TnyAccount *mmc_account = modest_tny_account_new_for_local_folders (priv->account_mgr, - priv->session, - MODEST_MCC1_VOLUMEPATH); + priv->session, + g_getenv (MODEST_MMC1_VOLUMEPATH_ENV)); /* Add to the list of store accounts */ tny_list_append (priv->store_accounts, G_OBJECT (mmc_account)); @@ -365,6 +354,7 @@ on_vfs_volume_mounted(GnomeVFSVolumeMonitor *volume_monitor, { ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; + gchar *volume_path_uri; gchar *uri = NULL; @@ -374,10 +364,14 @@ on_vfs_volume_mounted(GnomeVFSVolumeMonitor *volume_monitor, /* Check whether this was the external MMC1 card: */ uri = gnome_vfs_volume_get_activation_uri (volume); - if (uri && (!strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI))) { + volume_path_uri = g_strconcat (MODEST_MMC1_VOLUMEPATH_URI_PREFIX, + g_getenv (MODEST_MMC1_VOLUMEPATH_ENV), + NULL); + if (uri && (!strcmp (uri, volume_path_uri))) { add_mmc_account (self, TRUE /* emit the insert signal. */); } - + + g_free (volume_path_uri); g_free (uri); } @@ -389,13 +383,17 @@ on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; gchar *uri = NULL; + gchar *volume_path_uri; self = MODEST_TNY_ACCOUNT_STORE(user_data); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); /* Check whether this was the external MMC1 card: */ uri = gnome_vfs_volume_get_activation_uri (volume); - if (uri && (strcmp (uri, MODEST_MCC1_VOLUMEPATH_URI) == 0)) { + volume_path_uri = g_strconcat (MODEST_MMC1_VOLUMEPATH_URI_PREFIX, + g_getenv (MODEST_MMC1_VOLUMEPATH_ENV), + NULL); + if (uri && (strcmp (uri, volume_path_uri) == 0)) { TnyAccount *mmc_account = NULL; gboolean found = FALSE; TnyIterator *iter = NULL; @@ -429,11 +427,12 @@ on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, __FUNCTION__); } } + g_free (volume_path_uri); g_free (uri); } /** - * modest_tny_account_store_forget_password_in_memory + * forget_password_in_memory * @self: a TnyAccountStore instance * @account: A server account. * @@ -441,9 +440,9 @@ on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, * For instance, this should be called when the user has changed the password in the account settings. */ static void -modest_tny_account_store_forget_password_in_memory (ModestTnyAccountStore *self, const gchar * server_account_name) +forget_password_in_memory (ModestTnyAccountStore *self, + const gchar * server_account_name) { - /* printf ("DEBUG: %s\n", __FUNCTION__); */ ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); if (server_account_name && priv->password_hash) { @@ -467,7 +466,7 @@ on_account_changed (ModestAccountMgr *acc_mgr, account_list = (account_type == TNY_ACCOUNT_TYPE_STORE ? priv->store_accounts : priv->transport_accounts); - + iter = tny_list_create_iterator (account_list); while (!tny_iterator_is_done (iter) && !found) { TnyAccount *tny_account; @@ -475,75 +474,53 @@ on_account_changed (ModestAccountMgr *acc_mgr, if (tny_account) { if (!strcmp (tny_account_get_id (tny_account), account_name)) { found = TRUE; - modest_tny_account_update_from_account (tny_account); + modest_tny_account_update_from_account (tny_account, get_password, forget_password); g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, tny_account); } g_object_unref (tny_account); } tny_iterator_next (iter); } - - if (iter) - g_object_unref (iter); + g_object_unref (iter); } -#ifdef MODEST_PLATFORM_MAEMO static void -on_account_settings_hide (GtkWidget *widget, gpointer user_data) +show_password_warning_only (const gchar *msg) { - /* This is easier than using a struct for the user_data: */ - ModestTnyAccountStore *self = modest_runtime_get_account_store(); - ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - gchar *account_name = (gchar *) user_data; - if (account_name) - g_hash_table_remove (priv->account_settings_dialog_hash, account_name); -} -#endif - -static void -show_password_warning_only () -{ - ModestWindow *main_window = - modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); /* don't create */ - /* Show an explanatory temporary banner: */ - if (main_window) - modest_platform_information_banner (GTK_WIDGET(main_window), NULL, - _("mcen_ib_username_pw_incorrect")); - else - g_warning ("%s: %s", __FUNCTION__, _("mcen_ib_username_pw_incorrect")); + if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ())) + modest_platform_information_banner (NULL, NULL, msg); } -#ifdef MODEST_PLATFORM_MAEMO static void show_wrong_password_dialog (TnyAccount *account) { - /* This is easier than using a struct for the user_data: */ - ModestTnyAccountStore *self = modest_runtime_get_account_store(); - const gchar *modest_account_name; - GtkWidget *main_window; - GtkWidget *dialog; - - main_window = (GtkWidget *) modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), - FALSE); /* don't create */ - if (!main_window) { - g_warning ("%s: password was wrong; ignoring because no main window", __FUNCTION__); - return; - } - - modest_account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); - if (!modest_account_name) { - g_warning ("%s: modest_tny_account_get_parent_modest_account_name_for_server_account() failed.\n", - __FUNCTION__); + if (g_object_get_data (G_OBJECT (account), "connection_specific") != NULL) { + modest_ui_actions_on_smtp_servers (NULL, NULL); + } else { + ModestAccountProtocol *proto; + ModestProtocolType proto_type; + const gchar *modest_account_name; + modest_account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); + + /* Get proto */ + proto_type = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), + modest_account_name); + proto = (ModestAccountProtocol *) + modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), + proto_type); + + /* Create and show the dialog */ + if (proto && MODEST_IS_ACCOUNT_PROTOCOL (proto)) { + ModestAccountSettingsDialog *dialog = + modest_account_protocol_get_account_settings_dialog (proto, modest_account_name); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), NULL); + gtk_widget_show (GTK_WIDGET (dialog)); + } } - - dialog = modest_tny_account_store_show_account_settings_dialog (self, modest_account_name); - modest_account_settings_dialog_save_password (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog)); /* Show an explanatory temporary banner: */ - modest_platform_information_banner (GTK_WIDGET(dialog), NULL, _("mcen_ib_username_pw_incorrect")); + modest_platform_information_banner (NULL, NULL, _("mcen_ib_username_pw_incorrect")); } -#endif /* This callback will be called by Tinymail when it needs the password * from the user or the account settings. @@ -553,44 +530,55 @@ show_wrong_password_dialog (TnyAccount *account) static gchar* get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *cancel) { - /* TODO: Settting cancel to FALSE does not actually cancel everything. - * We still get multiple requests afterwards, so we end up showing the - * same dialogs repeatedly. - */ - const TnyAccountStore *account_store = NULL; ModestTnyAccountStore *self = NULL; ModestTnyAccountStorePrivate *priv; gchar *username = NULL; gchar *pwd = NULL; gpointer pwd_ptr = NULL; gboolean already_asked = FALSE; + const gchar *server_account_name; + gchar *url_string; g_return_val_if_fail (account, NULL); MODEST_DEBUG_BLOCK( g_debug ("%s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used); - ); - - /* Initialize the output parameter: */ - if (cancel) - *cancel = FALSE; - - const gchar *server_account_name = tny_account_get_id (account); - account_store = TNY_ACCOUNT_STORE(g_object_get_data (G_OBJECT(account), - "account_store")); + ); + + /* Get a reference to myself */ + self = MODEST_TNY_ACCOUNT_STORE (g_object_get_data (G_OBJECT(account), "account_store")); + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + /* Ensure that we still have this account. It could happen + that a set_online was requested *before* removing an + account, and due to tinymail emits the get_password + function using a g_idle the account could be actually + removed *before* this function was really called */ + url_string = tny_account_get_url_string (account); + if (url_string) { + TnyAccount *tmp_account; + + tmp_account = tny_account_store_find_account (TNY_ACCOUNT_STORE (self), + url_string); + g_free (url_string); - if (!server_account_name || !account_store) { + if (!tmp_account) { + *cancel = TRUE; + return NULL; + } + g_object_unref (tmp_account); + } + + server_account_name = tny_account_get_id (account); + if (!server_account_name || !self) { g_warning ("modest: %s: could not retrieve account_store for account %s", __FUNCTION__, server_account_name ? server_account_name : ""); if (cancel) *cancel = TRUE; - + return NULL; } - self = MODEST_TNY_ACCOUNT_STORE (account_store); - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - /* This hash map stores passwords, including passwords that are not stored in gconf. */ /* 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 @@ -603,7 +591,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc MODEST_DEBUG_BLOCK( g_debug ("%s: Already asked = %d\n", __FUNCTION__, already_asked); ); - + /* If the password is not already there, try ModestConf */ if (!already_asked) { pwd = modest_account_mgr_get_server_account_password (priv->account_mgr, @@ -613,40 +601,83 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc /* If it was already asked, it must have been wrong, so ask again */ if (already_asked || !pwd || strlen(pwd) == 0) { + gboolean settings_have_password; + ModestProtocolType protocol_type; + /* As per the UI spec, if no password was set in the account settings, * ask for it now. But if the password is wrong in the account settings, * then show a banner and the account settings dialog so it can be corrected: */ - const gboolean settings_have_password = + settings_have_password = modest_account_mgr_get_server_account_has_password (priv->account_mgr, server_account_name); - MODEST_DEBUG_BLOCK( - printf ("%s: settings_have_password=%d\n", - __FUNCTION__, settings_have_password); - ); + + protocol_type = modest_tny_account_get_protocol_type (account); + + /* Show an error and after that ask for a password */ + if (modest_protocol_registry_protocol_type_has_tag(modest_runtime_get_protocol_registry (), + protocol_type, MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS)) { + gchar *username = NULL, *msg = NULL; + username = modest_account_mgr_get_server_account_username (priv->account_mgr, + server_account_name); + if (!username || strlen(username) == 0) { + msg = g_strdup_printf (_("emev_ni_ui_smtp_userid_invalid"), + tny_account_get_name (account), + tny_account_get_hostname (account)); + } else { + gchar *password; + password = modest_account_mgr_get_server_account_password (priv->account_mgr, + server_account_name); + + if (already_asked) + msg = g_strdup (_("mcen_ib_username_pw_incorrect")); + else if (!password || strlen(password) == 0) + msg = g_strdup_printf (_("emev_ni_ui_smtp_passwd_invalid"), + tny_account_get_name (account), + tny_account_get_hostname (account)); + else + msg = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"), + tny_account_get_hostname (account)); + if (password) + g_free (password); + } + if (msg) { + modest_platform_run_information_dialog (NULL, msg, TRUE); + g_free (msg); + } + if (username) + g_free (username); + } + if (settings_have_password) { /* The password must be wrong, so show the account settings dialog so it can be corrected: */ -#ifdef MODEST_PLATFORM_MAEMO show_wrong_password_dialog (account); -#endif - + if (cancel) *cancel = TRUE; - + return NULL; } - + /* we don't have it yet. Get the password from the user */ const gchar* account_id = tny_account_get_id (account); gboolean remember = FALSE; pwd = NULL; - + if (already_asked) { - /* Show an info banner, before we show the protected password dialog: */ - show_password_warning_only(); + const gchar *msg; + gboolean username_known = + modest_account_mgr_get_server_account_username_has_succeeded(priv->account_mgr, + server_account_name); + /* If the login has ever succeeded then show a specific message */ + if (username_known) + msg = _CS ("ecdg_ib_set_password_incorrect"); + else + msg = _("mcen_ib_username_pw_incorrect"); + show_password_warning_only (msg); } /* Request password */ - g_signal_emit (G_OBJECT(account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0, + g_signal_emit (G_OBJECT (self), signals[PASSWORD_REQUESTED_SIGNAL], 0, account_id, /* server_account_name */ &username, &pwd, cancel, &remember); @@ -654,7 +685,13 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc if (!*cancel) { /* The password will be returned as the result, * but we need to tell tinymail about the username too: */ - tny_account_set_user (account, username); + + /* WARNING: I disabled setting username as this can cause locks. Anyway, + * as now we have the password dialog username entry always dimmed + * this shouldn't be a problem */ + + /* if (username) */ + /* tny_account_set_user (account, username); */ /* Do not save the password in gconf, because * the UI spec says "The password will never @@ -758,13 +795,6 @@ modest_tny_account_store_finalize (GObject *obj) priv->password_hash = NULL; } -#ifdef MODEST_PLATFORM_MAEMO - if (priv->account_settings_dialog_hash) { - g_hash_table_destroy (priv->account_settings_dialog_hash); - priv->account_settings_dialog_hash = NULL; - } -#endif - if (priv->outbox_of_transport) { g_hash_table_destroy (priv->outbox_of_transport); priv->outbox_of_transport = NULL; @@ -785,14 +815,12 @@ modest_tny_account_store_finalize (GObject *obj) /* Destroy all accounts. Disconnect all accounts before they are destroyed */ if (priv->store_accounts) { - tny_list_foreach (priv->store_accounts, (GFunc)account_disconnect, NULL); tny_list_foreach (priv->store_accounts, (GFunc)account_verify_last_ref, "store"); g_object_unref (priv->store_accounts); priv->store_accounts = NULL; } if (priv->transport_accounts) { - tny_list_foreach (priv->transport_accounts, (GFunc)account_disconnect, NULL); tny_list_foreach (priv->transport_accounts, (GFunc)account_verify_last_ref, "transport"); g_object_unref (priv->transport_accounts); priv->transport_accounts = NULL; @@ -808,8 +836,6 @@ modest_tny_account_store_finalize (GObject *obj) priv->session = NULL; } - camel_shutdown (); - G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -829,7 +855,7 @@ volume_path_is_mounted (const gchar* path) * GnomeVFSVolume even if the drive is not mounted: */ /* GnomeVFSVolume *volume = gnome_vfs_volume_monitor_get_volume_for_path (monitor, - MODEST_MCC1_VOLUMEPATH); + g_getenv (MODEST_MMC1_VOLUMEPATH_ENV)); if (volume) { gnome_vfs_volume_unref(volume); } @@ -874,7 +900,8 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, GObject *obj; ModestTnyAccountStorePrivate *priv; TnyAccount *local_account = NULL; - + TnyLockable *lockable; + g_return_val_if_fail (account_mgr, NULL); g_return_val_if_fail (device, NULL); @@ -890,8 +917,10 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, return NULL; } - /* Set the ui locker */ - tny_session_camel_set_ui_locker (priv->session, tny_gtk_lockable_new ()); + /* Set the ui locker */ + lockable = tny_gtk_lockable_new (); + tny_session_camel_set_ui_locker (priv->session, lockable); + g_object_unref (lockable); /* Connect signals */ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, @@ -920,19 +949,13 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, global OUTBOX hosted in the local account */ add_existing_accounts (MODEST_TNY_ACCOUNT_STORE (obj)); - /* FIXME: I'm doing this (adding an "if (FALSE)"because this - stuff is not working properly and could cause SIGSEVs, for - example one send queue will be created for each connection - specific SMTP server, so when tinymail asks for the outbox - it will return NULL because there is no outbox folder for - this specific transport accounts, and it's a must that the - send queue returns an outbox */ - if (TRUE) - /* Add connection-specific transport accounts */ + /* Add connection-specific transport accounts if there are any + accounts available */ + if (!only_local_accounts (MODEST_TNY_ACCOUNT_STORE(obj))) add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE(obj)); /* This is a singleton, so it does not need to be unrefed. */ - if (volume_path_is_mounted (MODEST_MCC1_VOLUMEPATH)) { + if (volume_path_is_mounted (g_getenv (MODEST_MMC1_VOLUMEPATH_ENV))) { /* It is mounted: */ add_mmc_account (MODEST_TNY_ACCOUNT_STORE (obj), FALSE /* don't emit the insert signal. */); } @@ -958,7 +981,7 @@ modest_tny_account_store_get_accounts (TnyAccountStore *self, tny_list_foreach (priv->transport_accounts, foreach_account_append_to_list, list); break; case TNY_ACCOUNT_STORE_STORE_ACCOUNTS: - tny_list_foreach (priv->store_accounts, foreach_account_append_to_list, list); + tny_list_foreach (priv->store_accounts, foreach_account_append_to_list, list); break; case TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS: tny_list_foreach (priv->transport_accounts, foreach_account_append_to_list, list); @@ -1021,28 +1044,26 @@ modest_tny_account_store_alert (TnyAccountStore *self, gboolean question, GError *error) { - ModestTransportStoreProtocol proto = - MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN; - const gchar* server_name = NULL; + ModestProtocolType protocol_type = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID; + ModestProtocol *protocol = NULL; + const gchar* server_name = ""; gchar *prompt = NULL; - gboolean retval; - + gboolean retval = TRUE; - g_return_val_if_fail (account, FALSE); + /* NOTE: account may be NULL in some cases */ g_return_val_if_fail (error, FALSE); /* Get the server name: */ - server_name = tny_account_get_hostname (account); - if (account) { - const gchar *proto_name = tny_account_get_proto (account); - if (proto_name) - proto = modest_protocol_info_get_transport_store_protocol (proto_name); - else { + server_name = tny_account_get_hostname (account); + protocol_type = modest_tny_account_get_protocol_type (account); + if (protocol_type == MODEST_PROTOCOL_REGISTRY_TYPE_INVALID){ g_warning("modest: %s: account with id=%s has no proto.\n", __FUNCTION__, tny_account_get_id (account)); return FALSE; } + protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), + protocol_type); } switch (error->code) { @@ -1058,29 +1079,24 @@ modest_tny_account_store_alert (TnyAccountStore *self, case TNY_SERVICE_ERROR_UNAVAILABLE: /* You must be working online for this operation */ case TNY_SERVICE_ERROR_CONNECT: - /* TODO: Show the appropriate message, depending on whether it's POP or IMAP: */ - switch (proto) { - case MODEST_PROTOCOL_STORE_POP: - prompt = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"), - server_name); - break; - case MODEST_PROTOCOL_STORE_IMAP: - prompt = g_strdup_printf (_("emev_ni_ui_imap_connect_server_error"), - server_name); - break; - case MODEST_PROTOCOL_TRANSPORT_SMTP: - prompt = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), - server_name); - break; - default: + if (protocol) { + prompt = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_CONNECT_ERROR, server_name); + } + if (!prompt) { g_return_val_if_reached (FALSE); } break; case TNY_SERVICE_ERROR_AUTHENTICATE: - /* This is "Secure connection failed", even though the logical - * ID has _certificate_ in the name: */ - prompt = g_strdup (_("mail_ni_ssl_certificate_error")); + /* It seems that there's no better error to show with + * POP and IMAP because TNY_SERVICE_ERROR_AUTHENTICATE + * may appear if there's a timeout during auth */ + if (protocol) { + prompt = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_AUTH_ERROR, server_name); + } + if (!prompt) { + g_return_val_if_reached (FALSE); + } break; case TNY_SERVICE_ERROR_CERTIFICATE: @@ -1093,6 +1109,7 @@ modest_tny_account_store_alert (TnyAccountStore *self, case TNY_SERVICE_ERROR_UNKNOWN: return FALSE; default: + g_debug ("Unexpected error %d", error->code); g_return_val_if_reached (FALSE); } @@ -1100,8 +1117,19 @@ modest_tny_account_store_alert (TnyAccountStore *self, if (error->code == TNY_SERVICE_ERROR_CERTIFICATE) retval = modest_platform_run_certificate_confirmation_dialog (server_name, error->message); - else - retval = modest_platform_run_alert_dialog (prompt, question); + else if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE || + error->code == TNY_SERVICE_ERROR_CONNECT) { + + modest_platform_run_information_dialog (NULL, prompt, TRUE); + + /* Show the account dialog if it was wrong */ + if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE) + show_wrong_password_dialog (account); + + retval = TRUE; + } + + g_debug ("%s: error code %d (%s", __FUNCTION__, error->code, error->message); if (prompt) g_free (prompt); @@ -1354,17 +1382,17 @@ modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection 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 (self, MODEST_TNY_ACCOUNT_STORE_QUERY_ID, server_account_name); /* printf ("DEBUG: %s: account=%p\n", __FUNCTION__, account); */ - g_free (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 account; #else return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */ @@ -1471,11 +1499,12 @@ add_existing_accounts (ModestTnyAccountStore *self) static TnyAccount* create_tny_account (ModestTnyAccountStore *self, const gchar *name, - TnyAccountType type) + TnyAccountType type, + gboolean notify) { TnyAccount *account = NULL; ModestTnyAccountStorePrivate *priv = NULL; - + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); account = modest_tny_account_new_from_account (priv->account_mgr, @@ -1487,9 +1516,9 @@ create_tny_account (ModestTnyAccountStore *self, if (account) { /* Forget any cached password for the account, so that we use a new account if any */ - modest_tny_account_store_forget_password_in_memory (self, - tny_account_get_id (account)); - /* Set the account store */ + forget_password_in_memory (self, tny_account_get_id (account)); + + /* Set the account store */ g_object_set_data (G_OBJECT(account), "account_store", self); } else { g_printerr ("modest: failed to create account for %s\n", name); @@ -1498,54 +1527,97 @@ create_tny_account (ModestTnyAccountStore *self, return account; } +typedef struct _AddOutboxInfo { + ModestTnyAccountStore *account_store; + TnyAccount *transport_account; +} AddOutboxInfo; static void -add_outbox_from_transport_account_to_global_outbox (ModestTnyAccountStore *self, - const gchar *account_name, - TnyAccount *transport_account) +add_outbox_from_transport_account_to_global_outbox_get_folders_cb (TnyFolderStore *folder_store, + gboolean cancelled, + TnyList *list, + GError *err, + gpointer userdata) { - TnyList *folders = NULL; - TnyIterator *iter_folders = NULL; - TnyAccount *local_account = NULL, *account_outbox = NULL; - TnyFolder *per_account_outbox = NULL; + TnyIterator *iter_folders; + TnyFolder *per_account_outbox; + TnyAccount *local_account = NULL; + AddOutboxInfo *info = (AddOutboxInfo *) userdata; ModestTnyAccountStorePrivate *priv = NULL; + ModestTnyAccountStore *self; + self = MODEST_TNY_ACCOUNT_STORE (info->account_store); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - /* Create per account local outbox */ - account_outbox = - modest_tny_account_new_for_per_account_local_outbox_folder (priv->account_mgr, - account_name, - priv->session); - tny_list_append (priv->store_accounts_outboxes, G_OBJECT (account_outbox)); - - /* Get the outbox folder */ - folders = tny_simple_list_new (); - tny_folder_store_get_folders (TNY_FOLDER_STORE (account_outbox), folders, NULL, NULL); - if (tny_list_get_length (folders) != 1) { - g_warning ("%s: > 1 outbox found (%d)?!", __FUNCTION__, - tny_list_get_length (folders)); + + /* Note that this could happen if there is not enough space + available on disk, then the outbox folder could not be + created */ + if (tny_list_get_length (list) != 1) { + g_warning ("%s: could not create outbox folder (%d folders found)", __FUNCTION__, + tny_list_get_length (list)); + goto frees; } - iter_folders = tny_list_create_iterator (folders); + iter_folders = tny_list_create_iterator (list); per_account_outbox = TNY_FOLDER (tny_iterator_get_current (iter_folders)); g_object_unref (iter_folders); - g_object_unref (folders); - g_object_unref (account_outbox); + g_object_unref (list); /* Add the outbox of the new per-account-local-outbox account to the global local merged OUTBOX of the local folders account */ - local_account = modest_tny_account_store_get_local_folders_account (self); + local_account = modest_tny_account_store_get_local_folders_account (info->account_store); modest_tny_local_folders_account_add_folder_to_outbox (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (local_account), per_account_outbox); /* Add the pair to the hash table */ g_hash_table_insert (priv->outbox_of_transport, - transport_account, + info->transport_account, per_account_outbox); + /* Notify that the local account changed */ + g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account); g_object_unref (local_account); g_object_unref (per_account_outbox); + + frees: + g_object_unref (info->transport_account); + g_slice_free (AddOutboxInfo, info); +} + + +static void +add_outbox_from_transport_account_to_global_outbox (ModestTnyAccountStore *self, + const gchar *account_name, + TnyAccount *transport_account) +{ + TnyList *folders = NULL; + TnyAccount *account_outbox = NULL; + ModestTnyAccountStorePrivate *priv = NULL; + AddOutboxInfo *info; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + /* Create per account local outbox */ + account_outbox = + modest_tny_account_new_for_per_account_local_outbox_folder (priv->account_mgr, + account_name, + priv->session); + + if (!G_IS_OBJECT (account_outbox)) { + g_warning ("%s: could not create per account local outbox folder", __FUNCTION__); + return; + } + + tny_list_append (priv->store_accounts_outboxes, G_OBJECT (account_outbox)); + + /* Get the outbox folder */ + folders = tny_simple_list_new (); + info = g_slice_new0 (AddOutboxInfo); + info->account_store = self; + info->transport_account = g_object_ref (transport_account); + tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account_outbox), folders, NULL, FALSE, + add_outbox_from_transport_account_to_global_outbox_get_folders_cb, NULL, (gpointer) info); + g_object_unref (account_outbox); } /* @@ -1565,13 +1637,13 @@ insert_account (ModestTnyAccountStore *self, priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); /* Get the server and the transport account */ - store_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_STORE); + store_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_STORE, notify); if (!store_account || !TNY_IS_ACCOUNT(store_account)) { g_warning ("%s: failed to create store account", __FUNCTION__); return; } - transport_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT); + transport_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT, notify); if (!transport_account || !TNY_IS_ACCOUNT(transport_account)) { g_warning ("%s: failed to create transport account", __FUNCTION__); g_object_unref (store_account); @@ -1585,21 +1657,13 @@ insert_account (ModestTnyAccountStore *self, /* Create a new pseudo-account with an outbox for this transport account and add it to the global outbox in the local account */ - add_outbox_from_transport_account_to_global_outbox (self, account, transport_account); - + add_outbox_from_transport_account_to_global_outbox (self, account, transport_account); + /* Notify the observers. We do it after everything is created */ if (notify) { - TnyAccount *local_account = NULL; - - /* Notify the observers about the new server & transport accounts */ g_signal_emit (G_OBJECT (self), signals [ACCOUNT_INSERTED_SIGNAL], 0, store_account); g_signal_emit (G_OBJECT (self), signals [ACCOUNT_INSERTED_SIGNAL], 0, transport_account); - - /* Notify that the local account changed */ - local_account = modest_tny_account_store_get_local_folders_account (self); - g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account); - g_object_unref (local_account); } /* Frees */ @@ -1607,13 +1671,29 @@ insert_account (ModestTnyAccountStore *self, g_object_unref (transport_account); } +static inline gboolean +only_local_accounts (ModestTnyAccountStore *self) +{ + return (modest_tny_account_store_get_num_remote_accounts (self) > 0) ? FALSE : TRUE; +} + static void on_account_inserted (ModestAccountMgr *acc_mgr, const gchar *account, gpointer user_data) { + gboolean add_specific; + + add_specific = only_local_accounts (MODEST_TNY_ACCOUNT_STORE (user_data)); + /* Insert the account and notify the observers */ insert_account (MODEST_TNY_ACCOUNT_STORE (user_data), account, TRUE); + + /* If it's the first remote account then add the connection + specific SMTP servers as well */ + if (add_specific) + add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE (user_data)); + } /* This is the callback of the tny_camel_account_set_online called in @@ -1630,25 +1710,99 @@ on_account_disconnect_when_removing (TnyCamelAccount *account, self = MODEST_TNY_ACCOUNT_STORE (user_data); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); - /* Remove it from the list of accounts */ - if (TNY_IS_STORE_ACCOUNT (account)) - tny_list_remove (priv->store_accounts, (GObject *) account); - else - tny_list_remove (priv->transport_accounts, (GObject *) account); - - /* Notify the observers */ - g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], - 0, account); + /* Cancel all pending operations */ + tny_account_cancel (TNY_ACCOUNT (account)); /* Unref the extra reference added by get_server_account */ g_object_unref (account); - /* Cancel all pending operations */ - tny_account_cancel (TNY_ACCOUNT (account)); - /* Clear the cache if it's an store account */ - if (TNY_IS_STORE_ACCOUNT (account)) + if (TNY_IS_STORE_ACCOUNT (account)) { tny_store_account_delete_cache (TNY_STORE_ACCOUNT (account)); + } else if (TNY_IS_TRANSPORT_ACCOUNT (account)) { + ModestTnySendQueue* send_queue; + send_queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (account), FALSE); + if (TNY_IS_SEND_QUEUE (send_queue)) { + if (modest_tny_send_queue_sending_in_progress (send_queue)) + tny_send_queue_cancel (TNY_SEND_QUEUE (send_queue), + TNY_SEND_QUEUE_CANCEL_ACTION_REMOVE, + NULL); + modest_runtime_remove_send_queue (TNY_TRANSPORT_ACCOUNT (account)); + } + } +} + +/* + * We use this one for both removing "normal" and "connection + * specific" transport accounts + */ +static void +remove_transport_account (ModestTnyAccountStore *self, + TnyTransportAccount *transport_account) +{ + ModestTnyAccountStorePrivate *priv; + TnyFolder *outbox = NULL; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + + /* Remove it from the list of accounts and notify the + observers. Do not need to wait for account + disconnection */ + g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, transport_account); + tny_list_remove (priv->transport_accounts, (GObject *) transport_account); + + /* Remove the OUTBOX of the account from the global outbox */ + outbox = g_hash_table_lookup (priv->outbox_of_transport, transport_account); + + if (TNY_IS_FOLDER (outbox)) { + TnyAccount *local_account = NULL; + TnyAccount *outbox_account = tny_folder_get_account (outbox); + + if (outbox_account) { + tny_list_remove (priv->store_accounts_outboxes, G_OBJECT (outbox_account)); + /* Remove existing emails to send */ + tny_store_account_delete_cache (TNY_STORE_ACCOUNT (outbox_account)); + g_object_unref (outbox_account); + } + + local_account = modest_tny_account_store_get_local_folders_account (self); + modest_tny_local_folders_account_remove_folder_from_outbox (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (local_account), + outbox); + + g_hash_table_remove (priv->outbox_of_transport, transport_account); + + /* Notify the change in the local account */ + g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account); + g_object_unref (local_account); + } else { + g_warning ("Removing a transport account that has no outbox"); + } + + /* Cancel all pending operations */ + tny_account_cancel (TNY_ACCOUNT (transport_account)); + + /* Disconnect and notify the observers. The callback will free the reference */ + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account), FALSE, + on_account_disconnect_when_removing, self); +} + +static gboolean +images_cache_remove_filter (TnyStreamCache *self, const gchar *id, const gchar *account_name) +{ + gchar *account_name_with_separator; + gboolean result; + if (account_name == NULL || account_name[0] == '\0') + return FALSE; + + if (id == NULL || id[0] == '\0') + return FALSE; + + account_name_with_separator = g_strconcat (account_name, "__", NULL); + + result = (g_str_has_prefix (id, account_name)); + g_free (account_name_with_separator); + + return result; } static void @@ -1659,58 +1813,67 @@ on_account_removed (ModestAccountMgr *acc_mgr, TnyAccount *store_account = NULL, *transport_account = NULL; ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; + TnyStreamCache *stream_cache; self = MODEST_TNY_ACCOUNT_STORE (user_data); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); /* Get the server and the transport account */ store_account = - modest_tny_account_store_get_server_account (self, account, TNY_ACCOUNT_TYPE_STORE); + modest_tny_account_store_get_server_account (self, account, + TNY_ACCOUNT_TYPE_STORE); transport_account = - modest_tny_account_store_get_server_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT); + modest_tny_account_store_get_server_account (self, account, + TNY_ACCOUNT_TYPE_TRANSPORT); /* If there was any problem creating the account, for example, with the configuration system this could not exist */ - if (store_account) { + if (TNY_IS_STORE_ACCOUNT(store_account)) { + /* Forget any cached password for the account */ + forget_password_in_memory (self, tny_account_get_id (store_account)); + + /* Remove it from the list of accounts and notify the + observers. Do not need to wait for account + disconnection */ + tny_list_remove (priv->store_accounts, (GObject *) store_account); + g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, store_account); + + /* Cancel all pending operations */ + tny_account_cancel (TNY_ACCOUNT (store_account)); + /* Disconnect before deleting the cache, because the disconnection will rewrite the cache to the disk */ tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account), FALSE, on_account_disconnect_when_removing, self); } else { - g_warning ("There is no store account for account %s\n", account); + g_warning ("%s: no store account for account %s\n", + __FUNCTION__, account); } /* If there was any problem creating the account, for example, with the configuration system this could not exist */ - if (transport_account) { - TnyAccount *local_account = NULL; - TnyFolder *outbox = NULL; - ModestTnyAccountStorePrivate *priv = NULL; - - /* Remove the OUTBOX of the account from the global outbox */ - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - outbox = g_hash_table_lookup (priv->outbox_of_transport, transport_account); - - if (TNY_IS_FOLDER (outbox)) { - local_account = modest_tny_account_store_get_local_folders_account (self); - modest_tny_local_folders_account_remove_folder_from_outbox (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (local_account), - outbox); - g_hash_table_remove (priv->outbox_of_transport, transport_account); - - /* Notify the change in the local account */ - g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account); - g_object_unref (local_account); - } else { - g_warning ("Removing a transport account that has no outbox"); - } + if (TNY_IS_TRANSPORT_ACCOUNT(transport_account)) { - /* Disconnect and notify the observers. The callback will free the reference */ - tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account), FALSE, - on_account_disconnect_when_removing, self); + /* Forget any cached password for the account */ + forget_password_in_memory (self, tny_account_get_id (transport_account)); + + /* Remove transport account. It'll free the reference + added by get_server_account */ + remove_transport_account (self, TNY_TRANSPORT_ACCOUNT (transport_account)); } else { - g_warning ("There is no transport account for account %s\n", account); + g_warning ("%s: no transport account for account %s\n", + __FUNCTION__, account); } + + /* Remove cached images */ + stream_cache = modest_runtime_get_images_cache (); + tny_stream_cache_remove (stream_cache, (TnyStreamCacheRemoveFilter) images_cache_remove_filter, (gpointer) account); + + /* If there are no more user accounts then delete the + transport specific SMTP servers */ + if (only_local_accounts (self)) + remove_connection_specific_transport_accounts (self); } TnyTransportAccount * @@ -1733,6 +1896,9 @@ modest_tny_account_store_new_connection_specific_transport_account (ModestTnyAcc g_object_set_data (G_OBJECT(tny_account), "account_store", (gpointer)self); + g_object_set_data (G_OBJECT(tny_account), + "connection_specific", + GINT_TO_POINTER (TRUE)); tny_list_append (priv->transport_accounts, G_OBJECT (tny_account)); add_outbox_from_transport_account_to_global_outbox (self, @@ -1746,25 +1912,29 @@ modest_tny_account_store_new_connection_specific_transport_account (ModestTnyAcc return TNY_TRANSPORT_ACCOUNT (tny_account); } +static void +foreach_free_string(gpointer data, + gpointer user_data) +{ + g_free (data); +} static void add_connection_specific_transport_accounts (ModestTnyAccountStore *self) { ModestTnyAccountStorePrivate *priv = NULL; GSList *list_specifics = NULL, *iter = NULL; + GError *err = NULL; priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - ModestConf *conf = modest_runtime_get_conf (); - - GError *err = NULL; - list_specifics = modest_conf_get_list (conf, + list_specifics = modest_conf_get_list (modest_runtime_get_conf (), MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, MODEST_CONF_VALUE_STRING, &err); if (err) { - g_printerr ("modest: %s: error getting list: %s\n.", __FUNCTION__, err->message); g_error_free (err); - err = NULL; + g_return_if_reached (); + return; } /* Look at each connection-specific transport account for the @@ -1783,8 +1953,57 @@ add_connection_specific_transport_accounts (ModestTnyAccountStore *self) } iter = g_slist_next (iter); } + + /* Free the list */ + g_slist_foreach (list_specifics, foreach_free_string, NULL); + g_slist_free (list_specifics); +} + +static void +remove_connection_specific_transport_accounts (ModestTnyAccountStore *self) +{ + ModestTnyAccountStorePrivate *priv = NULL; + GSList *list_specifics = NULL, *iter = NULL; + GError *err = NULL; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + err = NULL; + list_specifics = modest_conf_get_list (modest_runtime_get_conf (), + MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, + MODEST_CONF_VALUE_STRING, &err); + if (err) { + g_error_free (err); + g_return_if_reached (); + return; + } + + /* Look at each connection-specific transport account for the + * modest account: */ + iter = list_specifics; + while (iter) { + /* The list alternates between the connection name and the transport name: */ + iter = g_slist_next (iter); + if (iter) { + const gchar* transport_account_name = (const gchar*) (iter->data); + TnyAccount * account; + account = modest_tny_account_store_get_server_account (self, + transport_account_name, + TNY_ACCOUNT_TYPE_TRANSPORT); + + /* the call will free the reference */ + if (account) + remove_transport_account (self, TNY_TRANSPORT_ACCOUNT (account)); + } + iter = g_slist_next (iter); + } + + /* Free the list */ + g_slist_foreach (list_specifics, foreach_free_string, NULL); + g_slist_free (list_specifics); } + TnyMsg * modest_tny_account_store_find_msg_in_outboxes (ModestTnyAccountStore *self, const gchar *uri, @@ -1804,7 +2023,7 @@ modest_tny_account_store_find_msg_in_outboxes (ModestTnyAccountStore *self, TnyAccount *account = TNY_ACCOUNT (tny_iterator_get_current (acc_iter)); TnyIterator *folders_iter = NULL; - tny_folder_store_get_folders (TNY_FOLDER_STORE (account), folders, NULL, NULL); + tny_folder_store_get_folders (TNY_FOLDER_STORE (account), folders, NULL, FALSE, NULL); folders_iter = tny_list_create_iterator (folders); while (msg == NULL && !tny_iterator_is_done (folders_iter)) { @@ -1838,69 +2057,158 @@ modest_tny_account_store_get_transport_account_from_outbox_header(ModestTnyAccou TnyIterator *acc_iter; ModestTnyAccountStorePrivate *priv; TnyTransportAccount *header_acc = NULL; - const gchar *msg_id; + gchar *msg_id; g_return_val_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (self), NULL); g_return_val_if_fail (TNY_IS_HEADER (header), NULL); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); - msg_id = modest_tny_send_queue_get_msg_id (header); acc_iter = tny_list_create_iterator (priv->transport_accounts); while (!header_acc && !tny_iterator_is_done (acc_iter)) { TnyTransportAccount *account = TNY_TRANSPORT_ACCOUNT (tny_iterator_get_current (acc_iter)); ModestTnySendQueue *send_queue; ModestTnySendQueueStatus status; - send_queue = modest_runtime_get_send_queue(TNY_TRANSPORT_ACCOUNT(account)); - status = modest_tny_send_queue_get_msg_status(send_queue, msg_id); - if (status != MODEST_TNY_SEND_QUEUE_UNKNOWN) { - header_acc = g_object_ref(account); + send_queue = modest_runtime_get_send_queue(TNY_TRANSPORT_ACCOUNT(account), TRUE); + if (TNY_IS_SEND_QUEUE (send_queue)) { + status = modest_tny_send_queue_get_msg_status(send_queue, msg_id); + if (status != MODEST_TNY_SEND_QUEUE_UNKNOWN) + header_acc = g_object_ref(account); } g_object_unref (account); tny_iterator_next (acc_iter); } g_object_unref(acc_iter); + g_free (msg_id); /* New reference */ return header_acc; } -GtkWidget * -modest_tny_account_store_show_account_settings_dialog (ModestTnyAccountStore *self, - const gchar *account_name) +typedef struct { + ModestTnyAccountStore *account_store; + ModestTnyAccountStoreShutdownCallback callback; + gpointer userdata; + gint pending; +} ShutdownOpData; + +static void +account_shutdown_callback (TnyCamelAccount *account, gboolean canceled, GError *err, gpointer userdata) +{ + ShutdownOpData *op_data = (ShutdownOpData *) userdata; + op_data->pending--; + if (op_data->pending == 0) { + if (op_data->callback) + op_data->callback (op_data->account_store, op_data->userdata); + g_object_unref (op_data->account_store); + g_free (op_data); + } else { + g_object_unref (op_data->account_store); + } +} + +static void +account_shutdown (TnyAccount *account, ShutdownOpData *op_data) +{ + g_return_if_fail (account && TNY_IS_ACCOUNT(account)); + + if (TNY_IS_STORE_ACCOUNT (account) && + !modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account))) + goto frees; + + /* Disconnect account */ + if (tny_account_get_connection_status (account) == TNY_CONNECTION_STATUS_CONNECTED) { + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(account), FALSE, + account_shutdown_callback, op_data); + return; + } + + frees: + op_data->pending--; + g_object_unref (op_data->account_store); +} + + +void +modest_tny_account_store_shutdown (ModestTnyAccountStore *self, + ModestTnyAccountStoreShutdownCallback callback, + gpointer userdata) +{ + gint i, num_accounts; + ShutdownOpData *op_data; + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + + /* Get references */ + num_accounts = 0; + if (priv->store_accounts) + num_accounts += tny_list_get_length (priv->store_accounts); + if (priv->transport_accounts) { + num_accounts += tny_list_get_length (priv->transport_accounts); + + for (i = 0 ; i < num_accounts ; i++) + g_object_ref (self); + + /* Create the helper object */ + op_data = g_new0 (ShutdownOpData, 1); + op_data->callback = callback; + op_data->userdata = userdata; + op_data->pending = num_accounts; + op_data->account_store = self; + + /* Destroy all accounts. Disconnect all accounts before they are destroyed */ + if (priv->store_accounts) { + tny_list_foreach (priv->store_accounts, (GFunc)account_shutdown, op_data); + } + + if (priv->transport_accounts) { + tny_list_foreach (priv->transport_accounts, (GFunc)account_shutdown, op_data); + } + + if (op_data->pending == 0) { + if (op_data->callback) + op_data->callback (op_data->account_store, op_data->userdata); + g_free (op_data); + } +} + +gboolean +modest_tny_account_store_is_send_mail_blocked (ModestTnyAccountStore *self) { ModestTnyAccountStorePrivate *priv; - gpointer dialog_as_gpointer = NULL; - gboolean found; priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - found = g_hash_table_lookup_extended (priv->account_settings_dialog_hash, - account_name, NULL, (gpointer*)&dialog_as_gpointer); - - if (found) - return (GtkWidget *) dialog_as_gpointer; - else { - ModestAccountSettings *settings; - GtkWidget *dialog; - dialog = (GtkWidget *) modest_account_settings_dialog_new (); - settings = modest_account_mgr_load_account_settings (priv->account_mgr, account_name); - modest_account_settings_dialog_set_account (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog), settings); - g_object_unref (settings); - modest_account_settings_dialog_switch_to_user_info (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog)); - modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog)); - - g_hash_table_insert (priv->account_settings_dialog_hash, g_strdup (account_name), dialog); - - g_signal_connect (G_OBJECT (dialog), "hide", G_CALLBACK (on_account_settings_hide), - g_strdup (account_name)); - - /* Show it and delete it when it closes: */ - g_signal_connect_swapped (dialog, - "response", - G_CALLBACK (gtk_widget_destroy), - dialog); - gtk_widget_show (GTK_WIDGET (dialog)); - - return dialog; - } - + + return priv->send_mail_blocked; +} + +void +modest_tny_account_store_set_send_mail_blocked (ModestTnyAccountStore *self, + gboolean blocked) +{ + ModestTnyAccountStorePrivate *priv; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + priv->send_mail_blocked = blocked; +} + +static void +count_remote_accounts (gpointer data, gpointer user_data) +{ + TnyFolderStore *account = TNY_FOLDER_STORE (data); + gint *count = (gint *) user_data; + + if (modest_tny_folder_store_is_remote (account)) + (*count)++; +} + +guint +modest_tny_account_store_get_num_remote_accounts (ModestTnyAccountStore *self) +{ + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + gint count = 0; + + /* Count remote accounts */ + tny_list_foreach (priv->store_accounts, (GFunc) count_remote_accounts, &count); + + return count; }