#include <tny-camel-transport-account.h>
#include <tny-camel-imap-store-account.h>
#include <tny-camel-pop-store-account.h>
-
+#include "modest-text-utils.h"
#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>
static void modest_tny_account_store_init (gpointer g, gpointer iface_data);
static void modest_tny_account_store_base_init (gpointer g_class);
-static void on_account_inserted (ModestAccountMgr *acc_mgr,
+static void on_account_inserted (ModestAccountMgr *acc_mgr,
const gchar *account,
gpointer user_data);
static void insert_account (ModestTnyAccountStore *self,
const gchar *account,
- gboolean notify);
+ gboolean is_new);
static void on_account_removed (ModestAccountMgr *acc_mgr,
const gchar *account,
static void remove_connection_specific_transport_accounts (ModestTnyAccountStore *self);
-static void connection_status_changed (TnyAccount *account,
- TnyConnectionStatus status,
- gpointer data);
-
-static gboolean only_local_accounts (ModestTnyAccountStore *self);
+static inline gboolean only_local_accounts (ModestTnyAccountStore *self);
/* list my signals */
enum {
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), \
static void
modest_tny_account_store_instance_init (ModestTnyAccountStore *obj)
{
- GnomeVFSVolumeMonitor* monitor = NULL;
ModestTnyAccountStorePrivate *priv;
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(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,
*/
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. */
- monitor = gnome_vfs_get_volume_monitor();
-
- priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
- G_OBJECT(monitor),
- "volume-mounted",
- G_CALLBACK(on_vfs_volume_mounted),
- obj);
- priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
- G_OBJECT(monitor), "volume-unmounted",
- G_CALLBACK(on_vfs_volume_unmounted),
- obj);
}
/* disconnect the list of TnyAccounts */
g_free (txt);
}
-
-
-
static void
foreach_account_append_to_list (gpointer data,
gpointer user_data)
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));
{
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
+ gchar *volume_path_uri;
gchar *uri = NULL;
/* 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);
}
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;
g_object_unref (mmc_account);
} else {
- g_warning ("%s: there was no store account for the unmounted MMC",
- __FUNCTION__);
+ g_debug ("%s: there was no store account for the unmounted MMC",
+ __FUNCTION__);
}
}
+ g_free (volume_path_uri);
g_free (uri);
}
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;
}
tny_iterator_next (iter);
}
-
- if (iter)
- g_object_unref (iter);
-}
-
-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);
+ g_object_unref (iter);
}
static void
show_password_warning_only (const gchar *msg)
{
- 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)
+ if (modest_window_mgr_get_num_windows (modest_runtime_get_window_mgr ()))
modest_platform_information_banner (NULL, NULL, msg);
}
static void
-show_wrong_password_dialog (TnyAccount *account)
+show_wrong_password_dialog (TnyAccount *account,
+ gboolean show_banner)
{
- /* 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_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"));
+ if (show_banner)
+ modest_platform_information_banner (NULL, NULL, _("mcen_ib_username_pw_incorrect"));
}
/* This callback will be called by Tinymail when it needs the password
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",
+ g_warning ("%s: could not retrieve account_store for account %s",
__FUNCTION__, server_account_name ? server_account_name : "<NULL>");
if (cancel)
*cancel = TRUE;
-
+
return NULL;
}
-
+
/* 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
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,
/* 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);
gchar *password;
password = modest_account_mgr_get_server_account_password (priv->account_mgr,
server_account_name);
- if (!password || strlen(password) == 0)
+
+ 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));
if (settings_have_password) {
/* The password must be wrong, so show the account settings dialog so it can be corrected: */
- show_wrong_password_dialog (account);
-
+ show_wrong_password_dialog (account, TRUE);
+
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) {
const gchar *msg;
gboolean username_known =
server_account_name);
/* If the login has ever succeeded then show a specific message */
if (username_known)
- msg = dgettext ("hildon-common-strings", "ecdg_ib_set_password_incorrect");
+ msg = _CS ("ecdg_ib_set_password_incorrect");
else
msg = _("mcen_ib_username_pw_incorrect");
show_password_warning_only (msg);
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;
priv->session = NULL;
}
- camel_shutdown ();
-
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
-gboolean
+static gboolean
volume_path_is_mounted (const gchar* path)
{
g_return_val_if_fail (path, FALSE);
* 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);
}
}
ModestTnyAccountStore*
-modest_tny_account_store_new (ModestAccountMgr *account_mgr,
- TnyDevice *device)
+modest_tny_account_store_new (ModestAccountMgr *account_mgr,
+ TnyDevice *device)
{
GObject *obj;
ModestTnyAccountStorePrivate *priv;
TnyAccount *local_account = NULL;
-
+ TnyLockable *lockable;
+ GnomeVFSVolumeMonitor* monitor = NULL;
+
g_return_val_if_fail (account_mgr, NULL);
g_return_val_if_fail (device, NULL);
priv->account_mgr = g_object_ref (G_OBJECT(account_mgr));
priv->device = g_object_ref (device);
-
+
priv->session = tny_session_camel_new (TNY_ACCOUNT_STORE(obj));
if (!priv->session) {
g_warning ("failed to get TnySessionCamel");
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,
G_OBJECT(account_mgr), "account_inserted",
G_OBJECT(account_mgr), "account_removed",
G_CALLBACK (on_account_removed), obj);
+ /* 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 */
+ monitor = gnome_vfs_get_volume_monitor();
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT(monitor),
+ "volume-mounted",
+ G_CALLBACK(on_vfs_volume_mounted),
+ obj);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT(monitor), "volume-unmounted",
+ G_CALLBACK(on_vfs_volume_unmounted),
+ obj);
+
/* Create the lists of accounts */
priv->store_accounts = tny_simple_list_new ();
priv->transport_accounts = tny_simple_list_new ();
local_account =
modest_tny_account_new_for_local_folders (priv->account_mgr, priv->session, NULL);
tny_list_append (priv->store_accounts, G_OBJECT(local_account));
- g_object_unref (local_account);
+ g_object_unref (local_account);
/* Add the other remote accounts. Do this after adding the
local account, because we need to add our outboxes to the
global OUTBOX hosted in the local account */
add_existing_accounts (MODEST_TNY_ACCOUNT_STORE (obj));
-
+
/* 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. */);
+ add_mmc_account (MODEST_TNY_ACCOUNT_STORE (obj), FALSE /* don't emit the insert signal. */);
}
-
+
return MODEST_TNY_ACCOUNT_STORE(obj);
}
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 {
- g_warning("modest: %s: account with id=%s has no proto.\n", __FUNCTION__,
+ protocol_type = modest_tny_account_get_protocol_type (account);
+ if (protocol_type == MODEST_PROTOCOL_REGISTRY_TYPE_INVALID){
+ g_warning("%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;
/* Can't allocate memory for this operation */
case TNY_SERVICE_ERROR_UNKNOWN:
- return FALSE;
+ return FALSE;
default:
- g_return_val_if_reached (FALSE);
+ /* We don't treat this as an error, but as a not handled message. Then,
+ * debug message, and return false */
+ g_debug ("Unexpected error %d (%s)", error->code, error->message);
+ return 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 ||
+ error->code == TNY_SERVICE_ERROR_CONNECT) {
+ TnyDevice *device = modest_runtime_get_device ();
+
modest_platform_run_information_dialog (NULL, prompt, TRUE);
- /* Show the account dialog if it was wrong */
- if (error->code == TNY_SERVICE_ERROR_CONNECT ||
- error->code == TNY_SERVICE_ERROR_AUTHENTICATE)
- show_wrong_password_dialog (account);
+ /* Show the account dialog. Checking the online status
+ allows us to minimize the number of times that we
+ incorrectly show the dialog */
+ if (tny_device_is_online (device))
+ show_wrong_password_dialog (account,
+ (error->code == TNY_SERVICE_ERROR_CONNECT) ? FALSE : TRUE);
retval = TRUE;
}
-
+ g_debug ("%s: error code %d (%s", __FUNCTION__, error->code, error->message);
+
if (prompt)
g_free (prompt);
-
+
return retval;
}
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? */
modest_account_mgr_free_account_names (account_names);
}
-static void
-connection_status_changed (TnyAccount *account,
- TnyConnectionStatus status,
- gpointer data)
-{
- /* We do this here and not in the connection policy because we
- don't want to do it for every account, just for the
- accounts that are interactively added when modest is
- runnning */
- if (status == TNY_CONNECTION_STATUS_CONNECTED) {
- const gchar *account_name;
- ModestWindow *main_window;
- ModestTnyAccountStorePrivate *priv = NULL;
-
- priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (data);
-
- /* Remove this handler */
- priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers,
- G_OBJECT (account),
- "connection_status_changed");
-
- /* 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);
- }
-}
-
static TnyAccount*
create_tny_account (ModestTnyAccountStore *self,
const gchar *name,
{
TnyAccount *account = NULL;
ModestTnyAccountStorePrivate *priv = NULL;
-
+
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
account = modest_tny_account_new_from_account (priv->account_mgr,
we use a new account if any */
forget_password_in_memory (self, tny_account_get_id (account));
- /* Install a signal handler that will refresh the
- account the first time it becomes online. Do this
- only if we're adding a new account while the
- program is running (we do not want to do this
- allways) */
- if (type == TNY_ACCOUNT_TYPE_STORE && notify)
- priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
- G_OBJECT (account),
- "connection_status_changed",
- G_CALLBACK (connection_status_changed),
- self);
-
/* Set the account store */
g_object_set_data (G_OBJECT(account), "account_store", self);
} else {
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);
}
static void
insert_account (ModestTnyAccountStore *self,
const gchar *account,
- gboolean notify)
+ gboolean is_new)
{
ModestTnyAccountStorePrivate *priv = NULL;
TnyAccount *store_account = NULL, *transport_account = NULL;
-
+
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, notify);
+ store_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_STORE, is_new);
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, notify);
+ transport_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT, is_new);
if (!transport_account || !TNY_IS_ACCOUNT(transport_account)) {
g_warning ("%s: failed to create transport account", __FUNCTION__);
g_object_unref (store_account);
/* Add accounts to the lists */
tny_list_append (priv->store_accounts, G_OBJECT (store_account));
tny_list_append (priv->transport_accounts, G_OBJECT (transport_account));
-
+
/* 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);
+ /* Force the creation of the send queue, this way send queues
+ will automatically send missing emails when the connections
+ become active */
/* Notify the observers. We do it after everything is
created */
- if (notify) {
- g_signal_emit (G_OBJECT (self), signals [ACCOUNT_INSERTED_SIGNAL], 0, store_account);
+ if (is_new) {
+ /* We only have to do this for new accounts, already
+ existing accounts at boot time are instantiated by
+ modest_tny_account_store_start_send_queues */
+ modest_runtime_get_send_queue ((TnyTransportAccount *) transport_account, TRUE);
+
+ 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);
}
g_object_unref (transport_account);
}
-static gboolean
+static inline gboolean
only_local_accounts (ModestTnyAccountStore *self)
{
- ModestTnyAccountStorePrivate *priv = NULL;
- gboolean only_local = TRUE;
- TnyIterator *iter;
-
- /* Check if this is the first remote account we add */
- priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
- iter = tny_list_create_iterator (priv->store_accounts);
-
- while (!tny_iterator_is_done (iter) && only_local) {
- TnyAccount *account = (TnyAccount *) tny_iterator_get_current (iter);
- if (modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account)))
- only_local = FALSE;
- g_object_unref (account);
- tny_iterator_next (iter);
- }
- g_object_unref (iter);
-
- return only_local;
+ return (modest_tny_account_store_get_num_remote_accounts (self) > 0) ? FALSE : TRUE;
}
static void
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);
self = MODEST_TNY_ACCOUNT_STORE (user_data);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
- /* Remove the connection-status-changed handler if it's still there */
- if (modest_signal_mgr_is_connected (priv->sighandlers,
- G_OBJECT (account),
- "connection_status_changed")) {
- priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers,
- G_OBJECT (account),
- "connection_status_changed");
- }
-
/* Cancel all pending operations */
tny_account_cancel (TNY_ACCOUNT (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))
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)
if (err) {
g_error_free (err);
g_return_if_reached ();
+ return;
}
/* Look at each connection-specific transport account for the
}
iter = g_slist_next (iter);
}
+
+ /* Free the list */
+ g_slist_foreach (list_specifics, foreach_free_string, NULL);
+ g_slist_free (list_specifics);
}
static void
if (err) {
g_error_free (err);
g_return_if_reached ();
+ return;
}
/* Look at each connection-specific transport account for the
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);
}
+
+ /* Free the list */
+ g_slist_foreach (list_specifics, foreach_free_string, NULL);
+ g_slist_free (list_specifics);
}
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)) {
return header_acc;
}
-GtkWidget *
-modest_tny_account_store_show_account_settings_dialog (ModestTnyAccountStore *self,
- const gchar *account_name)
-{
- 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) {
- 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_save_password (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog));
- 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));
-
- return dialog;
- }
-
-}
-
typedef struct {
ModestTnyAccountStore *account_store;
ModestTnyAccountStoreShutdownCallback 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);
}
}
if (TNY_IS_STORE_ACCOUNT (account) &&
!modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account)))
- return;
+ goto frees;
- op_data->pending++;
+ /* 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;
+ }
- tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(account), FALSE, account_shutdown_callback, op_data);
+ frees:
+ op_data->pending--;
+ g_object_unref (op_data->account_store);
}
-void
+void
modest_tny_account_store_shutdown (ModestTnyAccountStore *self,
ModestTnyAccountStoreShutdownCallback callback,
gpointer userdata)
{
- ShutdownOpData *op_data = g_new0 (ShutdownOpData, 1);
+ 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 = 0;
- op_data->account_store = g_object_ref (self);
-
+ 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_object_unref (op_data->account_store);
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;
+}
+
+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;
+ gint count = 0;
+
+ g_return_val_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (self), 0);
+
+ /* Count remote accounts */
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+ tny_list_foreach (priv->store_accounts, (GFunc) count_remote_accounts, &count);
+
+ return count;
+}
+
+static void
+init_send_queue (TnyAccount *account, gpointer user_data)
+{
+ modest_runtime_get_send_queue ((TnyTransportAccount *) account, TRUE);
+}
+
+void
+modest_tny_account_store_start_send_queues (ModestTnyAccountStore *self)
+{
+ ModestTnyAccountStorePrivate *priv;
+ TnyList *tmp;
+
+ g_return_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (self));
+
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+
+ /* We need to create a copy of the list because if the send
+ queues are created they'll directly access to the TnyList
+ of transport accounts, and thus we'll end up blocked in the
+ mutex the TnyList uses to synchronize accesses */
+ tmp = tny_list_copy (priv->transport_accounts);
+
+ /* Just instantiate them. They'll begin to listen for
+ connection changes to send messages ASAP */
+ tny_list_foreach (tmp, (GFunc) init_send_queue, NULL);
+ g_object_unref (tmp);
+}