#include <string.h>
#include <glib/gi18n.h>
+#include <tny-error.h>
#include <tny-account.h>
#include <tny-account-store.h>
#include <tny-store-account.h>
-#include <tny-error.h>
#include <tny-transport-account.h>
#include <tny-simple-list.h>
#include <tny-account-store.h>
#include <modest-account-mgr.h>
#include <modest-account-mgr-helpers.h>
#include <widgets/modest-window-mgr.h>
-#include <modest-account-settings-dialog.h>
-#include <maemo/modest-maemo-utils.h>
#include <modest-signal-mgr.h>
+#include <modest-debug.h>
#include "modest-tny-account-store.h"
#include "modest-tny-platform-factory.h"
#include <tny-gtk-lockable.h>
#include <camel/camel.h>
#include <modest-platform.h>
+#include "modest-ui-actions.h"
+#include <widgets/modest-account-settings-dialog.h>
#ifdef MODEST_PLATFORM_MAEMO
#include <tny-maemo-conic-device.h>
+#include <maemo/modest-maemo-utils.h>
#endif
#include <libgnomevfs/gnome-vfs-volume-monitor.h>
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,
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 void connection_status_changed (TnyAccount *account,
+ TnyConnectionStatus status,
+ gpointer data);
+
+static gboolean only_local_accounts (ModestTnyAccountStore *self);
+
/* list my signals */
enum {
ACCOUNT_CHANGED_SIGNAL,
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1, TNY_TYPE_ACCOUNT);
-
-/* signals[TNY_ACCOUNT_STORE_CONNECTING_FINISHED] = */
-/* g_signal_new ("connecting_finished", */
-/* TNY_TYPE_ACCOUNT_STORE, */
-/* G_SIGNAL_RUN_FIRST, */
-/* G_STRUCT_OFFSET (TnyAccountStoreIface, connecting_finished), */
-/* NULL, NULL, */
-/* g_cclosure_marshal_VOID__VOID, */
-/* G_TYPE_NONE, 0); */
signals[PASSWORD_REQUESTED_SIGNAL] =
g_signal_new ("password_requested",
*/
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,
/* disconnect the list of TnyAccounts */
static void
-foreach_account_disconnect (gpointer data,
- gpointer user_data)
+account_disconnect (TnyAccount *account)
{
- tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(data), FALSE, NULL, NULL);
+ 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_return_if_fail (account && TNY_IS_ACCOUNT(account));
+
+ txt = g_strdup_printf ("%s: %s", str ? str : "?", tny_account_get_name(account));
+ MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(G_OBJECT(account),txt);
+ g_free (txt);
+}
+
+
+
+
static void
foreach_account_append_to_list (gpointer data,
gpointer user_data)
{
TnyList *list;
-
+
list = TNY_LIST (user_data);
tny_list_append (list, G_OBJECT (data));
}
if (found) {
/* Remove from the list */
tny_list_remove (priv->store_accounts, G_OBJECT (mmc_account));
-
+
/* Notify observers */
g_signal_emit (G_OBJECT (self),
signals [ACCOUNT_REMOVED_SIGNAL],
}
/**
- * modest_tny_account_store_forget_password_in_memory
+ * forget_password_in_memory
* @self: a TnyAccountStore instance
* @account: A server account.
*
* 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) {
TnyAccount *tny_account;
tny_account = TNY_ACCOUNT (tny_iterator_get_current (iter));
if (tny_account) {
- TnyConnectionStatus conn_status = tny_account_get_connection_status (tny_account);
-
- if (conn_status != TNY_CONNECTION_STATUS_RECONNECTING &&
- conn_status != TNY_CONNECTION_STATUS_INIT) {
- if (!strcmp (tny_account_get_id (tny_account), account_name)) {
- found = TRUE;
- modest_tny_account_update_from_account (tny_account);
- g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, tny_account);
- }
+ if (!strcmp (tny_account_get_id (tny_account), account_name)) {
+ found = TRUE;
+ 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);
}
static void
on_account_settings_hide (GtkWidget *widget, gpointer user_data)
{
- TnyAccount *account = (TnyAccount*)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);
- const gchar *modest_account_name =
- modest_tny_account_get_parent_modest_account_name_for_server_account (account);
- if (modest_account_name)
- g_hash_table_remove (priv->account_settings_dialog_hash, modest_account_name);
+ 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 ()
+show_password_warning_only (const gchar *msg)
{
ModestWindow *main_window =
- modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
-
+ modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); /* don't create */
+
/* Show an explanatory temporary banner: */
- hildon_banner_show_information (
- GTK_WIDGET(main_window), NULL, _("mcen_ib_username_pw_incorrect"));
+ if (main_window)
+ modest_platform_information_banner (NULL, NULL, msg);
}
-
+
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();
- ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
- const gchar *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__);
- }
-
- /* Check whether this window is already open,
- * for instance because of a previous get_password() call:
- */
- gpointer dialog_as_gpointer = NULL;
- gboolean found = FALSE;
- if (priv->account_settings_dialog_hash) {
- found = g_hash_table_lookup_extended (priv->account_settings_dialog_hash,
- modest_account_name, NULL, (gpointer*)&dialog_as_gpointer);
+ 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;
}
- ModestAccountSettingsDialog *dialog = dialog_as_gpointer;
-
- ModestWindow *main_window =
- modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
- gboolean created_dialog = FALSE;
- if (!found || !dialog) {
- dialog = modest_account_settings_dialog_new ();
- modest_account_settings_dialog_set_account_name (dialog, modest_account_name);
- modest_account_settings_dialog_switch_to_user_info (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 (modest_account_name), dialog);
-
- created_dialog = TRUE;
+ if (g_object_get_data (G_OBJECT (account), "connection_specific") != NULL) {
+ modest_ui_actions_on_smtp_servers (NULL, NULL);
+ } else {
+ 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));
}
-
/* Show an explanatory temporary banner: */
- hildon_banner_show_information (GTK_WIDGET(dialog), NULL, _("mcen_ib_username_pw_incorrect"));
-
- if (created_dialog) {
- /* Forget it when it closes: */
- g_signal_connect_object (G_OBJECT (dialog), "hide", G_CALLBACK (on_account_settings_hide),
- account, 0);
-
- /* Show it and delete it when it closes: */
- modest_maemo_show_dialog_and_forget (GTK_WINDOW (main_window), GTK_DIALOG (dialog));
- }
- else {
- /* Just show it instead of showing it and deleting it when it closes,
- * though it is probably open already: */
- gtk_window_present (GTK_WINDOW (dialog));
- }
-}
-
-
-
-static void
-request_password_and_wait (ModestTnyAccountStore *account_store,
- const gchar* server_account_id,
- gchar **username,
- gchar **password,
- gboolean *cancel,
- gboolean *remember)
-{
- g_signal_emit (G_OBJECT(account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0,
- server_account_id, /* server_account_name */
- username, password, cancel, remember);
+ modest_platform_information_banner (dialog, NULL, _("mcen_ib_username_pw_incorrect"));
}
/* This callback will be called by Tinymail when it needs the password
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.
- */
-
- printf ("DEBUG: modest: %s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used);
-
- g_return_val_if_fail (account, NULL);
-
- 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;
- /* 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"));
+ g_return_val_if_fail (account, NULL);
+
+ MODEST_DEBUG_BLOCK(
+ g_debug ("%s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used);
+ );
+
+ /* 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;
- if (!server_account_name || !account_store) {
+ tmp_account = tny_account_store_find_account (TNY_ACCOUNT_STORE (self),
+ url_string);
+ g_free (url_string);
+
+ 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 : "<NULL>");
if (cancel)
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... */
server_account_name,
NULL,
(gpointer*)&pwd_ptr);
-
- printf ("DEBUG: modest: %s: Already asked = %d\n", __FUNCTION__, already_asked);
-
+ 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,
* 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 =
modest_account_mgr_get_server_account_has_password (priv->account_mgr, server_account_name);
- printf ("DEBUG: modest: %s: settings_have_password=%d\n", __FUNCTION__, settings_have_password);
+
+ /* 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) {
+ 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 (!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: */
show_wrong_password_dialog (account);
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 = dgettext ("hildon-common-strings", "ecdg_ib_set_password_incorrect");
+ else
+ msg = _("mcen_ib_username_pw_incorrect");
+ show_password_warning_only (msg);
}
-
- request_password_and_wait (self, account_id,
+
+ /* Request password */
+ g_signal_emit (G_OBJECT (self), signals[PASSWORD_REQUESTED_SIGNAL], 0,
+ account_id, /* server_account_name */
&username, &pwd, cancel, &remember);
+
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
g_free (username);
username = NULL;
} else
- *cancel = FALSE;
-
- /* printf(" DEBUG: %s: returning %s\n", __FUNCTION__, pwd); */
-
+ if (cancel)
+ *cancel = FALSE;
return pwd;
}
static void
forget_password (TnyAccount *account)
{
- printf ("DEBUG: %s\n", __FUNCTION__);
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
const TnyAccountStore *account_store;
/* Destroy all accounts. Disconnect all accounts before they are destroyed */
if (priv->store_accounts) {
- tny_list_foreach (priv->store_accounts, foreach_account_disconnect, NULL);
+ 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, foreach_account_disconnect, NULL);
+ 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;
}
camel_object_unref (CAMEL_OBJECT(priv->session));
priv->session = NULL;
}
+
+ camel_shutdown ();
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
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 (FALSE)
- /* 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. */
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);
g_return_val_if_fail (self, NULL);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
-
- if (priv->device)
+
+ if (priv->device)
return g_object_ref (G_OBJECT(priv->device));
else
return NULL;
TnyAccount *account,
TnyAlertType type,
gboolean question,
- const GError *error)
+ GError *error)
{
ModestTransportStoreProtocol proto =
MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
- const gchar* server_name = NULL;
+ const gchar* server_name = "";
gchar *prompt = NULL;
gboolean retval;
-
- g_return_val_if_fail (account, FALSE);
+ /* NOTE: account may be NULL in some cases */
g_return_val_if_fail (error, FALSE);
- if ((error->domain != TNY_ACCOUNT_ERROR) && (error->domain != TNY_ACCOUNT_STORE_ERROR))
- return FALSE;
-
/* Get the server name: */
- server_name = tny_account_get_hostname (account);
-
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);
}
switch (error->code) {
- case TNY_ACCOUNT_STORE_ERROR_CANCEL_ALERT:
- case TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL:
+ case TNY_SYSTEM_ERROR_CANCEL:
/* Don't show waste the user's time by showing him a dialog telling
* him that he has just cancelled something: */
return TRUE;
- case TNY_ACCOUNT_ERROR_TRY_CONNECT_HOST_LOOKUP_FAILED:
- case TNY_ACCOUNT_ERROR_TRY_CONNECT_SERVICE_UNAVAILABLE:
- /* TODO: Show the appropriate message, depending on whether it's POP or IMAP: */
+ case TNY_SERVICE_ERROR_PROTOCOL:
+ /* Like a BAD from IMAP (protocol error) */
+ case TNY_SERVICE_ERROR_LOST_CONNECTION:
+ /* Lost the connection with the service */
+ 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"),
}
break;
- case TNY_ACCOUNT_ERROR_TRY_CONNECT_AUTHENTICATION_NOT_SUPPORTED:
- /* This is "Secure connection failed", even though the logical
- * ID has _certificate_ in the name: */
- prompt = g_strdup (_("mail_ni_ssl_certificate_error"));
+ case TNY_SERVICE_ERROR_AUTHENTICATE:
+ /* 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:
+ g_return_val_if_reached (FALSE);
+ }
break;
- case TNY_ACCOUNT_ERROR_TRY_CONNECT_CERTIFICATE:
+ case TNY_SERVICE_ERROR_CERTIFICATE:
/* We'll show the proper dialog later */
break;
-
- case TNY_ACCOUNT_ERROR_TRY_CONNECT:
- /* The tinymail camel implementation just sends us this for almost
- * everything, so we have to guess at the cause.
- * It could be a wrong password, or inability to resolve a hostname,
- * or lack of network, or incorrect authentication method, or something entirely different: */
- /* TODO: Fix camel to provide specific error codes, and then use the
- * specific dialog messages from Chapter 12 of the UI spec.
- */
- case TNY_ACCOUNT_STORE_ERROR_UNKNOWN_ALERT:
+
+ case TNY_SYSTEM_ERROR_MEMORY:
+ /* Can't allocate memory for this operation */
+
+ case TNY_SERVICE_ERROR_UNKNOWN:
return FALSE;
default:
g_return_val_if_reached (FALSE);
}
- if (error->code == TNY_ACCOUNT_ERROR_TRY_CONNECT_CERTIFICATE)
- retval = modest_platform_run_certificate_conformation_dialog (server_name,
+ 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 {
+ 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);
+
+ retval = TRUE;
+ }
+
if (prompt)
g_free (prompt);
klass = (TnyAccountStoreIface *)g;
- klass->get_accounts_func =
+ klass->get_accounts =
modest_tny_account_store_get_accounts;
- klass->get_cache_dir_func =
+ klass->get_cache_dir =
modest_tny_account_store_get_cache_dir;
- klass->get_device_func =
+ klass->get_device =
modest_tny_account_store_get_device;
- klass->alert_func =
+ klass->alert =
modest_tny_account_store_alert;
- klass->find_account_func =
+ klass->find_account =
modest_tny_account_store_find_account_by_url;
}
gboolean found = FALSE;
TnyAccount *retval = NULL;
+ g_return_val_if_fail (TNY_IS_LIST(accounts), NULL);
+
+ if (tny_list_get_length(accounts) == 0) {
+ g_warning ("%s: account list is empty", __FUNCTION__);
+ return NULL;
+ }
+
iter = tny_list_create_iterator (accounts);
while (!tny_iterator_is_done (iter) && !found) {
TnyAccount *tmp_account = NULL;
const gchar *val = NULL;
tmp_account = TNY_ACCOUNT (tny_iterator_get_current (iter));
+ if (!TNY_IS_ACCOUNT(tmp_account)) {
+ g_warning ("%s: not a valid account", __FUNCTION__);
+ tmp_account = NULL;
+ break;
+ }
+
switch (type) {
case MODEST_TNY_ACCOUNT_STORE_QUERY_ID:
val = tny_account_get_id (tmp_account);
retval = g_object_ref (tmp_account);
found = TRUE;
} else {
- if (strcmp (val, str) == 0) {
+ if (val && str && strcmp (val, str) == 0) {
retval = g_object_ref (tmp_account);
found = TRUE;
}
return account;
}
+
TnyAccount*
modest_tny_account_store_get_server_account (ModestTnyAccountStore *self,
const gchar *account_name,
modest_acc_name =
modest_tny_account_get_parent_modest_account_name_for_server_account (tmp_account);
- if (!strcmp (account_name, modest_acc_name)) {
+ if (account_name && modest_acc_name && !strcmp (account_name, modest_acc_name)) {
found = TRUE;
retval = g_object_ref (tmp_account);
}
g_object_unref (tmp_account);
tny_iterator_next (iter);
}
+ g_object_unref (iter);
if (!found) {
g_printerr ("modest: %s: could not get tny %s account for %s\n." \
return retval;
}
-static TnyAccount*
-get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self,
- const gchar *account_name)
+TnyAccount*
+modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection (
+ ModestTnyAccountStore *self, const gchar *account_name)
{
+ TnyDevice *device;
+
+ g_return_val_if_fail (self && MODEST_IS_TNY_ACCOUNT_STORE(self), NULL);
+ g_return_val_if_fail (account_name, NULL);
+
/* Get the current connection: */
- TnyDevice *device = modest_runtime_get_device ();
-
+ device = modest_runtime_get_device ();
+
+ if (!device) {
+ g_warning ("%s: could not get device", __FUNCTION__);
+ return NULL;
+ }
+
if (!tny_device_is_online (device))
return NULL;
-
- g_return_val_if_fail (self, NULL);
+#ifdef MODEST_HAVE_CONIC
+ g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE (device), NULL);
-#ifdef MODEST_PLATFORM_MAEMO
- g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device));
TnyMaemoConicDevice *maemo_device = TNY_MAEMO_CONIC_DEVICE (device);
const gchar* iap_id = tny_maemo_conic_device_get_current_iap_id (maemo_device);
/* printf ("DEBUG: %s: iap_id=%s\n", __FUNCTION__, iap_id); */
if (!connection)
return NULL;
- const gchar *connection_name = con_ic_iap_get_name (connection);
- /* printf ("DEBUG: %s: connection_name=%s\n", __FUNCTION__, connection_name); */
- if (!connection_name)
+ const gchar *connection_id = con_ic_iap_get_id (connection);
+ /* printf ("DEBUG: %s: connection_id=%s\n", __FUNCTION__, connection_id); */
+ if (!connection_id)
return NULL;
/* Get the connection-specific transport acccount, if any: */
}
gchar* server_account_name = modest_account_mgr_get_connection_specific_smtp (account_manager,
- connection_name);
+ connection_id);
/* printf ("DEBUG: %s: server_account_name=%s\n", __FUNCTION__, server_account_name); */
if (!server_account_name) {
return account;
#else
return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */
-#endif /* MODEST_PLATFORM_MAEMO */
+#endif /* MODEST_HAVE_CONIC */
}
/* Get the connection-specific transport acccount, if any: */
/* Note: This gives us a reference: */
TnyAccount *account =
- get_smtp_specific_transport_account_for_open_connection (self, account_name);
+ modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection (self, account_name);
/* If there is no connection-specific transport account (the common case),
* just get the regular transport account: */
{
g_return_val_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (self), NULL);
+ /* New reference */
return modest_tny_account_store_get_tny_account_by (self, MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
MODEST_MMC_ACCOUNT_ID);
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,
- TnyAccountType type)
+ TnyAccountType type,
+ gboolean notify)
{
TnyAccount *account = NULL;
ModestTnyAccountStorePrivate *priv = NULL;
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));
+
+ /* 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 {
g_printerr ("modest: failed to create account for %s\n", name);
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);
- g_assert (tny_list_get_length (folders) == 1);
-
- iter_folders = tny_list_create_iterator (folders);
+
+ if (tny_list_get_length (list) != 1) {
+ g_warning ("%s: > 1 outbox found (%d)?!", __FUNCTION__,
+ tny_list_get_length (list));
+ }
+
+ 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 (info->transport_account);
g_object_unref (local_account);
g_object_unref (per_account_outbox);
+ 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,
+ add_outbox_from_transport_account_to_global_outbox_get_folders_cb, NULL, (gpointer) info);
+ g_object_unref (account_outbox);
}
/*
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);
- transport_account = create_tny_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT);
+ 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;
+ }
- g_assert (store_account);
- g_assert (transport_account);
+ 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);
+ return;
+ }
/* 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);
+
/* 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 */
g_object_unref (transport_account);
}
+static 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;
+}
+
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
+ on_account_removed to disconnect the account */
+static void
+on_account_disconnect_when_removing (TnyCamelAccount *account,
+ gboolean canceled,
+ GError *err,
+ gpointer user_data)
+{
+ ModestTnyAccountStore *self;
+ ModestTnyAccountStorePrivate *priv;
+
+ 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));
+
+ /* Unref the extra reference added by get_server_account */
+ g_object_unref (account);
+
+ /* Clear the cache if it's an store 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 (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 void
gpointer user_data)
{
TnyAccount *store_account = NULL, *transport_account = NULL;
- ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
+ ModestTnyAccountStore *self;
+ ModestTnyAccountStorePrivate *priv;
+ 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) {
- /* Clear the cache */
- tny_store_account_delete_cache (TNY_STORE_ACCOUNT (store_account));
-
- /* Notify the observers */
+ 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);
- g_object_unref (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)) {
+
+ /* Forget any cached password for the account */
+ forget_password_in_memory (self, tny_account_get_id (transport_account));
- /* Notify the observers */
- g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, transport_account);
- g_object_unref (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);
}
+
+ /* 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 *
+modest_tny_account_store_new_connection_specific_transport_account (ModestTnyAccountStore *self,
+ const gchar *name)
+{
+ ModestTnyAccountStorePrivate *priv = NULL;
+ TnyAccount * tny_account = NULL;
+
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ /* Add the account: */
+ tny_account =
+ modest_tny_account_new_from_server_account_name (priv->account_mgr,
+ priv->session,
+ name,
+ get_password,
+ forget_password);
+ if (tny_account) {
+ 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,
+ name,
+ tny_account);
+
+ } else
+ g_printerr ("modest: failed to create smtp-specific account for %s\n",
+ name);
+
+ return TNY_TRANSPORT_ACCOUNT (tny_account);
}
+
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 ();
+ 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 ();
+ }
+
+ /* 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);
+ TnyTransportAccount * account = NULL;
+ account = modest_tny_account_store_new_connection_specific_transport_account (
+ self, transport_account_name);
+ if (account)
+ g_object_unref (account);
+ }
+ iter = g_slist_next (iter);
+ }
+}
+static void
+remove_connection_specific_transport_accounts (ModestTnyAccountStore *self)
+{
+ ModestTnyAccountStorePrivate *priv = NULL;
+ GSList *list_specifics = NULL, *iter = NULL;
GError *err = NULL;
- list_specifics = modest_conf_get_list (conf,
+
+ 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_printerr ("modest: %s: error getting list: %s\n.", __FUNCTION__, err->message);
g_error_free (err);
- err = NULL;
+ g_return_if_reached ();
}
/* Look at each connection-specific transport account for the
iter = g_slist_next (iter);
if (iter) {
const gchar* transport_account_name = (const gchar*) (iter->data);
- if (transport_account_name) {
- TnyAccount * tny_account = NULL;
- /* Add the account: */
- tny_account =
- modest_tny_account_new_from_server_account_name (priv->account_mgr,
- priv->session,
- transport_account_name);
- if (tny_account) {
- g_object_set_data (G_OBJECT(tny_account),
- "account_store",
- (gpointer)self);
-
- tny_list_append (priv->transport_accounts, G_OBJECT (tny_account));
- g_object_unref (tny_account);
- } else
- g_printerr ("modest: failed to create smtp-specific account for %s\n",
- transport_account_name);
+ TnyAccount * account;
+ account = modest_tny_account_store_get_server_account (self,
+ transport_account_name,
+ TNY_ACCOUNT_TYPE_TRANSPORT);
+ if (account) {
+ remove_transport_account (self, TNY_TRANSPORT_ACCOUNT (account));
+ g_object_unref (account);
}
}
iter = g_slist_next (iter);
}
}
+
TnyMsg *
modest_tny_account_store_find_msg_in_outboxes (ModestTnyAccountStore *self,
const gchar *uri,
g_object_unref (folder);
tny_iterator_next (folders_iter);
}
+ g_object_unref (folders_iter);
g_object_unref (folders);
g_object_unref (account);
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);
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));
+ 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_UNKNONW) {
+ 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)
+{
+ 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_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;
+ }
+
+}
projects / modest / blobdiff