#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 <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>
-#include <maemo/modest-account-settings-dialog.h>
#endif
#include <libgnomevfs/gnome-vfs-volume-monitor.h>
static void add_connection_specific_transport_accounts (ModestTnyAccountStore *self);
+static void connection_status_changed (TnyAccount *account,
+ TnyConnectionStatus status,
+ gpointer data);
+
/* list my signals */
enum {
ACCOUNT_CHANGED_SIGNAL,
struct _ModestTnyAccountStorePrivate {
gchar *cache_dir;
GHashTable *password_hash;
-#ifdef MODEST_PLATFORM_MAEMO
GHashTable *account_settings_dialog_hash;
-#endif
ModestAccountMgr *account_mgr;
TnySessionCamel *session;
TnyDevice *device;
priv->password_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, g_free);
-#ifdef MODEST_PLATFORM_MAEMO
/* A hash-map of modest account names to dialog pointers,
* so we can avoid showing the account settings twice for the same modest account: */
priv->account_settings_dialog_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, NULL);
-#endif
/* Respond to volume mounts and unmounts, such
* as the insertion/removal of the memory card: */
if (tny_account) {
if (!strcmp (tny_account_get_id (tny_account), account_name)) {
found = TRUE;
- modest_tny_account_update_from_account (tny_account);
+ modest_tny_account_update_from_account (tny_account, get_password, forget_password);
g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, tny_account);
}
g_object_unref (tny_account);
g_object_unref (iter);
}
-#ifdef MODEST_PLATFORM_MAEMO
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);
}
-#endif
static void
show_password_warning_only ()
/* Show an explanatory temporary banner: */
if (main_window)
- modest_platform_information_banner (GTK_WIDGET(main_window), NULL,
+ modest_platform_information_banner (NULL, NULL,
_("mcen_ib_username_pw_incorrect"));
else
g_warning ("%s: %s", __FUNCTION__, _("mcen_ib_username_pw_incorrect"));
}
-#ifdef MODEST_PLATFORM_MAEMO
static void
show_wrong_password_dialog (TnyAccount *account)
{
/* This is easier than using a struct for the user_data: */
ModestTnyAccountStore *self = modest_runtime_get_account_store();
- ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- ModestWindow *main_window;
const gchar *modest_account_name;
+ GtkWidget *main_window;
+ GtkWidget *dialog;
- main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
- FALSE); /* don't create */
+ 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;
__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);
- }
- ModestAccountSettingsDialog *dialog = dialog_as_gpointer;
-
- 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;
- }
-
+ dialog = modest_tny_account_store_show_account_settings_dialog (self, modest_account_name);
/* Show an explanatory temporary banner: */
modest_platform_information_banner (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: */
- gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (main_window));
- g_signal_connect_swapped (dialog,
- "response",
- G_CALLBACK (gtk_widget_destroy),
- dialog);
- gtk_widget_show (GTK_WIDGET (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));
- }
}
-#endif
/* This callback will be called by Tinymail when it needs the password
* from the user or the account settings.
g_return_val_if_fail (account, NULL);
MODEST_DEBUG_BLOCK(
- g_debug ("DEBUG: modest: %s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used);
+ g_debug ("%s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used);
);
/* Initialize the output parameter: */
NULL,
(gpointer*)&pwd_ptr);
MODEST_DEBUG_BLOCK(
- g_debug ("DEBUG: modest: %s: Already asked = %d\n", __FUNCTION__, already_asked);
+ g_debug ("%s: Already asked = %d\n", __FUNCTION__, already_asked);
);
/* If the password is not already there, try ModestConf */
const gboolean settings_have_password =
modest_account_mgr_get_server_account_has_password (priv->account_mgr, server_account_name);
MODEST_DEBUG_BLOCK(
- printf ("DEBUG: modest: %s: settings_have_password=%d\n",
+ printf ("%s: settings_have_password=%d\n",
__FUNCTION__, settings_have_password);
);
if (settings_have_password) {
/* The password must be wrong, so show the account settings dialog so it can be corrected: */
-#ifdef MODEST_PLATFORM_MAEMO
show_wrong_password_dialog (account);
-#endif
if (cancel)
*cancel = TRUE;
static void
forget_password (TnyAccount *account)
{
- printf ("DEBUG: %s\n", __FUNCTION__);
ModestTnyAccountStore *self;
ModestTnyAccountStorePrivate *priv;
const TnyAccountStore *account_store;
priv->password_hash = NULL;
}
-#ifdef MODEST_PLATFORM_MAEMO
if (priv->account_settings_dialog_hash) {
g_hash_table_destroy (priv->account_settings_dialog_hash);
priv->account_settings_dialog_hash = NULL;
}
-#endif
if (priv->outbox_of_transport) {
g_hash_table_destroy (priv->outbox_of_transport);
camel_object_unref (CAMEL_OBJECT(priv->session));
priv->session = NULL;
}
+
+ camel_shutdown ();
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
TnyAccount *account,
TnyAlertType type,
gboolean question,
- const GError *error)
+ GError *error)
{
ModestTransportStoreProtocol proto =
MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
g_return_val_if_fail (account, FALSE);
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);
}
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)
+ if (error->code == TNY_SERVICE_ERROR_CERTIFICATE)
retval = modest_platform_run_certificate_confirmation_dialog (server_name,
error->message);
else
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;
}
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." \
}
TnyAccount*
-modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self,
- const gchar *account_name)
+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);
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) {
{
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)
+{
+ 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");
+
+ /* Set the username as succedded */
+ modest_account_mgr_set_server_account_username_has_succeeded (modest_runtime_get_account_mgr (),
+ tny_account_get_id (account),
+ TRUE);
+
+ /* 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,
we use a new account if any */
modest_tny_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 */
+ 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 {
self = MODEST_TNY_ACCOUNT_STORE (user_data);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
- if (canceled || err) {
- /* The account was not cancelled */
- } else {
- /* Clear the cache if it's an store account */
- if (TNY_IS_STORE_ACCOUNT (account))
- tny_store_account_delete_cache (TNY_STORE_ACCOUNT (account));
+ /* 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");
}
/* Remove it from the list of accounts */
/* Unref the extra reference added by get_server_account */
g_object_unref (account);
+
+ /* Cancel all pending operations */
+ tny_account_cancel (TNY_ACCOUNT (account));
+
+ /* Clear the cache if it's an store account */
+ if (TNY_IS_STORE_ACCOUNT (account))
+ tny_store_account_delete_cache (TNY_STORE_ACCOUNT (account));
}
static void
-on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account,
+on_account_removed (ModestAccountMgr *acc_mgr,
+ const gchar *account,
gpointer user_data)
{
TnyAccount *store_account = NULL, *transport_account = NULL;
g_object_unref (folder);
tny_iterator_next (folders_iter);
}
+ g_object_unref (folders_iter);
g_object_unref (folders);
g_object_unref (account);
g_object_unref (account);
tny_iterator_next (acc_iter);
}
-
g_object_unref(acc_iter);
+
+ /* 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)
+ return (GtkWidget *) dialog_as_gpointer;
+ else {
+ ModestAccountSettings *settings;
+ GtkWidget *dialog;
+ dialog = (GtkWidget *) modest_account_settings_dialog_new ();
+ settings = modest_account_mgr_load_account_settings (priv->account_mgr, account_name);
+ modest_account_settings_dialog_set_account (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog), settings);
+ g_object_unref (settings);
+ modest_account_settings_dialog_switch_to_user_info (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog));
+ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog));
+
+ g_hash_table_insert (priv->account_settings_dialog_hash, g_strdup (account_name), dialog);
+
+ g_signal_connect (G_OBJECT (dialog), "hide", G_CALLBACK (on_account_settings_hide),
+ g_strdup (account_name));
+
+ /* Show it and delete it when it closes: */
+ g_signal_connect_swapped (dialog,
+ "response",
+ G_CALLBACK (gtk_widget_destroy),
+ dialog);
+ gtk_widget_show (GTK_WIDGET (dialog));
+
+ return dialog;
+ }
+
+}
projects / modest / blobdiff