static void
recreate_all_accounts (ModestTnyAccountStore *self)
{
+ /* printf ("DEBUG: %s\n", __FUNCTION__); */
+
ModestTnyAccountStorePrivate *priv =
MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
priv->store_accounts_outboxes = NULL;
}
+
if (priv->store_accounts) {
account_list_free (priv->store_accounts);
priv->store_accounts = NULL;
- get_server_accounts (TNY_ACCOUNT_STORE(self),
- NULL, TNY_ACCOUNT_TYPE_STORE);
}
+ get_server_accounts (TNY_ACCOUNT_STORE(self),
+ NULL, TNY_ACCOUNT_TYPE_STORE);
+
+
if (priv->transport_accounts) {
account_list_free (priv->transport_accounts);
priv->transport_accounts = NULL;
- get_server_accounts (TNY_ACCOUNT_STORE(self), NULL,
- TNY_ACCOUNT_TYPE_TRANSPORT);
}
+
+ get_server_accounts (TNY_ACCOUNT_STORE(self), NULL,
+ TNY_ACCOUNT_TYPE_TRANSPORT);
}
static void
static void
on_account_removed (ModestAccountMgr *acc_mgr,
const gchar *account,
- gboolean is_server_account,
gpointer user_data)
{
+ TnyAccount *store_account = NULL, *transport_account = NULL;
ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
- TnyAccount *server_account;
- /* Clear the account cache */
- server_account = modest_tny_account_store_get_tny_account_by (self,
- MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
- account);
- if (server_account) {
- if (TNY_IS_STORE_ACCOUNT (server_account)) {
+ /* Get the server and the transport account */
+ store_account =
+ 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);
+
+ /* Clear the cache */
+ tny_store_account_delete_cache (TNY_STORE_ACCOUNT (store_account));
+
+ /* Notify the observers */
+ g_signal_emit (G_OBJECT (self),
+ tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNT_REMOVED],
+ 0, store_account);
+ g_signal_emit (G_OBJECT (self),
+ tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNT_REMOVED],
+ 0, transport_account);
+
+ /* Make sure that the account is reviewed from the View menu, etc: */
+ g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
+ NULL);
- tny_store_account_delete_cache (TNY_STORE_ACCOUNT (server_account));
-
- g_signal_emit (G_OBJECT (self),
- tny_account_store_signals [TNY_ACCOUNT_STORE_ACCOUNT_REMOVED],
- 0, server_account);
-
-/* /\* FIXME: make this more finegrained; changes do not */
-/* * really affect _all_ accounts, and some do not */
-/* * affect tny accounts at all (such as 'last_update') */
-/* *\/ */
-/* recreate_all_accounts (self); */
-
-/* g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0, */
-/* account); */
- }
- g_object_unref (server_account);
- } else
- g_printerr ("modest: cannot find server account for %s", account);
+ /* Frees */
+ g_object_unref (store_account);
+ g_object_unref (transport_account);
+}
+
+/**
+ * modest_tny_account_store_forget_password_in_memory
+ * @self: a TnyAccountStore instance
+ * @account: A server account.
+ *
+ * Forget any password stored in memory for this 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)
+{
+ /* printf ("DEBUG: %s\n", __FUNCTION__); */
+ ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ if (server_account_name && priv->password_hash) {
+ g_hash_table_remove (priv->password_hash, server_account_name);
+ }
}
static void
const GSList *keys, gboolean server_account, gpointer user_data)
{
+ printf ("DEBUG: modest: %s\n", __FUNCTION__);
+
ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
+ /*
+ printf ("DEBUG: %s\n", __FUNCTION__);
+ const GSList *iter = keys;
+ for (iter = keys; iter; iter = g_slist_next (iter)) {
+ printf (" DEBUG: %s: key=%s\n", __FUNCTION__, (const gchar*)iter->data);
+ }
+ */
+
+
/* Ignore the change if it's a change in the last_updated value */
if (g_slist_length ((GSList *)keys) == 1 &&
- g_str_has_suffix ((const gchar *) keys->data, MODEST_ACCOUNT_LAST_UPDATED))
+ g_str_has_suffix ((const gchar *) keys->data, MODEST_ACCOUNT_LAST_UPDATED)) {
return;
+ }
/* FIXME: make this more finegrained; changes do not really affect _all_
* accounts
*/
recreate_all_accounts (self);
+
+ /* TODO: This doesn't actually work, because
+ * a) The account name is not sent correctly per key:
+ * b) We should test the end of the key, not the whole keym
+ * c) We don't seem to be getting all keys here.
+ * Instead, we just forget the password for all accounts when we create them, for now.
+ */
+ #if 0
+ /* If a password has changed, then forget the previously cached password for this account: */
+ if (server_account && keys && g_slist_find_custom ((GSList *)keys, MODEST_ACCOUNT_PASSWORD, (GCompareFunc)strcmp)) {
+ printf ("DEBUG: %s: Forgetting cached password for account ID=%s\n", __FUNCTION__, account);
+ modest_tny_account_store_forget_password_in_memory (self, account);
+ }
+ #endif
g_signal_emit (G_OBJECT(self), signals[ACCOUNT_UPDATE_SIGNAL], 0,
account);
}
static
+gboolean on_idle_wrong_password_warning_only (gpointer user_data)
+{
+ gdk_threads_enter();
+
+ ModestWindow *main_window =
+ modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
+
+ /* Show an explanatory temporary banner: */
+ hildon_banner_show_information (
+ GTK_WIDGET(main_window), NULL, _("mcen_ib_username_pw_incorrect"));
+
+ gdk_threads_leave();
+
+ return FALSE; /* Don't show again. */
+}
+
+static
gboolean on_idle_wrong_password (gpointer user_data)
{
TnyAccount *account = (TnyAccount*)user_data;
return FALSE; /* Dont' call this again. */
}
+typedef struct
+{
+ GMainLoop *loop;
+ ModestTnyAccountStore* account_store;
+ const gchar* server_account_id;
+ gchar **username;
+ gchar **password;
+ gboolean *cancel;
+ gboolean *remember;
+} IdlePasswordRequest;
+
+static gboolean
+on_idle_request_password (gpointer user_data)
+{
+ gdk_threads_enter();
+
+ IdlePasswordRequest* info = (IdlePasswordRequest*)user_data;
+ g_signal_emit (G_OBJECT(info->account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0,
+ info->server_account_id, /* server_account_name */
+ info->username, info->password, info->cancel, info->remember);
+
+ if (info->loop)
+ g_main_loop_quit (info->loop);
+
+ gdk_threads_leave();
+
+ return FALSE; /* Don't call again. */
+}
+
+static void
+request_password_in_main_loop_and_wait (ModestTnyAccountStore *account_store,
+ const gchar* server_account_id,
+ gchar **username,
+ gchar **password,
+ gboolean *cancel,
+ gboolean *remember)
+{
+ IdlePasswordRequest *data = g_slice_new0 (IdlePasswordRequest);
+ data->account_store = account_store;
+ data->server_account_id = server_account_id;
+ data->username = username;
+ data->password = password;
+ data->cancel = cancel;
+ data->remember = remember;
+
+ data->loop = g_main_loop_new (NULL, FALSE /* not running */);
+
+ /* Cause the function to be run in an idle-handler, which is always
+ * in the main thread:
+ */
+ g_idle_add (&on_idle_request_password, data);
+
+ /* This main loop will run until the idle handler has stopped it: */
+ printf ("DEBUG: %s: before g_main_loop_run()\n", __FUNCTION__);
+ GDK_THREADS_LEAVE();
+ g_main_loop_run (data->loop);
+ GDK_THREADS_ENTER();
+ printf ("DEBUG: %s: after g_main_loop_run()\n", __FUNCTION__);
+ printf ("DEBUG: %s: Finished\n", __FUNCTION__);
+ g_main_loop_unref (data->loop);
+
+ g_slice_free (IdlePasswordRequest, data);
+}
+
/* This callback will be called by Tinymail when it needs the password
* from the user or the account settings.
* It can also call forget_password() before calling this,
account_store = TNY_ACCOUNT_STORE(get_account_store_for_account (account));
if (!server_account_name || !account_store) {
- g_warning ("%s: could not retrieve account_store for account %s",
+ g_warning ("modest: %s: could not retrieve account_store for account %s",
__FUNCTION__, server_account_name ? server_account_name : "<NULL>");
if (cancel)
*cancel = TRUE;
/* The password must be wrong, so show the account settings dialog so it can be corrected: */
- /* We show it in the main loop, because this function might no tbe in the main loop. */
+ /* We show it in the main loop, because this function might not be in the main loop. */
g_object_ref (account); /* unrefed in the idle handler. */
g_idle_add (on_idle_wrong_password, account);
gboolean remember = FALSE;
pwd = NULL;
- g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0,
- account_id, /* server_account_name */
+ if (already_asked) {
+ /* Show an info banner, before we show the protected password dialog: */
+ g_idle_add (on_idle_wrong_password_warning_only, NULL);
+ }
+
+ request_password_in_main_loop_and_wait (self, account_id,
&username, &pwd, cancel, &remember);
if (!*cancel) {
* but we need to tell tinymail about the username too: */
tny_account_set_user (account, username);
+ /* Do not save the password in gconf,
+ * because the UI spec says "The password will never be saved in the account": */
+ /*
if (remember) {
printf ("%s: Storing username=%s, password=%s\n",
__FUNCTION__, username, pwd);
modest_server_account_set_password (priv->account_mgr, server_account_name,
pwd);
}
+ */
+
/* We need to dup the string even knowing that
it's already a dup of the contents of an
entry, because it if it's wrong, then camel
*/
}
+static void
+destroy_password_hashtable (ModestTnyAccountStore *self)
+{
+ ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ g_free (priv->cache_dir);
+ priv->cache_dir = NULL;
+
+ if (priv->password_hash) {
+ g_hash_table_destroy (priv->password_hash);
+ priv->password_hash = NULL;
+ }
+}
static void
modest_tny_account_store_finalize (GObject *obj)
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;
- }
+ destroy_password_hashtable (self);
if (priv->account_mgr) {
g_object_unref (G_OBJECT(priv->account_mgr));
get_password,
forget_password);
if (tny_account) {
+ /* Forget any cached password for the account,
+ * so that we use a new account if any.
+ * TODO: Really we should do this in a more precise way in
+ * on_account_changed().
+ */
+ modest_tny_account_store_forget_password_in_memory (
+ MODEST_TNY_ACCOUNT_STORE (self),
+ tny_account_get_id (tny_account));
+
g_object_set_data (G_OBJECT(tny_account), "account_store",
(gpointer)self);
if (list)
* modest account: */
GSList *iter = list_specifics;
while (iter) {
+ /* The list alternates between the connection name and the transport name: */
/* const gchar* this_connection_name = (const gchar*)(iter->data); */
iter = g_slist_next (iter);
if (iter) {
tny_account = modest_tny_account_new_from_server_account_name (
priv->account_mgr, priv->session, transport_account_name);
if (tny_account) {
+ modest_tny_account_set_parent_modest_account_name_for_server_account (tny_account, account_name);
g_object_set_data (G_OBJECT(tny_account), "account_store",
(gpointer)self);
if (list)
if (!prompt)
return FALSE;
-#ifdef MODEST_PLATFORM_MAEMO
- /* The Tinymail documentation says that we should show Yes and No buttons,
- * when it is a question.
- * Obviously, we need tinymail to use more specific error codes instead,
- * so we know what buttons to show. */
- GtkWidget *dialog = NULL;
- if (question) {
- dialog = GTK_WIDGET (hildon_note_new_confirmation (NULL,
+ ModestWindow *main_window =
+ modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
+ gboolean retval = TRUE;
+ if (question) {
+ /* The Tinymail documentation says that we should show Yes and No buttons,
+ * when it is a question.
+ * Obviously, we need tinymail to use more specific error codes instead,
+ * so we know what buttons to show. */
+
+ /* TODO: Do this in the main context: */
+ GtkWidget *dialog = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (main_window),
prompt));
+ const int response = gtk_dialog_run (GTK_DIALOG (dialog));
+ if (question) {
+ retval = (response == GTK_RESPONSE_YES) ||
+ (response == GTK_RESPONSE_OK);
+ }
+
+ gtk_widget_destroy (dialog);
+
} else {
- dialog = GTK_WIDGET (hildon_note_new_information (NULL,
- prompt));
+ /* Just show the error text and use the default response: */
+ modest_maemo_show_information_note_in_main_context_and_forget (GTK_WINDOW (main_window),
+ prompt);
}
-#else
-
- GtkMessageType gtktype = GTK_MESSAGE_ERROR;
- switch (type)
- {
- case TNY_ALERT_TYPE_INFO:
- gtktype = GTK_MESSAGE_INFO;
- break;
- case TNY_ALERT_TYPE_WARNING:
- gtktype = GTK_MESSAGE_WARNING;
- break;
- case TNY_ALERT_TYPE_ERROR:
- default:
- gtktype = GTK_MESSAGE_ERROR;
- break;
- }
-
- GtkWidget *dialog = gtk_message_dialog_new (NULL, 0,
- gtktype, GTK_BUTTONS_YES_NO, prompt);
-#endif /* #ifdef MODEST_PLATFORM_MAEMO */
-
- gboolean retval = TRUE;
- const int response = gtk_dialog_run (GTK_DIALOG (dialog));
- if (question) {
- retval = (response == GTK_RESPONSE_YES) ||
- (response == GTK_RESPONSE_OK);
- }
-
- gtk_widget_destroy (dialog);
/* TODO: Don't free this when we no longer strdup the message for testers. */
g_free (prompt);
TnyAccount*
modest_tny_account_store_get_server_account (ModestTnyAccountStore *self,
- const gchar *account_name,
- TnyAccountType type)
+ const gchar *account_name,
+ TnyAccountType type)
{
+ ModestTnyAccountStorePrivate *priv = NULL;
TnyAccount *account = NULL;
- gchar *id = NULL;
- ModestTnyAccountStorePrivate *priv;
+ GSList *account_list = NULL;
+ gboolean found = FALSE;
g_return_val_if_fail (self, NULL);
g_return_val_if_fail (account_name, NULL);
- g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE || type == TNY_ACCOUNT_TYPE_TRANSPORT,
+ g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE ||
+ type == TNY_ACCOUNT_TYPE_TRANSPORT,
NULL);
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- /* Special case for the local account */
- if (!strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
- if(type == TNY_ACCOUNT_TYPE_STORE)
- id = g_strdup (MODEST_LOCAL_FOLDERS_ACCOUNT_ID);
- else {
- /* The local folders modest account has no transport server account. */
- return NULL;
- }
- } else {
- ModestAccountData *account_data;
- account_data = modest_account_mgr_get_account_data (priv->account_mgr, account_name);
- if (!account_data) {
- g_printerr ("modest: %s: cannot get account data for account '%s'\n", __FUNCTION__,
- account_name);
- return NULL;
- }
+ /* Make sure that the tny accounts have been created:
+ * TODO: We might want to do this in several places.
+ */
+ if (!priv->store_accounts || !priv->transport_accounts)
+ recreate_all_accounts (self);
- if (type == TNY_ACCOUNT_TYPE_STORE && account_data->store_account)
- id = g_strdup (account_data->store_account->account_name);
- else if (type == TNY_ACCOUNT_TYPE_TRANSPORT && account_data->transport_account)
- id = g_strdup (account_data->transport_account->account_name);
+ account_list = (type == TNY_ACCOUNT_TYPE_STORE) ?
+ priv->store_accounts :
+ priv->transport_accounts;
- modest_account_mgr_free_account_data (priv->account_mgr, account_data);
+ if (!account_list) {
+ g_printerr ("%s: No server accounts of type %s\n", __FUNCTION__,
+ (type == TNY_ACCOUNT_TYPE_STORE) ? "store" : "transport");
+ return NULL;
}
+
+ /* Look for the server account */
+ while (account_list && !found) {
+ const gchar *modest_acc_name;
- if (!id)
- g_printerr ("modest: could not get an id for account %s\n",
- account_name);
- else
- account = modest_tny_account_store_get_tny_account_by (self,
- MODEST_TNY_ACCOUNT_STORE_QUERY_ID, id);
+ account = TNY_ACCOUNT (account_list->data);
+ modest_acc_name =
+ modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+
+ if (!strcmp (account_name, modest_acc_name))
+ found = TRUE;
+ else
+ account_list = g_slist_next (account_list);
+ }
- if (!account)
- g_printerr ("modest: could not get tny %s account for %s (id=%s)\n",
- type == TNY_ACCOUNT_TYPE_STORE ? "store" : "transport",
- account_name, id ? id : "<none>");
- g_free (id);
+ if (!found) {
+ g_printerr ("modest: %s: could not get tny %s account for %s\n. Number of server accounts of this type=%d\n", __FUNCTION__,
+ (type == TNY_ACCOUNT_TYPE_STORE) ? "store" : "transport",
+ account_name, g_slist_length (account_list));
+ } else {
+ /* Pick a reference */
+ g_object_ref (account);
+ }
- return account;
+ return account;
}
static TnyAccount*