#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-tny-account-store.h"
#include "modest-tny-platform-factory.h"
TnySessionCamel *session;
TnyDevice *device;
- gulong acc_inserted_handler;
- gulong acc_changed_handler;
- gulong acc_removed_handler;
- gulong volume_mounted_handler;
- gulong volume_unmounted_handler;
+ GSList *sighandlers;
/* We cache the lists of accounts here */
TnyList *store_accounts;
TnyList *transport_accounts;
TnyList *store_accounts_outboxes;
-
+
/* Matches transport accounts and outbox folder */
GHashTable *outbox_of_transport;
};
priv->account_mgr = NULL;
priv->session = NULL;
priv->device = NULL;
+ priv->sighandlers = NULL;
priv->outbox_of_transport = g_hash_table_new_full (g_direct_hash,
g_direct_equal,
/* This is a singleton, so it does not need to be unrefed. */
monitor = gnome_vfs_get_volume_monitor();
- priv->volume_mounted_handler = g_signal_connect (G_OBJECT(monitor),
- "volume-mounted",
- G_CALLBACK(on_vfs_volume_mounted),
- obj);
-
- priv->volume_unmounted_handler = g_signal_connect (G_OBJECT(monitor), "volume-unmounted",
- G_CALLBACK(on_vfs_volume_unmounted),
- obj);
+ 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 */
}
}
-
-static gboolean
-update_tny_account_for_account (ModestTnyAccountStore *self, ModestAccountMgr *acc_mgr,
- const gchar *account_name, TnyAccountType type)
+static void
+on_account_changed (ModestAccountMgr *acc_mgr,
+ const gchar *account_name,
+ TnyAccountType account_type,
+ gpointer user_data)
{
+ ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
ModestTnyAccountStorePrivate *priv;
TnyList* account_list;
gboolean found = FALSE;
TnyIterator *iter = NULL;
- g_return_val_if_fail (self, FALSE);
- g_return_val_if_fail (account_name, FALSE);
- g_return_val_if_fail (type == TNY_ACCOUNT_TYPE_STORE ||
- type == TNY_ACCOUNT_TYPE_TRANSPORT,
- FALSE);
-
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
- account_list = (type == TNY_ACCOUNT_TYPE_STORE ? priv->store_accounts : priv->transport_accounts);
+ 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_account = TNY_ACCOUNT (tny_iterator_get_current (iter));
if (tny_account) {
- const gchar* parent_name =
- modest_tny_account_get_parent_modest_account_name_for_server_account (tny_account);
- if (parent_name && strcmp (parent_name, account_name) == 0) {
- found = TRUE;
- modest_tny_account_update_from_account (tny_account, acc_mgr, account_name, type);
- g_signal_emit (G_OBJECT(self), signals[ACCOUNT_CHANGED_SIGNAL], 0, 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);
+ }
}
g_object_unref (tny_account);
}
if (iter)
g_object_unref (iter);
-
- return found;
-}
-
-
-static void
-on_account_changed (ModestAccountMgr *acc_mgr,
- const gchar *account_name,
- gpointer user_data)
-{
- ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(user_data);
-
- g_debug ("DEBUG: modest: %s\n", __FUNCTION__);
-
- /* Ignore the change if it's a change in the last_updated value */
-// if (key && g_str_has_suffix ((const gchar *) key, MODEST_ACCOUNT_LAST_UPDATED))
-// return;
-
- if (!update_tny_account_for_account (self, acc_mgr, account_name, TNY_ACCOUNT_TYPE_STORE))
- g_warning ("%s: failed to update store account for %s", __FUNCTION__, account_name);
- if (!update_tny_account_for_account (self, acc_mgr, account_name, TNY_ACCOUNT_TYPE_TRANSPORT))
- g_warning ("%s: failed to update transport account for %s", __FUNCTION__, account_name);
}
static void
/* If the password is not already there, try ModestConf */
if (!already_asked) {
- pwd = modest_server_account_get_password (priv->account_mgr,
- server_account_name);
+ pwd = modest_account_mgr_get_server_account_password (priv->account_mgr,
+ server_account_name);
g_hash_table_insert (priv->password_hash, g_strdup (server_account_name), g_strdup (pwd));
}
* then show a banner and the account settings dialog so it can be corrected:
*/
const gboolean settings_have_password =
- modest_server_account_get_has_password (priv->account_mgr, server_account_name);
+ 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);
if (settings_have_password) {
/* The password must be wrong, so show the account settings dialog so it can be corrected: */
* 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_username (priv->account_mgr, server_account_name,
- username);
- modest_server_account_set_password (priv->account_mgr, server_account_name,
- pwd);
- }
- */
+ /* Do not save the password in gconf, because
+ * the UI spec says "The password will never
+ * be saved in the account": */
/* We need to dup the string even knowing that
it's already a dup of the contents of an
return pwd;
}
+void
+modest_tny_account_store_forget_already_asked (ModestTnyAccountStore *self, TnyAccount *account)
+{
+ g_return_if_fail (account);
+
+ ModestTnyAccountStorePrivate *priv;
+ gchar *pwd = NULL;
+ gpointer pwd_ptr = NULL;
+ gboolean already_asked = FALSE;
+
+ const gchar *server_account_name = tny_account_get_id (account);
+
+ priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+ /* This hash map stores passwords, including passwords that are not stored in gconf. */
+ pwd_ptr = (gpointer)&pwd; /* pwd_ptr so the compiler does not complained about
+ * type-punned ptrs...*/
+ already_asked = priv->password_hash &&
+ g_hash_table_lookup_extended (priv->password_hash,
+ server_account_name,
+ NULL,
+ (gpointer*)&pwd_ptr);
+
+ if (already_asked) {
+ g_hash_table_remove (priv->password_hash, server_account_name);
+ g_free (pwd);
+ pwd = NULL;
+ }
+
+ return;
+}
+
/* tinymail calls this if the connection failed due to an incorrect password.
* And it seems to call this for any general connection failure. */
static void
static void
modest_tny_account_store_finalize (GObject *obj)
{
- GnomeVFSVolumeMonitor *volume_monitor;
ModestTnyAccountStore *self = MODEST_TNY_ACCOUNT_STORE(obj);
ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
priv->outbox_of_transport = NULL;
}
-
- /* Disconnect VFS signals */
- volume_monitor = gnome_vfs_get_volume_monitor ();
- if (g_signal_handler_is_connected (volume_monitor,
- priv->volume_mounted_handler))
- g_signal_handler_disconnect (volume_monitor,
- priv->volume_mounted_handler);
- if (g_signal_handler_is_connected (volume_monitor,
- priv->volume_unmounted_handler))
- g_signal_handler_disconnect (volume_monitor,
- priv->volume_unmounted_handler);
+ modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers);
+ priv->sighandlers = NULL;
if (priv->account_mgr) {
- /* Disconnect signals */
- if (g_signal_handler_is_connected (priv->account_mgr,
- priv->acc_inserted_handler))
- g_signal_handler_disconnect (priv->account_mgr,
- priv->acc_inserted_handler);
- if (g_signal_handler_is_connected (priv->account_mgr,
- priv->acc_changed_handler))
- g_signal_handler_disconnect (priv->account_mgr,
- priv->acc_changed_handler);
- if (g_signal_handler_is_connected (priv->account_mgr,
- priv->acc_removed_handler))
- g_signal_handler_disconnect (priv->account_mgr,
- priv->acc_removed_handler);
-
g_object_unref (G_OBJECT(priv->account_mgr));
priv->account_mgr = NULL;
}
/* Set the ui locker */
tny_session_camel_set_ui_locker (priv->session, tny_gtk_lockable_new ());
-
+
/* Connect signals */
- priv->acc_inserted_handler = g_signal_connect (G_OBJECT(account_mgr), "account_inserted",
- G_CALLBACK (on_account_inserted), obj);
- priv->acc_changed_handler = g_signal_connect (G_OBJECT(account_mgr), "account_changed",
- G_CALLBACK (on_account_changed), obj);
- priv->acc_removed_handler = g_signal_connect (G_OBJECT(account_mgr), "account_removed",
- G_CALLBACK (on_account_removed), obj);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT(account_mgr), "account_inserted",
+ G_CALLBACK (on_account_inserted), obj);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT(account_mgr), "account_changed",
+ G_CALLBACK (on_account_changed), obj);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT(account_mgr), "account_removed",
+ G_CALLBACK (on_account_removed), obj);
/* Create the lists of accounts */
priv->store_accounts = tny_simple_list_new ();
projects / modest / blobdiff