X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=ac77bfc87fe95f537f1cda5cde3c05983cdbf2b7;hp=74f077aa4dfca36a7f8267c63120e21e95b68dcd;hb=518e2f866b4ddaa35443cef48c874a358be0851f;hpb=dafea483f88610df876ce06b513440d3b70be4c8 diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 74f077a..ac77bfc 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -30,10 +30,10 @@ #include #include +#include #include #include #include -#include #include #include #include @@ -50,9 +50,8 @@ #include #include #include -#include -#include - +#include +#include #include "modest-tny-account-store.h" #include "modest-tny-platform-factory.h" @@ -62,6 +61,8 @@ #ifdef MODEST_PLATFORM_MAEMO #include +#include +#include #endif #include @@ -120,22 +121,20 @@ typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate; 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; - 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; }; @@ -217,15 +216,6 @@ modest_tny_account_store_base_init (gpointer g_class) 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", @@ -267,12 +257,12 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) 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, - NULL, - NULL); + priv->outbox_of_transport = g_hash_table_new_full (g_direct_hash, + g_direct_equal, + NULL, + NULL); /* An in-memory store of passwords, * for passwords that are not remembered in the configuration, @@ -280,42 +270,61 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) */ 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: */ /* 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->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); +} - priv->volume_unmounted_handler = g_signal_connect (G_OBJECT(monitor), "volume-unmounted", - G_CALLBACK(on_vfs_volume_unmounted), - obj); +/* disconnect the list of TnyAccounts */ +static void +account_disconnect (TnyAccount *account) +{ + g_return_if_fail (account && TNY_IS_ACCOUNT(account)); + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(account), FALSE, NULL, NULL); } + /* disconnect the list of TnyAccounts */ static void -foreach_account_disconnect (gpointer data, - gpointer user_data) +account_verify_last_ref (TnyAccount *account, const gchar *str) { - tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(data), FALSE, NULL); + gchar *txt; + + g_return_if_fail (account && TNY_IS_ACCOUNT(account)); + + txt = g_strdup_printf ("%s: %s", str ? str : "?", tny_account_get_name(account)); + MODEST_DEBUG_VERIFY_OBJECT_LAST_REF(G_OBJECT(account),txt); + g_free (txt); } + + static void foreach_account_append_to_list (gpointer data, gpointer user_data) { TnyList *list; - + list = TNY_LIST (user_data); tny_list_append (list, G_OBJECT (data)); } @@ -408,7 +417,7 @@ on_vfs_volume_unmounted(GnomeVFSVolumeMonitor *volume_monitor, if (found) { /* Remove from the list */ tny_list_remove (priv->store_accounts, G_OBJECT (mmc_account)); - + /* Notify observers */ g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], @@ -442,35 +451,31 @@ modest_tny_account_store_forget_password_in_memory (ModestTnyAccountStore *self, } } - -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) { + if (!strcmp (tny_account_get_id (tny_account), account_name)) { found = TRUE; - modest_tny_account_update_from_account (tny_account, acc_mgr, account_name, type); + 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); @@ -480,30 +485,9 @@ update_tny_account_for_account (ModestTnyAccountStore *self, ModestAccountMgr *a 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); } +#ifdef MODEST_PLATFORM_MAEMO static void on_account_settings_hide (GtkWidget *widget, gpointer user_data) { @@ -518,27 +502,40 @@ 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 () { ModestWindow *main_window = - modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); - + modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); /* don't create */ + /* Show an explanatory temporary banner: */ - hildon_banner_show_information ( - GTK_WIDGET(main_window), NULL, _("mcen_ib_username_pw_incorrect")); + if (main_window) + 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) { /* 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); + ModestWindow *main_window; + const gchar *modest_account_name; + + main_window = 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; + } + + modest_account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); if (!modest_account_name) { g_warning ("%s: modest_tny_account_get_parent_modest_account_name_for_server_account() failed.\n", __FUNCTION__); @@ -555,14 +552,15 @@ show_wrong_password_dialog (TnyAccount *account) } ModestAccountSettingsDialog *dialog = dialog_as_gpointer; - ModestWindow *main_window = - modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); - gboolean created_dialog = FALSE; if (!found || !dialog) { + ModestAccountSettings *settings; dialog = modest_account_settings_dialog_new (); - modest_account_settings_dialog_set_account_name (dialog, modest_account_name); + settings = modest_account_mgr_load_account_settings (priv->account_mgr, modest_account_name); + modest_account_settings_dialog_set_account (dialog, settings); + g_object_unref (settings); 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); @@ -570,8 +568,7 @@ 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: */ @@ -579,7 +576,12 @@ show_wrong_password_dialog (TnyAccount *account) 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, @@ -587,21 +589,7 @@ 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. @@ -614,12 +602,7 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc /* 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; @@ -628,6 +611,12 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc gpointer pwd_ptr = NULL; gboolean already_asked = FALSE; + g_return_val_if_fail (account, NULL); + + MODEST_DEBUG_BLOCK( + g_debug ("%s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used); + ); + /* Initialize the output parameter: */ if (cancel) *cancel = FALSE; @@ -657,13 +646,14 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc server_account_name, NULL, (gpointer*)&pwd_ptr); - - printf ("DEBUG: modest: %s: Already asked = %d\n", __FUNCTION__, already_asked); - + MODEST_DEBUG_BLOCK( + g_debug ("%s: Already asked = %d\n", __FUNCTION__, already_asked); + ); + /* 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)); } @@ -674,11 +664,16 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc * 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); - printf ("DEBUG: modest: %s: settings_have_password=%d\n", __FUNCTION__, settings_have_password); + modest_account_mgr_get_server_account_has_password (priv->account_mgr, server_account_name); + MODEST_DEBUG_BLOCK( + 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; @@ -695,27 +690,21 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc /* 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, * 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 @@ -732,19 +721,48 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc g_free (username); username = NULL; } else - *cancel = FALSE; - - /* printf(" DEBUG: %s: returning %s\n", __FUNCTION__, pwd); */ - + if (cancel) + *cancel = FALSE; 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 forget_password (TnyAccount *account) { - printf ("DEBUG: %s\n", __FUNCTION__); ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; const TnyAccountStore *account_store; @@ -775,7 +793,6 @@ forget_password (TnyAccount *account) 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); @@ -787,43 +804,22 @@ modest_tny_account_store_finalize (GObject *obj) 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); 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; } @@ -835,13 +831,15 @@ modest_tny_account_store_finalize (GObject *obj) /* Destroy all accounts. Disconnect all accounts before they are destroyed */ if (priv->store_accounts) { - tny_list_foreach (priv->store_accounts, foreach_account_disconnect, NULL); + tny_list_foreach (priv->store_accounts, (GFunc)account_disconnect, NULL); + tny_list_foreach (priv->store_accounts, (GFunc)account_verify_last_ref, "store"); g_object_unref (priv->store_accounts); priv->store_accounts = NULL; } - + if (priv->transport_accounts) { - tny_list_foreach (priv->transport_accounts, foreach_account_disconnect, NULL); + tny_list_foreach (priv->transport_accounts, (GFunc)account_disconnect, NULL); + tny_list_foreach (priv->transport_accounts, (GFunc)account_verify_last_ref, "transport"); g_object_unref (priv->transport_accounts); priv->transport_accounts = NULL; } @@ -938,14 +936,17 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, /* 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 (); @@ -963,8 +964,16 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, global OUTBOX hosted in the local account */ add_existing_accounts (MODEST_TNY_ACCOUNT_STORE (obj)); - - /* Create the memory card account if the card is mounted: */ + /* FIXME: I'm doing this (adding an "if (FALSE)"because this + stuff is not working properly and could cause SIGSEVs, for + example one send queue will be created for each connection + specific SMTP server, so when tinymail asks for the outbox + it will return NULL because there is no outbox folder for + this specific transport accounts, and it's a must that the + send queue returns an outbox */ + if (TRUE) + /* Add connection-specific transport accounts */ + add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE(obj)); /* This is a singleton, so it does not need to be unrefed. */ if (volume_path_is_mounted (MODEST_MCC1_VOLUMEPATH)) { @@ -1031,8 +1040,8 @@ modest_tny_account_store_get_device (TnyAccountStore *self) g_return_val_if_fail (self, NULL); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - - if (priv->device) + + if (priv->device) return g_object_ref (G_OBJECT(priv->device)); else return NULL; @@ -1049,37 +1058,25 @@ modest_tny_account_store_find_account_by_url (TnyAccountStore *self, const gchar -static void -log_alert_error (const GError *err) -{ - if (err) - g_warning ("%s: %d, message=%s", __FUNCTION__, err->domain, err->message); -} - - static gboolean -modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, TnyAlertType type, - gboolean question, const GError *error) +modest_tny_account_store_alert (TnyAccountStore *self, + TnyAccount *account, + TnyAlertType type, + gboolean question, + GError *error) { ModestTransportStoreProtocol proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN; const gchar* server_name = NULL; gchar *prompt = NULL; gboolean retval; - + + + g_return_val_if_fail (account, FALSE); g_return_val_if_fail (error, FALSE); - log_alert_error (error); - - if ((error->domain != TNY_ACCOUNT_ERROR) && (error->domain != TNY_ACCOUNT_STORE_ERROR)) - return FALSE; /* Get the server name: */ - if (account && TNY_IS_ACCOUNT (account)) - server_name = tny_account_get_hostname (account); - if (!server_name) { - g_warning ("%s: cannot get server name", __FUNCTION__); - return FALSE; - } + server_name = tny_account_get_hostname (account); if (account) { const gchar *proto_name = tny_account_get_proto (account); @@ -1093,14 +1090,18 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, TnyA } 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: + 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: /* TODO: Show the appropriate message, depending on whether it's POP or IMAP: */ switch (proto) { case MODEST_PROTOCOL_STORE_POP: @@ -1116,66 +1117,38 @@ modest_tny_account_store_alert (TnyAccountStore *self, TnyAccount *account, TnyA server_name); break; default: - g_warning ("%s: should not be reached (%d)", __FUNCTION__, proto); - return FALSE; + g_return_val_if_reached (FALSE); } break; - case TNY_ACCOUNT_ERROR_TRY_CONNECT_AUTHENTICATION_NOT_SUPPORTED: + case TNY_SERVICE_ERROR_AUTHENTICATE: /* This is "Secure connection failed", even though the logical * ID has _certificate_ in the name: */ prompt = g_strdup (_("mail_ni_ssl_certificate_error")); break; - case TNY_ACCOUNT_ERROR_TRY_CONNECT_CERTIFICATE: - /* TODO: This needs a logical ID and/or some specified way to ask the - * different certificate questions: */ - prompt = g_strdup_printf( - _("Certificate Problem:\n%s"), - error->message); + 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: - /* This debug output is useful. Please keep it uncommented until - * we have fixed the problems in this function: */ - g_debug ("%s: %d, message=%s",__FUNCTION__, - error->domain, error->message); - - /* TODO: Remove the internal error message for the real release. - * This is just so the testers can give us more information: */ - /* However, I haven't seen this for a few weeks, so maybe the users - * will never see it. murrayc. */ - /* prompt = _("Modest account not yet fully configured."); */ - prompt = g_strdup_printf( - "%s\n (Internal error message, often very misleading):\n%s", - _("Incorrect Account Settings"), - error->message); - - /* Note: If the password was wrong then get_password() would be called again, - * instead of this vfunc being called. */ - break; - + + case TNY_SYSTEM_ERROR_MEMORY: + /* Can't allocate memory for this operation */ + + case TNY_SERVICE_ERROR_UNKNOWN: + return FALSE; default: - g_warning ("%s: Unhandled GError code: %d, message=%s", - __FUNCTION__, error->code, error->message); - prompt = NULL; - break; + g_return_val_if_reached (FALSE); } - if (!prompt) - return FALSE; + + if (error->code == TNY_SERVICE_ERROR_CERTIFICATE) + retval = modest_platform_run_certificate_confirmation_dialog (server_name, + error->message); else retval = modest_platform_run_alert_dialog (prompt, question); - g_free (prompt); + if (prompt) + g_free (prompt); return retval; } @@ -1190,15 +1163,15 @@ modest_tny_account_store_init (gpointer g, gpointer iface_data) 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; } @@ -1226,12 +1199,25 @@ get_tny_account_by (TnyList *accounts, 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); @@ -1246,7 +1232,7 @@ get_tny_account_by (TnyList *accounts, 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; } @@ -1297,6 +1283,7 @@ modest_tny_account_store_get_tny_account_by (ModestTnyAccountStore *self, return account; } + TnyAccount* modest_tny_account_store_get_server_account (ModestTnyAccountStore *self, const gchar *account_name, @@ -1337,7 +1324,7 @@ modest_tny_account_store_get_server_account (ModestTnyAccountStore *self, 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); } @@ -1345,6 +1332,7 @@ modest_tny_account_store_get_server_account (ModestTnyAccountStore *self, 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." \ @@ -1357,21 +1345,24 @@ modest_tny_account_store_get_server_account (ModestTnyAccountStore *self, return retval; } -static TnyAccount* -get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore *self, - const gchar *account_name) +TnyAccount* +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 (!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); -#ifdef MODEST_PLATFORM_MAEMO - g_assert (TNY_IS_MAEMO_CONIC_DEVICE (device)); 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); */ @@ -1382,9 +1373,9 @@ get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore * 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: */ @@ -1396,7 +1387,7 @@ get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore * } 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) { @@ -1416,7 +1407,7 @@ get_smtp_specific_transport_account_for_open_connection (ModestTnyAccountStore * return account; #else return NULL; /* TODO: Implement this for GNOME, instead of just Maemo? */ -#endif /* MODEST_PLATFORM_MAEMO */ +#endif /* MODEST_HAVE_CONIC */ } @@ -1433,7 +1424,7 @@ modest_tny_account_store_get_transport_account_for_open_connection (ModestTnyAcc /* Get the connection-specific transport acccount, if any: */ /* Note: This gives us a reference: */ TnyAccount *account = - get_smtp_specific_transport_account_for_open_connection (self, account_name); + modest_tny_account_store_get_smtp_specific_transport_account_for_open_connection (self, account_name); /* If there is no connection-specific transport account (the common case), * just get the regular transport account: */ @@ -1483,6 +1474,16 @@ modest_tny_account_store_get_local_folders_account (ModestTnyAccountStore *self) return account; } +TnyAccount* +modest_tny_account_store_get_mmc_folders_account (ModestTnyAccountStore *self) +{ + g_return_val_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (self), NULL); + + return modest_tny_account_store_get_tny_account_by (self, MODEST_TNY_ACCOUNT_STORE_QUERY_ID, + MODEST_MMC_ACCOUNT_ID); + +} + /*********************************************************************************/ static void add_existing_accounts (ModestTnyAccountStore *self) @@ -1535,6 +1536,56 @@ create_tny_account (ModestTnyAccountStore *self, return account; } + +static void +add_outbox_from_transport_account_to_global_outbox (ModestTnyAccountStore *self, + const gchar *account_name, + TnyAccount *transport_account) +{ + TnyList *folders = NULL; + TnyIterator *iter_folders = NULL; + TnyAccount *local_account = NULL, *account_outbox = NULL; + TnyFolder *per_account_outbox = NULL; + ModestTnyAccountStorePrivate *priv = NULL; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + /* Create per account local outbox */ + account_outbox = + modest_tny_account_new_for_per_account_local_outbox_folder (priv->account_mgr, + account_name, + priv->session); + tny_list_append (priv->store_accounts_outboxes, G_OBJECT (account_outbox)); + + /* Get the outbox folder */ + folders = tny_simple_list_new (); + tny_folder_store_get_folders (TNY_FOLDER_STORE (account_outbox), folders, NULL, NULL); + 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); + g_object_unref (folders); + g_object_unref (account_outbox); + + /* Add the outbox of the new per-account-local-outbox account + to the global local merged OUTBOX of the local folders + account */ + local_account = modest_tny_account_store_get_local_folders_account (self); + modest_tny_local_folders_account_add_folder_to_outbox (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (local_account), + per_account_outbox); + /* Add the pair to the hash table */ + g_hash_table_insert (priv->outbox_of_transport, + transport_account, + per_account_outbox); + + g_object_unref (local_account); + g_object_unref (per_account_outbox); +} + /* * This function will be used for both adding new accounts and for the * initialization. In the initialization we do not want to emit @@ -1553,74 +1604,45 @@ insert_account (ModestTnyAccountStore *self, /* 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; + } - /* Add to the list, and notify the observers */ - if (store_account) { - tny_list_append (priv->store_accounts, G_OBJECT (store_account)); - if (notify) - g_signal_emit (G_OBJECT (self), signals [ACCOUNT_INSERTED_SIGNAL], 0, store_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 to the list, and notify the observers */ - if (transport_account) { - TnyAccount *account_outbox = NULL, *local_account = NULL; - TnyFolder *per_account_outbox = NULL; - TnyList *folders; - TnyIterator *iter_folders; - - /* Add account to the list */ - tny_list_append (priv->transport_accounts, G_OBJECT (transport_account)); - g_assert (TNY_IS_ACCOUNT (transport_account)); - - /* Add connection-specific transport accounts */ - add_connection_specific_transport_accounts (self); - - /* Create per account local outbox */ - account_outbox = - modest_tny_account_new_for_per_account_local_outbox_folder (priv->account_mgr, - account, - priv->session); - tny_list_append (priv->store_accounts_outboxes, G_OBJECT (account_outbox)); - - /* Get the outbox folder */ - folders = tny_simple_list_new (); - tny_folder_store_get_folders (TNY_FOLDER_STORE (account_outbox), - folders, NULL, NULL); - if (tny_list_get_length (folders) != 1) - g_warning ("%s: there should be only one outbox folder, but found %d!", - __FUNCTION__, tny_list_get_length (folders)); + /* Add accounts to the lists */ + tny_list_append (priv->store_accounts, G_OBJECT (store_account)); + tny_list_append (priv->transport_accounts, G_OBJECT (transport_account)); + + /* Create a new pseudo-account with an outbox for this + transport account and add it to the global outbox + in the local account */ + add_outbox_from_transport_account_to_global_outbox (self, account, transport_account); + + /* Notify the observers. We do it after everything is + created */ + if (notify) { + TnyAccount *local_account = NULL; - iter_folders = tny_list_create_iterator (folders); - per_account_outbox = TNY_FOLDER (tny_iterator_get_current (iter_folders)); - g_object_unref (iter_folders); - g_object_unref (folders); - g_object_unref (account_outbox); - - /* Add the outbox of the new per-account-local-outbox - account to the global local merged OUTBOX of the - local folders account */ - local_account = modest_tny_account_store_get_local_folders_account (MODEST_TNY_ACCOUNT_STORE (self)); - modest_tny_local_folders_account_add_folder_to_outbox (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (local_account), - per_account_outbox); - /* Add the pair to the hash table */ - g_hash_table_insert (priv->outbox_of_transport, - transport_account, - per_account_outbox); - - /* Notify that the local folders account chaned */ - if (notify) - g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account); + /* Notify the observers about the new server & transport accounts */ + g_signal_emit (G_OBJECT (self), signals [ACCOUNT_INSERTED_SIGNAL], 0, store_account); + g_signal_emit (G_OBJECT (self), signals [ACCOUNT_INSERTED_SIGNAL], 0, transport_account); + /* Notify that the local account changed */ + local_account = modest_tny_account_store_get_local_folders_account (self); + g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account); g_object_unref (local_account); - g_object_unref (per_account_outbox); - - /* Notify the observers */ - if (notify) - g_signal_emit (G_OBJECT (self), signals [ACCOUNT_INSERTED_SIGNAL], 0, transport_account); - g_object_unref (transport_account); } + + /* Frees */ + g_object_unref (store_account); + g_object_unref (transport_account); } static void @@ -1632,29 +1654,64 @@ on_account_inserted (ModestAccountMgr *acc_mgr, 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); + + /* 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); + + /* 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, 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); transport_account = modest_tny_account_store_get_server_account (self, account, TNY_ACCOUNT_TYPE_TRANSPORT); - + /* 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); - 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); } @@ -1683,14 +1740,48 @@ on_account_removed (ModestAccountMgr *acc_mgr, 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); - 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); } } +TnyTransportAccount * +modest_tny_account_store_new_connection_specific_transport_account (ModestTnyAccountStore *self, + const gchar *name) +{ + ModestTnyAccountStorePrivate *priv = NULL; + TnyAccount * tny_account = NULL; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + /* Add the account: */ + tny_account = + modest_tny_account_new_from_server_account_name (priv->account_mgr, + priv->session, + name, + get_password, + forget_password); + if (tny_account) { + g_object_set_data (G_OBJECT(tny_account), + "account_store", + (gpointer)self); + + tny_list_append (priv->transport_accounts, G_OBJECT (tny_account)); + add_outbox_from_transport_account_to_global_outbox (self, + name, + tny_account); + + } else + g_printerr ("modest: failed to create smtp-specific account for %s\n", + name); + + return TNY_TRANSPORT_ACCOUNT (tny_account); +} + + static void add_connection_specific_transport_accounts (ModestTnyAccountStore *self) { @@ -1703,8 +1794,8 @@ add_connection_specific_transport_accounts (ModestTnyAccountStore *self) GError *err = NULL; list_specifics = modest_conf_get_list (conf, - MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, - MODEST_CONF_VALUE_STRING, &err); + MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, + MODEST_CONF_VALUE_STRING, &err); if (err) { g_printerr ("modest: %s: error getting list: %s\n.", __FUNCTION__, err->message); g_error_free (err); @@ -1719,25 +1810,90 @@ add_connection_specific_transport_accounts (ModestTnyAccountStore *self) iter = g_slist_next (iter); if (iter) { const gchar* transport_account_name = (const gchar*) (iter->data); - if (transport_account_name) { - TnyAccount * tny_account = NULL; - /* Add the account: */ - tny_account = - modest_tny_account_new_from_server_account_name (priv->account_mgr, - priv->session, - transport_account_name); - if (tny_account) { - g_object_set_data (G_OBJECT(tny_account), - "account_store", - (gpointer)self); - - tny_list_append (priv->transport_accounts, G_OBJECT (tny_account)); - g_object_unref (tny_account); - } else - g_printerr ("modest: failed to create smtp-specific account for %s\n", - transport_account_name); - } + TnyTransportAccount * account = NULL; + account = modest_tny_account_store_new_connection_specific_transport_account ( + self, transport_account_name); + if (account) + g_object_unref (account); } iter = g_slist_next (iter); } } + +TnyMsg * +modest_tny_account_store_find_msg_in_outboxes (ModestTnyAccountStore *self, + const gchar *uri, + TnyAccount **ac_out) +{ + TnyIterator *acc_iter; + ModestTnyAccountStorePrivate *priv; + TnyMsg *msg = NULL; + TnyAccount *msg_account = NULL; + + g_return_val_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (self), NULL); + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + + acc_iter = tny_list_create_iterator (priv->store_accounts_outboxes); + while (!msg && !tny_iterator_is_done (acc_iter)) { + TnyList *folders = tny_simple_list_new (); + TnyAccount *account = TNY_ACCOUNT (tny_iterator_get_current (acc_iter)); + TnyIterator *folders_iter = NULL; + + tny_folder_store_get_folders (TNY_FOLDER_STORE (account), folders, NULL, NULL); + folders_iter = tny_list_create_iterator (folders); + + while (msg == NULL && !tny_iterator_is_done (folders_iter)) { + TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (folders_iter)); + msg = tny_folder_find_msg (folder, uri, NULL); + + if (msg) + msg_account = g_object_ref (account); + + g_object_unref (folder); + tny_iterator_next (folders_iter); + } + g_object_unref (folders_iter); + + g_object_unref (folders); + g_object_unref (account); + tny_iterator_next (acc_iter); + } + + g_object_unref (acc_iter); + + if (ac_out != NULL) + *ac_out = msg_account; + + return msg; +} + +TnyTransportAccount * +modest_tny_account_store_get_transport_account_from_outbox_header(ModestTnyAccountStore *self, TnyHeader *header) +{ + TnyIterator *acc_iter; + ModestTnyAccountStorePrivate *priv; + TnyTransportAccount *header_acc = NULL; + const gchar *msg_id; + + g_return_val_if_fail (MODEST_IS_TNY_ACCOUNT_STORE (self), NULL); + g_return_val_if_fail (TNY_IS_HEADER (header), NULL); + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + + msg_id = modest_tny_send_queue_get_msg_id (header); + acc_iter = tny_list_create_iterator (priv->transport_accounts); + while (!header_acc && !tny_iterator_is_done (acc_iter)) { + TnyTransportAccount *account = TNY_TRANSPORT_ACCOUNT (tny_iterator_get_current (acc_iter)); + ModestTnySendQueue *send_queue; + ModestTnySendQueueStatus status; + send_queue = modest_runtime_get_send_queue(TNY_TRANSPORT_ACCOUNT(account)); + status = modest_tny_send_queue_get_msg_status(send_queue, msg_id); + if (status != MODEST_TNY_SEND_QUEUE_UNKNOWN) { + header_acc = g_object_ref(account); + } + g_object_unref (account); + tny_iterator_next (acc_iter); + } + + g_object_unref(acc_iter); + return header_acc; +}