X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=0d380e3f3030444be87c211f8f1bce6762cc0679;hp=4d29902113e67b096aaee1a16146e85a3bee32a2;hb=e9c67b1991508f5be50928eac2d32ff52b50bd5e;hpb=275ed4fbb00e67d4cbcf76723ca903c3e53f407d diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 4d29902..0d380e3 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -79,7 +79,7 @@ static void on_account_inserted (ModestAccountMgr *acc_mgr, const gchar *account, gpointer user_data); -static void add_existing_accounts (ModestTnyAccountStore *self); +static void add_existing_accounts (ModestTnyAccountStore *self); static void insert_account (ModestTnyAccountStore *self, const gchar *account, @@ -108,10 +108,14 @@ static void forget_password_in_memory (ModestTnyAccountStore *self, static void add_connection_specific_transport_accounts (ModestTnyAccountStore *self); +static void remove_connection_specific_transport_accounts (ModestTnyAccountStore *self); + static void connection_status_changed (TnyAccount *account, TnyConnectionStatus status, gpointer data); +static gboolean only_local_accounts (ModestTnyAccountStore *self); + /* list my signals */ enum { ACCOUNT_CHANGED_SIGNAL, @@ -297,20 +301,6 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) /* disconnect the list of TnyAccounts */ static void -account_disconnect (TnyAccount *account) -{ - g_return_if_fail (account && TNY_IS_ACCOUNT(account)); - - if (TNY_IS_STORE_ACCOUNT (account) && - !modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account))) - return; - - 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; @@ -521,9 +511,8 @@ show_wrong_password_dialog (TnyAccount *account) { /* This is easier than using a struct for the user_data: */ ModestTnyAccountStore *self = modest_runtime_get_account_store(); - const gchar *modest_account_name; GtkWidget *main_window; - GtkWidget *dialog; + GtkWidget *dialog = NULL; main_window = (GtkWidget *) modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); /* don't create */ @@ -532,16 +521,15 @@ show_wrong_password_dialog (TnyAccount *account) 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__); + if (g_object_get_data (G_OBJECT (account), "connection_specific") != NULL) { + modest_ui_actions_on_smtp_servers (NULL, NULL); + } else { + const gchar *modest_account_name; + modest_account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); + dialog = modest_tny_account_store_show_account_settings_dialog (self, modest_account_name); } - - dialog = modest_tny_account_store_show_account_settings_dialog (self, modest_account_name); - modest_account_settings_dialog_save_password (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog)); /* Show an explanatory temporary banner: */ - modest_platform_information_banner (GTK_WIDGET(dialog), NULL, _("mcen_ib_username_pw_incorrect")); + modest_platform_information_banner (dialog, NULL, _("mcen_ib_username_pw_incorrect")); } /* This callback will be called by Tinymail when it needs the password @@ -835,14 +823,12 @@ 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, (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, (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; @@ -970,15 +956,9 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, global OUTBOX hosted in the local account */ add_existing_accounts (MODEST_TNY_ACCOUNT_STORE (obj)); - /* 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 if there are any + accounts available */ + if (!only_local_accounts (MODEST_TNY_ACCOUNT_STORE(obj))) add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE(obj)); /* This is a singleton, so it does not need to be unrefed. */ @@ -1163,8 +1143,17 @@ modest_tny_account_store_alert (TnyAccountStore *self, 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); + else { + modest_platform_run_information_dialog (NULL, prompt, TRUE); + + /* Show the account dialog if it was wrong */ + if (error->code == TNY_SERVICE_ERROR_CONNECT || + error->code == TNY_SERVICE_ERROR_AUTHENTICATE) + show_wrong_password_dialog (account); + + retval = TRUE; + } + if (prompt) g_free (prompt); @@ -1624,9 +1613,13 @@ add_outbox_from_transport_account_to_global_outbox_get_folders_cb (TnyFolderStor self = MODEST_TNY_ACCOUNT_STORE (info->account_store); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + /* Note that this could happen if there is not enough space + available on disk, then the outbox folder could not be + created */ if (tny_list_get_length (list) != 1) { - g_warning ("%s: > 1 outbox found (%d)?!", __FUNCTION__, + g_warning ("%s: could not create outbox folder (%d folders found)", __FUNCTION__, tny_list_get_length (list)); + goto frees; } iter_folders = tny_list_create_iterator (list); @@ -1647,10 +1640,11 @@ add_outbox_from_transport_account_to_global_outbox_get_folders_cb (TnyFolderStor /* Notify that the local account changed */ g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account); - - g_object_unref (info->transport_account); g_object_unref (local_account); g_object_unref (per_account_outbox); + + frees: + g_object_unref (info->transport_account); g_slice_free (AddOutboxInfo, info); } @@ -1741,13 +1735,46 @@ insert_account (ModestTnyAccountStore *self, g_object_unref (transport_account); } +static gboolean +only_local_accounts (ModestTnyAccountStore *self) +{ + ModestTnyAccountStorePrivate *priv = NULL; + gboolean only_local = TRUE; + TnyIterator *iter; + + /* Check if this is the first remote account we add */ + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + iter = tny_list_create_iterator (priv->store_accounts); + + while (!tny_iterator_is_done (iter) && only_local) { + TnyAccount *account = (TnyAccount *) tny_iterator_get_current (iter); + if (modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account))) + only_local = FALSE; + g_object_unref (account); + tny_iterator_next (iter); + } + g_object_unref (iter); + + return only_local; +} + static void on_account_inserted (ModestAccountMgr *acc_mgr, const gchar *account, gpointer user_data) { + gboolean add_specific; + + add_specific = only_local_accounts (MODEST_TNY_ACCOUNT_STORE (user_data)); + /* Insert the account and notify the observers */ insert_account (MODEST_TNY_ACCOUNT_STORE (user_data), account, TRUE); + + /* If it's the first remote account then add the connection + specific SMTP servers as well */ + if (add_specific) + add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE (user_data)); + } /* This is the callback of the tny_camel_account_set_online called in @@ -1785,7 +1812,7 @@ on_account_disconnect_when_removing (TnyCamelAccount *account, } else if (TNY_IS_TRANSPORT_ACCOUNT (account)) { ModestTnySendQueue* send_queue; send_queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (account), FALSE); - if (send_queue) { + if (TNY_IS_SEND_QUEUE (send_queue)) { if (modest_tny_send_queue_sending_in_progress (send_queue)) tny_send_queue_cancel (TNY_SEND_QUEUE (send_queue), TNY_SEND_QUEUE_CANCEL_ACTION_REMOVE, @@ -1795,6 +1822,60 @@ on_account_disconnect_when_removing (TnyCamelAccount *account, } } +/* + * We use this one for both removing "normal" and "connection + * specific" transport accounts + */ +static void +remove_transport_account (ModestTnyAccountStore *self, + TnyTransportAccount *transport_account) +{ + ModestTnyAccountStorePrivate *priv; + TnyFolder *outbox = NULL; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + + /* Remove it from the list of accounts and notify the + observers. Do not need to wait for account + disconnection */ + g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, transport_account); + tny_list_remove (priv->transport_accounts, (GObject *) transport_account); + + /* Remove the OUTBOX of the account from the global outbox */ + outbox = g_hash_table_lookup (priv->outbox_of_transport, transport_account); + + if (TNY_IS_FOLDER (outbox)) { + TnyAccount *local_account = NULL; + TnyAccount *outbox_account = tny_folder_get_account (outbox); + + if (outbox_account) { + tny_list_remove (priv->store_accounts_outboxes, G_OBJECT (outbox_account)); + /* Remove existing emails to send */ + tny_store_account_delete_cache (TNY_STORE_ACCOUNT (outbox_account)); + g_object_unref (outbox_account); + } + + local_account = modest_tny_account_store_get_local_folders_account (self); + modest_tny_local_folders_account_remove_folder_from_outbox (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (local_account), + outbox); + + g_hash_table_remove (priv->outbox_of_transport, transport_account); + + /* Notify the change in the local account */ + g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account); + g_object_unref (local_account); + } else { + g_warning ("Removing a transport account that has no outbox"); + } + + /* Cancel all pending operations */ + tny_account_cancel (TNY_ACCOUNT (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); +} + static void on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, @@ -1843,54 +1924,22 @@ on_account_removed (ModestAccountMgr *acc_mgr, /* If there was any problem creating the account, for example, with the configuration system this could not exist */ if (TNY_IS_TRANSPORT_ACCOUNT(transport_account)) { - TnyAccount *local_account = NULL; - TnyFolder *outbox = NULL; /* Forget any cached password for the account */ forget_password_in_memory (self, tny_account_get_id (transport_account)); - /* Remove it from the list of accounts and notify the - observers. Do not need to wait for account - disconnection */ - tny_list_remove (priv->transport_accounts, (GObject *) transport_account); - g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, transport_account); - - /* Remove the OUTBOX of the account from the global outbox */ - outbox = g_hash_table_lookup (priv->outbox_of_transport, transport_account); - - if (TNY_IS_FOLDER (outbox)) { - TnyAccount *outbox_account = tny_folder_get_account (outbox); - - if (outbox_account) { - tny_list_remove (priv->store_accounts_outboxes, G_OBJECT (outbox_account)); - /* Remove existing emails to send */ - tny_store_account_delete_cache (TNY_STORE_ACCOUNT (outbox_account)); - g_object_unref (outbox_account); - } - - local_account = modest_tny_account_store_get_local_folders_account (self); - modest_tny_local_folders_account_remove_folder_from_outbox (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (local_account), - outbox); - - g_hash_table_remove (priv->outbox_of_transport, transport_account); - - /* Notify the change in the local account */ - g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account); - g_object_unref (local_account); - } else { - g_warning ("Removing a transport account that has no outbox"); - } - - /* Cancel all pending operations */ - tny_account_cancel (TNY_ACCOUNT (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); + /* Remove transport account. It'll free the reference + added by get_server_account */ + remove_transport_account (self, TNY_TRANSPORT_ACCOUNT (transport_account)); } else { g_warning ("%s: no transport account for account %s\n", __FUNCTION__, account); } + + /* If there are no more user accounts then delete the + transport specific SMTP servers */ + if (only_local_accounts (self)) + remove_connection_specific_transport_accounts (self); } TnyTransportAccount * @@ -1913,6 +1962,9 @@ modest_tny_account_store_new_connection_specific_transport_account (ModestTnyAcc g_object_set_data (G_OBJECT(tny_account), "account_store", (gpointer)self); + g_object_set_data (G_OBJECT(tny_account), + "connection_specific", + GINT_TO_POINTER (TRUE)); tny_list_append (priv->transport_accounts, G_OBJECT (tny_account)); add_outbox_from_transport_account_to_global_outbox (self, @@ -1932,19 +1984,16 @@ add_connection_specific_transport_accounts (ModestTnyAccountStore *self) { ModestTnyAccountStorePrivate *priv = NULL; GSList *list_specifics = NULL, *iter = NULL; + GError *err = NULL; priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - ModestConf *conf = modest_runtime_get_conf (); - - GError *err = NULL; - list_specifics = modest_conf_get_list (conf, + list_specifics = modest_conf_get_list (modest_runtime_get_conf (), 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); - err = NULL; + g_return_if_reached (); } /* Look at each connection-specific transport account for the @@ -1965,6 +2014,46 @@ add_connection_specific_transport_accounts (ModestTnyAccountStore *self) } } +static void +remove_connection_specific_transport_accounts (ModestTnyAccountStore *self) +{ + ModestTnyAccountStorePrivate *priv = NULL; + GSList *list_specifics = NULL, *iter = NULL; + GError *err = NULL; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + err = NULL; + list_specifics = modest_conf_get_list (modest_runtime_get_conf (), + MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST, + MODEST_CONF_VALUE_STRING, &err); + if (err) { + g_error_free (err); + g_return_if_reached (); + } + + /* Look at each connection-specific transport account for the + * modest account: */ + iter = list_specifics; + while (iter) { + /* The list alternates between the connection name and the transport name: */ + iter = g_slist_next (iter); + if (iter) { + const gchar* transport_account_name = (const gchar*) (iter->data); + TnyAccount * account; + account = modest_tny_account_store_get_server_account (self, + transport_account_name, + TNY_ACCOUNT_TYPE_TRANSPORT); + if (account) { + remove_transport_account (self, TNY_TRANSPORT_ACCOUNT (account)); + g_object_unref (account); + } + } + iter = g_slist_next (iter); + } +} + + TnyMsg * modest_tny_account_store_find_msg_in_outboxes (ModestTnyAccountStore *self, const gchar *uri, @@ -2023,7 +2112,6 @@ modest_tny_account_store_get_transport_account_from_outbox_header(ModestTnyAccou 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)) { @@ -2031,9 +2119,10 @@ modest_tny_account_store_get_transport_account_from_outbox_header(ModestTnyAccou ModestTnySendQueue *send_queue; ModestTnySendQueueStatus status; send_queue = modest_runtime_get_send_queue(TNY_TRANSPORT_ACCOUNT(account), TRUE); - 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); + if (TNY_IS_SEND_QUEUE (send_queue)) { + 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); @@ -2047,7 +2136,7 @@ modest_tny_account_store_get_transport_account_from_outbox_header(ModestTnyAccou GtkWidget * modest_tny_account_store_show_account_settings_dialog (ModestTnyAccountStore *self, - const gchar *account_name) + const gchar *account_name) { ModestTnyAccountStorePrivate *priv; gpointer dialog_as_gpointer = NULL; @@ -2087,3 +2176,67 @@ modest_tny_account_store_show_account_settings_dialog (ModestTnyAccountStore *se } } + +typedef struct { + ModestTnyAccountStore *account_store; + ModestTnyAccountStoreShutdownCallback callback; + gpointer userdata; + gint pending; +} ShutdownOpData; + +static void +account_shutdown_callback (TnyCamelAccount *account, gboolean canceled, GError *err, gpointer userdata) +{ + ShutdownOpData *op_data = (ShutdownOpData *) userdata; + op_data->pending--; + if (op_data->pending == 0) { + if (op_data->callback) + op_data->callback (op_data->account_store, op_data->userdata); + g_object_unref (op_data->account_store); + g_free (op_data); + } +} + +static void +account_shutdown (TnyAccount *account, ShutdownOpData *op_data) +{ + g_return_if_fail (account && TNY_IS_ACCOUNT(account)); + + if (TNY_IS_STORE_ACCOUNT (account) && + !modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account))) + return; + + op_data->pending++; + + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(account), FALSE, account_shutdown_callback, op_data); +} + + +void +modest_tny_account_store_shutdown (ModestTnyAccountStore *self, + ModestTnyAccountStoreShutdownCallback callback, + gpointer userdata) +{ + ShutdownOpData *op_data = g_new0 (ShutdownOpData, 1); + ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + op_data->callback = callback; + op_data->userdata = userdata; + op_data->pending = 0; + op_data->account_store = g_object_ref (self); + + /* Destroy all accounts. Disconnect all accounts before they are destroyed */ + if (priv->store_accounts) { + tny_list_foreach (priv->store_accounts, (GFunc)account_shutdown, op_data); + } + + if (priv->transport_accounts) { + tny_list_foreach (priv->transport_accounts, (GFunc)account_shutdown, op_data); + } + + if (op_data->pending == 0) { + if (op_data->callback) + op_data->callback (op_data->account_store, op_data->userdata); + g_object_unref (op_data->account_store); + g_free (op_data); + } +}