#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>
#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;
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);
-
+
+#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: */
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);
+ 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)
{
if (modest_account_name)
g_hash_table_remove (priv->account_settings_dialog_hash, modest_account_name);
}
+#endif
static void
show_password_warning_only ()
g_warning ("%s: %s", __FUNCTION__, _("mcen_ib_username_pw_incorrect"));
}
-
+#ifdef MODEST_PLATFORM_MAEMO
static void
show_wrong_password_dialog (TnyAccount *account)
{
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);
-}
+#endif
/* This callback will be called by Tinymail when it needs the password
* from the user or the account settings.
);
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;
/* Show an info banner, before we show the protected password dialog: */
show_password_warning_only();
}
-
- request_password_and_wait (self, account_id,
+
+ /* Request password */
+ g_signal_emit (G_OBJECT(account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0,
+ account_id, /* server_account_name */
&username, &pwd, cancel, &remember);
+
if (!*cancel) {
/* The password will be returned as the result,
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);
g_return_val_if_fail (self, NULL);
-#ifdef MODEST_PLATFORM_MAEMO
- g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device));
+#ifdef MODEST_HAVE_CONIC
+ g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE (device), NULL);
+
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); */
return account;
#else
return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */
-#endif /* MODEST_PLATFORM_MAEMO */
+#endif /* MODEST_HAVE_CONIC */
}
/* 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);
-
+ if (tny_list_get_length (folders) != 1) {
+ g_warning ("%s: > 1 outbox found (%d)?!", __FUNCTION__,
+ tny_list_get_length (folders));
+ }
+
iter_folders = tny_list_create_iterator (folders);
per_account_outbox = TNY_FOLDER (tny_iterator_get_current (iter_folders));
g_object_unref (iter_folders);
/* 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);
+ 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);
+ 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));
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