#include <modest-runtime.h>
#include <modest-marshal.h>
-#include <modest-protocol-info.h>
+#include <modest-protocol-registry.h>
#include <modest-local-folder-info.h>
+#include "modest-account-protocol.h"
#include <modest-tny-account.h>
#include <modest-tny-local-folders-account.h>
#include <modest-account-mgr.h>
#include <modest-signal-mgr.h>
#include <modest-debug.h>
+#include <modest-defs.h>
#include "modest-tny-account-store.h"
#include "modest-tny-platform-factory.h"
#include <tny-gtk-lockable.h>
struct _ModestTnyAccountStorePrivate {
gchar *cache_dir;
GHashTable *password_hash;
- GHashTable *account_settings_dialog_hash;
ModestAccountMgr *account_mgr;
TnySessionCamel *session;
TnyDevice *device;
/* 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), \
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,
priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, g_free);
- /* 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);
-
/* 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. */
/* disconnect the list of TnyAccounts */
static void
-account_disconnect (TnyAccount *account)
-{
- 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)))
- return;
-
- 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;
g_free (txt);
}
-
-
-
static void
foreach_account_append_to_list (gpointer data,
gpointer user_data)
}
static void
-on_account_settings_hide (GtkWidget *widget, gpointer user_data)
-{
- /* 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);
-}
-
-static void
show_password_warning_only (const gchar *msg)
{
ModestWindow *main_window =
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();
- GtkWidget *main_window;
- GtkWidget *dialog = NULL;
-
- 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;
- }
-
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);
- dialog = modest_tny_account_store_show_account_settings_dialog (self, modest_account_name);
- modest_account_settings_dialog_save_password (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog));
+ 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));
+ }
}
/* Show an explanatory temporary banner: */
- modest_platform_information_banner (dialog, NULL, _("mcen_ib_username_pw_incorrect"));
+ modest_platform_information_banner (NULL, NULL, _("mcen_ib_username_pw_incorrect"));
}
/* This callback will be called by Tinymail when it needs the password
/* 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:
*/
- ModestTransportStoreProtocol proto;
- const gboolean settings_have_password =
+ settings_have_password =
modest_account_mgr_get_server_account_has_password (priv->account_mgr, server_account_name);
+ protocol_type = modest_tny_account_get_protocol_type (account);
+
/* Show an error and after that ask for a password */
- proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
- if (proto == MODEST_PROTOCOL_TRANSPORT_SMTP) {
+ 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);
priv->password_hash = NULL;
}
- if (priv->account_settings_dialog_hash) {
- g_hash_table_destroy (priv->account_settings_dialog_hash);
- priv->account_settings_dialog_hash = NULL;
- }
-
if (priv->outbox_of_transport) {
g_hash_table_destroy (priv->outbox_of_transport);
priv->outbox_of_transport = NULL;
/* 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;
priv->session = NULL;
}
- camel_shutdown ();
-
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
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);
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,
gboolean question,
GError *error)
{
- ModestTransportStoreProtocol proto =
- MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
+ ModestProtocolType protocol_type = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID;
+ ModestProtocol *protocol = NULL;
const gchar* server_name = "";
gchar *prompt = NULL;
- gboolean retval;
+ gboolean retval = TRUE;
/* NOTE: account may be NULL in some cases */
g_return_val_if_fail (error, FALSE);
/* Get the server name: */
if (account) {
server_name = tny_account_get_hostname (account);
- const gchar *proto_name = tny_account_get_proto (account);
- if (proto_name)
- proto = modest_protocol_info_get_transport_store_protocol (proto_name);
- else {
+ 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) {
case TNY_SERVICE_ERROR_UNAVAILABLE:
/* You must be working online for this operation */
case TNY_SERVICE_ERROR_CONNECT:
- 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;
/* 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 */
- 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_ni_ui_smtp_authentication_fail_error"),
- server_name);
- break;
- default:
+ 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_UNKNOWN:
return FALSE;
default:
+ g_debug ("Unexpected error %d", error->code);
g_return_val_if_reached (FALSE);
}
if (error->code == TNY_SERVICE_ERROR_CERTIFICATE)
retval = modest_platform_run_certificate_confirmation_dialog (server_name,
error->message);
- else {
+ else if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE) {
modest_platform_run_information_dialog (NULL, prompt, TRUE);
/* Show the account dialog if it was wrong */
retval = TRUE;
}
+ g_debug ("%s: error code %d (%s", __FUNCTION__, error->code, error->message);
if (prompt)
g_free (prompt);
/* Perform a send receive */
account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
- modest_ui_actions_do_send_receive (account_name, FALSE, FALSE, FALSE, main_window);
+ modest_ui_actions_do_send_receive (account_name, FALSE, FALSE, TRUE, main_window);
}
}
self = MODEST_TNY_ACCOUNT_STORE (info->account_store);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+ /* 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: > 1 outbox found (%d)?!", __FUNCTION__,
+ 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 (list);
/* Notify that the local account changed */
g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account);
-
- g_object_unref (info->transport_account);
g_object_unref (local_account);
g_object_unref (per_account_outbox);
+
+ frees:
+ g_object_unref (info->transport_account);
g_slice_free (AddOutboxInfo, info);
}
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,
+ 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);
}
} else if (TNY_IS_TRANSPORT_ACCOUNT (account)) {
ModestTnySendQueue* send_queue;
send_queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (account), FALSE);
- if (send_queue) {
+ 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,
/* Remove it from the list of accounts and notify the
observers. Do not need to wait for account
disconnection */
- tny_list_remove (priv->transport_accounts, (GObject *) transport_account);
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);
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
on_account_removed (ModestAccountMgr *acc_mgr,
const gchar *account,
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);
__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))
account = modest_tny_account_store_get_server_account (self,
transport_account_name,
TNY_ACCOUNT_TYPE_TRANSPORT);
- if (account) {
+
+ /* the call will free the reference */
+ if (account)
remove_transport_account (self, TNY_TRANSPORT_ACCOUNT (account));
- g_object_unref (account);
- }
}
iter = g_slist_next (iter);
}
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)) {
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)) {
ModestTnySendQueue *send_queue;
ModestTnySendQueueStatus status;
send_queue = modest_runtime_get_send_queue(TNY_TRANSPORT_ACCOUNT(account), TRUE);
- 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);
+ 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);
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)
{
- ModestTnyAccountStorePrivate *priv;
- gpointer dialog_as_gpointer = NULL;
- gboolean found;
+ 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);
+ }
+}
- 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);
+static void
+account_shutdown (TnyAccount *account, ShutdownOpData *op_data)
+{
+ g_return_if_fail (account && TNY_IS_ACCOUNT(account));
- if (found) {
- modest_account_settings_dialog_check_allow_changes ((ModestAccountSettingsDialog *) dialog_as_gpointer);
- 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_account_settings_dialog_check_allow_changes (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));
+ if (TNY_IS_STORE_ACCOUNT (account) &&
+ !modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account)))
+ goto frees;
- return dialog;
+ /* 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 = tny_list_get_length (priv->store_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;
+
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ 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;
}
projects / modest / blobdiff