X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-account-store.c;h=d674e752dc187ed46f6bd3b2c5655573d03b82f5;hp=eb1f357db960643e4c171a811c81cc056b72c409;hb=e45958deaf9701399c552ea0d84c2447efacd4ca;hpb=f541209a85cb6c71c79da1df81afbe10c448690a diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index eb1f357..d674e75 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -43,8 +43,9 @@ #include #include -#include +#include #include +#include "modest-account-protocol.h" #include #include #include @@ -53,6 +54,7 @@ #include #include +#include #include "modest-tny-account-store.h" #include "modest-tny-platform-factory.h" #include @@ -130,7 +132,6 @@ typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate; struct _ModestTnyAccountStorePrivate { gchar *cache_dir; GHashTable *password_hash; - GHashTable *account_settings_dialog_hash; ModestAccountMgr *account_mgr; TnySessionCamel *session; TnyDevice *device; @@ -144,6 +145,9 @@ struct _ModestTnyAccountStorePrivate { /* Matches transport accounts and outbox folder */ GHashTable *outbox_of_transport; + + /* is sending mail blocked? */ + gboolean send_mail_blocked; }; #define MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -265,6 +269,7 @@ modest_tny_account_store_instance_init (ModestTnyAccountStore *obj) priv->session = NULL; priv->device = NULL; priv->sighandlers = NULL; + priv->send_mail_blocked = FALSE; priv->outbox_of_transport = g_hash_table_new_full (g_direct_hash, g_direct_equal, @@ -278,11 +283,6 @@ 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); - /* 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); - /* 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. */ @@ -312,9 +312,6 @@ account_verify_last_ref (TnyAccount *account, const gchar *str) g_free (txt); } - - - static void foreach_account_append_to_list (gpointer data, gpointer user_data) @@ -484,18 +481,6 @@ on_account_changed (ModestAccountMgr *acc_mgr, } static void -on_account_settings_hide (GtkWidget *widget, gpointer user_data) -{ - /* 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); - - gchar *account_name = (gchar *) user_data; - if (account_name) - g_hash_table_remove (priv->account_settings_dialog_hash, account_name); -} - -static void show_password_warning_only (const gchar *msg) { ModestWindow *main_window = @@ -509,27 +494,31 @@ show_password_warning_only (const gchar *msg) 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(); - GtkWidget *main_window; - GtkWidget *dialog = NULL; - - main_window = (GtkWidget *) 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; - } - if (g_object_get_data (G_OBJECT (account), "connection_specific") != NULL) { modest_ui_actions_on_smtp_servers (NULL, NULL); } else { + ModestAccountProtocol *proto; + ModestProtocolType proto_type; 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); + modest_account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); + + /* Get proto */ + proto_type = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), + modest_account_name); + proto = (ModestAccountProtocol *) + modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), + proto_type); + + /* Create and show the dialog */ + if (proto && MODEST_IS_ACCOUNT_PROTOCOL (proto)) { + ModestAccountSettingsDialog *dialog = + modest_account_protocol_get_account_settings_dialog (proto, modest_account_name); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), NULL); + gtk_widget_show (GTK_WIDGET (dialog)); + } } /* Show an explanatory temporary banner: */ - modest_platform_information_banner (dialog, NULL, _("mcen_ib_username_pw_incorrect")); + modest_platform_information_banner (NULL, NULL, _("mcen_ib_username_pw_incorrect")); } /* This callback will be called by Tinymail when it needs the password @@ -611,17 +600,21 @@ get_password (TnyAccount *account, const gchar * prompt_not_used, gboolean *canc /* If it was already asked, it must have been wrong, so ask again */ if (already_asked || !pwd || strlen(pwd) == 0) { + gboolean settings_have_password; + ModestProtocolType protocol_type; + /* As per the UI spec, if no password was set in the account settings, * ask for it now. But if the password is wrong in the account settings, * then show a banner and the account settings dialog so it can be corrected: */ - ModestTransportStoreProtocol proto; - const gboolean settings_have_password = + settings_have_password = modest_account_mgr_get_server_account_has_password (priv->account_mgr, server_account_name); + protocol_type = modest_tny_account_get_protocol_type (account); + /* Show an error and after that ask for a password */ - proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account)); - if (proto == MODEST_PROTOCOL_TRANSPORT_SMTP) { + if (modest_protocol_registry_protocol_type_has_tag(modest_runtime_get_protocol_registry (), + protocol_type, MODEST_PROTOCOL_REGISTRY_TRANSPORT_PROTOCOLS)) { gchar *username = NULL, *msg = NULL; username = modest_account_mgr_get_server_account_username (priv->account_mgr, server_account_name); @@ -798,11 +791,6 @@ modest_tny_account_store_finalize (GObject *obj) priv->password_hash = NULL; } - if (priv->account_settings_dialog_hash) { - g_hash_table_destroy (priv->account_settings_dialog_hash); - priv->account_settings_dialog_hash = NULL; - } - if (priv->outbox_of_transport) { g_hash_table_destroy (priv->outbox_of_transport); priv->outbox_of_transport = NULL; @@ -844,8 +832,6 @@ modest_tny_account_store_finalize (GObject *obj) priv->session = NULL; } - camel_shutdown (); - G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -910,7 +896,8 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, GObject *obj; ModestTnyAccountStorePrivate *priv; TnyAccount *local_account = NULL; - + TnyLockable *lockable; + g_return_val_if_fail (account_mgr, NULL); g_return_val_if_fail (device, NULL); @@ -926,8 +913,10 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr, return NULL; } - /* Set the ui locker */ - tny_session_camel_set_ui_locker (priv->session, tny_gtk_lockable_new ()); + /* Set the ui locker */ + lockable = tny_gtk_lockable_new (); + tny_session_camel_set_ui_locker (priv->session, lockable); + g_object_unref (lockable); /* Connect signals */ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, @@ -1051,11 +1040,11 @@ modest_tny_account_store_alert (TnyAccountStore *self, gboolean question, GError *error) { - ModestTransportStoreProtocol proto = - MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN; + ModestProtocolType protocol_type = MODEST_PROTOCOL_REGISTRY_TYPE_INVALID; + ModestProtocol *protocol = NULL; const gchar* server_name = ""; gchar *prompt = NULL; - gboolean retval; + gboolean retval = TRUE; /* NOTE: account may be NULL in some cases */ g_return_val_if_fail (error, FALSE); @@ -1063,14 +1052,14 @@ modest_tny_account_store_alert (TnyAccountStore *self, /* Get the server name: */ if (account) { server_name = tny_account_get_hostname (account); - const gchar *proto_name = tny_account_get_proto (account); - if (proto_name) - proto = modest_protocol_info_get_transport_store_protocol (proto_name); - else { + protocol_type = modest_tny_account_get_protocol_type (account); + if (protocol_type == MODEST_PROTOCOL_REGISTRY_TYPE_INVALID){ g_warning("modest: %s: account with id=%s has no proto.\n", __FUNCTION__, tny_account_get_id (account)); return FALSE; } + protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), + protocol_type); } switch (error->code) { @@ -1086,20 +1075,10 @@ modest_tny_account_store_alert (TnyAccountStore *self, case TNY_SERVICE_ERROR_UNAVAILABLE: /* You must be working online for this operation */ case TNY_SERVICE_ERROR_CONNECT: - switch (proto) { - case MODEST_PROTOCOL_STORE_POP: - prompt = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"), - server_name); - break; - case MODEST_PROTOCOL_STORE_IMAP: - prompt = g_strdup_printf (_("emev_ni_ui_imap_connect_server_error"), - server_name); - break; - case MODEST_PROTOCOL_TRANSPORT_SMTP: - prompt = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), - server_name); - break; - default: + if (protocol) { + prompt = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_CONNECT_ERROR, server_name); + } + if (!prompt) { g_return_val_if_reached (FALSE); } break; @@ -1108,20 +1087,10 @@ modest_tny_account_store_alert (TnyAccountStore *self, /* It seems that there's no better error to show with * POP and IMAP because TNY_SERVICE_ERROR_AUTHENTICATE * may appear if there's a timeout during auth */ - switch (proto) { - case MODEST_PROTOCOL_STORE_POP: - prompt = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"), - server_name); - break; - case MODEST_PROTOCOL_STORE_IMAP: - prompt = g_strdup_printf (_("emev_ni_ui_imap_connect_server_error"), - server_name); - break; - case MODEST_PROTOCOL_TRANSPORT_SMTP: - prompt = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"), - server_name); - break; - default: + if (protocol) { + prompt = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_AUTH_ERROR, server_name); + } + if (!prompt) { g_return_val_if_reached (FALSE); } break; @@ -1136,6 +1105,7 @@ modest_tny_account_store_alert (TnyAccountStore *self, case TNY_SERVICE_ERROR_UNKNOWN: return FALSE; default: + g_debug ("Unexpected error %d", error->code); g_return_val_if_reached (FALSE); } @@ -1143,7 +1113,7 @@ 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 { + else if (error->code == TNY_SERVICE_ERROR_AUTHENTICATE) { modest_platform_run_information_dialog (NULL, prompt, TRUE); /* Show the account dialog if it was wrong */ @@ -1154,6 +1124,7 @@ modest_tny_account_store_alert (TnyAccountStore *self, retval = TRUE; } + g_debug ("%s: error code %d (%s", __FUNCTION__, error->code, error->message); if (prompt) g_free (prompt); @@ -1544,7 +1515,7 @@ connection_status_changed (TnyAccount *account, /* Perform a send receive */ account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); - modest_ui_actions_do_send_receive (account_name, FALSE, FALSE, FALSE, main_window); + modest_ui_actions_do_send_receive (account_name, FALSE, FALSE, TRUE, main_window); } } @@ -1679,7 +1650,7 @@ add_outbox_from_transport_account_to_global_outbox (ModestTnyAccountStore *self, info = g_slice_new0 (AddOutboxInfo); info->account_store = self; info->transport_account = g_object_ref (transport_account); - tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account_outbox), folders, NULL, + tny_folder_store_get_folders_async (TNY_FOLDER_STORE (account_outbox), folders, NULL, FALSE, add_outbox_from_transport_account_to_global_outbox_get_folders_cb, NULL, (gpointer) info); g_object_unref (account_outbox); } @@ -1876,6 +1847,25 @@ remove_transport_account (ModestTnyAccountStore *self, on_account_disconnect_when_removing, self); } +static gboolean +images_cache_remove_filter (TnyStreamCache *self, const gchar *id, const gchar *account_name) +{ + gchar *account_name_with_separator; + gboolean result; + if (account_name == NULL || account_name[0] == '\0') + return FALSE; + + if (id == NULL || id[0] == '\0') + return FALSE; + + account_name_with_separator = g_strconcat (account_name, "__", NULL); + + result = (g_str_has_prefix (id, account_name)); + g_free (account_name_with_separator); + + return result; +} + static void on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account, @@ -1884,6 +1874,7 @@ on_account_removed (ModestAccountMgr *acc_mgr, TnyAccount *store_account = NULL, *transport_account = NULL; ModestTnyAccountStore *self; ModestTnyAccountStorePrivate *priv; + TnyStreamCache *stream_cache; self = MODEST_TNY_ACCOUNT_STORE (user_data); priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); @@ -1936,6 +1927,10 @@ on_account_removed (ModestAccountMgr *acc_mgr, __FUNCTION__, account); } + /* Remove cached images */ + stream_cache = modest_runtime_get_images_cache (); + tny_stream_cache_remove (stream_cache, (TnyStreamCacheRemoveFilter) images_cache_remove_filter, (gpointer) account); + /* If there are no more user accounts then delete the transport specific SMTP servers */ if (only_local_accounts (self)) @@ -1978,6 +1973,12 @@ modest_tny_account_store_new_connection_specific_transport_account (ModestTnyAcc return TNY_TRANSPORT_ACCOUNT (tny_account); } +static void +foreach_free_string(gpointer data, + gpointer user_data) +{ + g_free (data); +} static void add_connection_specific_transport_accounts (ModestTnyAccountStore *self) @@ -1994,6 +1995,7 @@ add_connection_specific_transport_accounts (ModestTnyAccountStore *self) if (err) { g_error_free (err); g_return_if_reached (); + return; } /* Look at each connection-specific transport account for the @@ -2012,6 +2014,10 @@ add_connection_specific_transport_accounts (ModestTnyAccountStore *self) } iter = g_slist_next (iter); } + + /* Free the list */ + g_slist_foreach (list_specifics, foreach_free_string, NULL); + g_slist_free (list_specifics); } static void @@ -2030,6 +2036,7 @@ remove_connection_specific_transport_accounts (ModestTnyAccountStore *self) if (err) { g_error_free (err); g_return_if_reached (); + return; } /* Look at each connection-specific transport account for the @@ -2044,13 +2051,17 @@ remove_connection_specific_transport_accounts (ModestTnyAccountStore *self) account = modest_tny_account_store_get_server_account (self, transport_account_name, TNY_ACCOUNT_TYPE_TRANSPORT); - if (account) { + + /* the call will free the reference */ + if (account) remove_transport_account (self, TNY_TRANSPORT_ACCOUNT (account)); - g_object_unref (account); - } } iter = g_slist_next (iter); } + + /* Free the list */ + g_slist_foreach (list_specifics, foreach_free_string, NULL); + g_slist_free (list_specifics); } @@ -2073,7 +2084,7 @@ modest_tny_account_store_find_msg_in_outboxes (ModestTnyAccountStore *self, 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); + tny_folder_store_get_folders (TNY_FOLDER_STORE (account), folders, NULL, FALSE, NULL); folders_iter = tny_list_create_iterator (folders); while (msg == NULL && !tny_iterator_is_done (folders_iter)) { @@ -2134,50 +2145,6 @@ modest_tny_account_store_get_transport_account_from_outbox_header(ModestTnyAccou return header_acc; } -GtkWidget * -modest_tny_account_store_show_account_settings_dialog (ModestTnyAccountStore *self, - const gchar *account_name) -{ - ModestTnyAccountStorePrivate *priv; - gpointer dialog_as_gpointer = NULL; - gboolean found; - - priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); - found = g_hash_table_lookup_extended (priv->account_settings_dialog_hash, - account_name, NULL, (gpointer*)&dialog_as_gpointer); - - if (found) { - modest_account_settings_dialog_check_allow_changes ((ModestAccountSettingsDialog *) dialog_as_gpointer); - return (GtkWidget *) dialog_as_gpointer; - } else { - ModestAccountSettings *settings; - GtkWidget *dialog; - dialog = (GtkWidget *) modest_account_settings_dialog_new (); - settings = modest_account_mgr_load_account_settings (priv->account_mgr, account_name); - modest_account_settings_dialog_save_password (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog)); - modest_account_settings_dialog_set_account (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog), settings); - g_object_unref (settings); - modest_account_settings_dialog_switch_to_user_info (MODEST_ACCOUNT_SETTINGS_DIALOG (dialog)); - modest_account_settings_dialog_check_allow_changes (MODEST_ACCOUNT_SETTINGS_DIALOG (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 (account_name), dialog); - - g_signal_connect (G_OBJECT (dialog), "hide", G_CALLBACK (on_account_settings_hide), - g_strdup (account_name)); - - /* Show it and delete it when it closes: */ - g_signal_connect_swapped (dialog, - "response", - G_CALLBACK (gtk_widget_destroy), - dialog); - gtk_widget_show (GTK_WIDGET (dialog)); - - return dialog; - } - -} - typedef struct { ModestTnyAccountStore *account_store; ModestTnyAccountStoreShutdownCallback callback; @@ -2195,6 +2162,8 @@ account_shutdown_callback (TnyCamelAccount *account, gboolean canceled, GError * op_data->callback (op_data->account_store, op_data->userdata); g_object_unref (op_data->account_store); g_free (op_data); + } else { + g_object_unref (op_data->account_store); } } @@ -2205,11 +2174,18 @@ account_shutdown (TnyAccount *account, ShutdownOpData *op_data) if (TNY_IS_STORE_ACCOUNT (account) && !modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account))) - return; + goto frees; - op_data->pending++; + /* Disconnect account */ + if (tny_account_get_connection_status (account) == TNY_CONNECTION_STATUS_CONNECTED) { + tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(account), FALSE, + account_shutdown_callback, op_data); + return; + } - tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(account), FALSE, account_shutdown_callback, op_data); + frees: + op_data->pending--; + g_object_unref (op_data->account_store); } @@ -2218,13 +2194,23 @@ modest_tny_account_store_shutdown (ModestTnyAccountStore *self, ModestTnyAccountStoreShutdownCallback callback, gpointer userdata) { - ShutdownOpData *op_data = g_new0 (ShutdownOpData, 1); + gint i, num_accounts; + ShutdownOpData *op_data; ModestTnyAccountStorePrivate *priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self); + + /* Get references */ + num_accounts = tny_list_get_length (priv->store_accounts) + + tny_list_get_length (priv->transport_accounts); + for (i = 0 ; i < num_accounts ; i++) + g_object_ref (self); + + /* Create the helper object */ + op_data = g_new0 (ShutdownOpData, 1); op_data->callback = callback; op_data->userdata = userdata; - op_data->pending = 0; - op_data->account_store = g_object_ref (self); - + op_data->pending = num_accounts; + op_data->account_store = 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); @@ -2237,7 +2223,27 @@ modest_tny_account_store_shutdown (ModestTnyAccountStore *self, 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); } } + +gboolean +modest_tny_account_store_is_send_mail_blocked (ModestTnyAccountStore *self) +{ + ModestTnyAccountStorePrivate *priv; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + return priv->send_mail_blocked; +} + +void +modest_tny_account_store_set_send_mail_blocked (ModestTnyAccountStore *self, + gboolean blocked) +{ + ModestTnyAccountStorePrivate *priv; + + priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self); + + priv->send_mail_blocked = blocked; +}