X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=dfd859daa2287edab8b80aa9a52bbd3bf97c705d;hp=94b1f463d794c2c57bad4f4b20ab68964b1af0a9;hb=96d0d173e287c0453ba53589fe7f407136590b9d;hpb=81b94116a84854d2323771c2d023c8ff72f45891 diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 94b1f46..dfd859d 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -53,6 +53,7 @@ #include #include #include +#include #include "modest-tny-account-store.h" #include "modest-tny-platform-factory.h" @@ -300,19 +301,35 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) /* disconnect the list of TnyAccounts */ static void -foreach_account_disconnect (gpointer data, - gpointer user_data) +account_disconnect (TnyAccount *account) { - tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(data), FALSE, NULL, NULL); + 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 +account_verify_last_ref (TnyAccount *account, const gchar *str) +{ + 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)); } @@ -405,7 +422,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], @@ -499,22 +516,34 @@ 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) + hildon_banner_show_information ( + GTK_WIDGET(main_window), NULL, _("mcen_ib_username_pw_incorrect")); + else + g_warning ("%s: %s", __FUNCTION__, _("mcen_ib_username_pw_incorrect")); } - + + 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__); @@ -531,9 +560,6 @@ 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) { dialog = modest_account_settings_dialog_new (); @@ -574,9 +600,9 @@ request_password_and_wait (ModestTnyAccountStore *account_store, 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); + g_signal_emit (G_OBJECT(account_store), signals[PASSWORD_REQUESTED_SIGNAL], 0, + server_account_id, /* server_account_name */ + username, password, cancel, remember); } /* This callback will be called by Tinymail when it needs the password @@ -590,12 +616,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; @@ -604,6 +625,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 ("DEBUG: modest: %s: prompt (not shown) = %s\n", __FUNCTION__, prompt_not_used); + ); + /* Initialize the output parameter: */ if (cancel) *cancel = FALSE; @@ -633,9 +660,10 @@ 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 ("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, @@ -651,7 +679,10 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc */ 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: */ show_wrong_password_dialog (account); @@ -699,10 +730,8 @@ 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; } @@ -810,13 +839,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; } @@ -948,7 +979,7 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, 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 (FALSE) + if (TRUE) /* Add connection-specific transport accounts */ add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE(obj)); @@ -1017,8 +1048,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; @@ -1123,7 +1154,7 @@ modest_tny_account_store_alert (TnyAccountStore *self, if (error->code == TNY_ACCOUNT_ERROR_TRY_CONNECT_CERTIFICATE) - retval = modest_platform_run_certificate_conformation_dialog (server_name, + retval = modest_platform_run_certificate_confirmation_dialog (server_name, error->message); else retval = modest_platform_run_alert_dialog (prompt, question); @@ -1251,6 +1282,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, @@ -1291,7 +1323,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); } @@ -1311,9 +1343,9 @@ 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) { /* Get the current connection: */ TnyDevice *device = modest_runtime_get_device (); @@ -1387,7 +1419,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: */ @@ -1572,7 +1604,7 @@ insert_account (ModestTnyAccountStore *self, /* 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 */ @@ -1608,8 +1640,7 @@ on_account_inserted (ModestAccountMgr *acc_mgr, } static void -on_account_removed (ModestAccountMgr *acc_mgr, - const gchar *account, +on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, gpointer user_data) { TnyAccount *store_account = NULL, *transport_account = NULL; @@ -1620,7 +1651,7 @@ on_account_removed (ModestAccountMgr *acc_mgr, 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) { @@ -1629,6 +1660,7 @@ on_account_removed (ModestAccountMgr *acc_mgr, /* 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); } else { g_warning ("There is no store account for account %s\n", account); @@ -1660,12 +1692,47 @@ on_account_removed (ModestAccountMgr *acc_mgr, /* 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); } 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) { @@ -1694,24 +1761,11 @@ 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); } @@ -1762,3 +1816,34 @@ modest_tny_account_store_find_msg_in_outboxes (ModestTnyAccountStore *self, 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; +}