#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"
#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>
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: */
g_return_if_fail (account && TNY_IS_ACCOUNT(account));
txt = g_strdup_printf ("%s: %s", str ? str : "?", tny_account_get_name(account));
- modest_runtime_verify_object_last_ref(G_OBJECT(account),txt);
+ MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(G_OBJECT(account),txt);
g_free (txt);
}
g_object_unref (iter);
}
+#ifdef MODEST_PLATFORM_MAEMO
static void
on_account_settings_hide (GtkWidget *widget, gpointer user_data)
{
if (modest_account_name)
g_hash_table_remove (priv->account_settings_dialog_hash, modest_account_name);
}
+#endif
static void
show_password_warning_only ()
/* Show an explanatory temporary banner: */
if (main_window)
- hildon_banner_show_information (
- GTK_WIDGET(main_window), NULL, _("mcen_ib_username_pw_incorrect"));
+ modest_platform_information_banner (GTK_WIDGET(main_window), 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)
{
}
/* Show an explanatory temporary banner: */
- hildon_banner_show_information (GTK_WIDGET(dialog), NULL, _("mcen_ib_username_pw_incorrect"));
+ modest_platform_information_banner (GTK_WIDGET(dialog), NULL, _("mcen_ib_username_pw_incorrect"));
if (created_dialog) {
/* Forget it when it closes: */
account, 0);
/* Show it and delete it when it closes: */
- modest_maemo_show_dialog_and_forget (GTK_WINDOW (main_window), GTK_DIALOG (dialog));
+ 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,
gtk_window_present (GTK_WINDOW (dialog));
}
}
-
+#endif
static void
/* 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;
gpointer pwd_ptr = NULL;
gboolean already_asked = FALSE;
+ g_return_val_if_fail (account, NULL);
+
+ MODEST_DEBUG_BLOCK(
+ g_debug ("DEBUG: modest: %s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used);
+ );
+
/* Initialize the output parameter: */
if (cancel)
*cancel = FALSE;
server_account_name,
NULL,
(gpointer*)&pwd_ptr);
-
- printf ("DEBUG: modest: %s: Already asked = %d\n", __FUNCTION__, already_asked);
-
+ MODEST_DEBUG_BLOCK(
+ g_debug ("DEBUG: modest: %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,
*/
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);
+ MODEST_DEBUG_BLOCK(
+ 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: */
+#ifdef MODEST_PLATFORM_MAEMO
show_wrong_password_dialog (account);
+#endif
if (cancel)
*cancel = TRUE;
username = NULL;
} else
if (cancel)
- *cancel = FALSE;
-
- /* printf(" DEBUG: %s: returning %s\n", __FUNCTION__, pwd); */
-
+ *cancel = FALSE;
return pwd;
}
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);
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);
}
insert_account (MODEST_TNY_ACCOUNT_STORE (user_data), account, TRUE);
}
+/* 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);
+
+ 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 it from the list of accounts */
+ if (TNY_IS_STORE_ACCOUNT (account))
+ tny_list_remove (priv->store_accounts, (GObject *) account);
+ else
+ tny_list_remove (priv->transport_accounts, (GObject *) account);
+
+ /* Notify the observers */
+ g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL],
+ 0, account);
+
+ /* Unref the extra reference added by get_server_account */
+ g_object_unref (account);
+}
+
static void
on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account,
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);
/* 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 */
- g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, store_account);
- account_disconnect (store_account); /* disconnect the account */
- g_object_unref (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 ("Removing a transport account that has no outbox");
}
- /* Notify the observers */
- g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, transport_account);
- account_disconnect (transport_account); /* disconnect the account */
- g_object_unref (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);
} else {
g_warning ("There is no transport account for account %s\n", account);
}
projects / modest / blobdiff