From 4f34b87b2cd931be213c453c0a9c23e513a81953 Mon Sep 17 00:00:00 2001 From: nobody Date: Thu, 9 Jan 2003 06:55:40 +0000 Subject: This commit was manufactured by cvs2svn to create tag 'GNOME_UTILS_2_2_1'. svn path=/tags/GNOME_UTILS_2_2_1/; revision=19339 --- mail/.cvsignore | 25 - mail/ChangeLog | 22679 ------------------- mail/GNOME_Evolution_Mail.oaf.in | 309 - mail/GNOME_Evolution_Mail.server.in.in | 309 - mail/Mailer.idl | 67 - mail/Makefile.am | 212 - mail/README.async | 366 - mail/Spell.idl | 71 - mail/component-factory.c | 1598 -- mail/component-factory.h | 31 - mail/e-attchmt.png | Bin 169 -> 0 bytes mail/e-searching-tokenizer.c | 1249 - mail/e-searching-tokenizer.h | 74 - mail/evolution-mail.schemas | 509 - mail/folder-browser-factory.c | 253 - mail/folder-browser-factory.h | 25 - mail/folder-browser-ui.c | 823 - mail/folder-browser-ui.h | 36 - mail/folder-browser.c | 2667 --- mail/folder-browser.h | 185 - mail/folder-info.c | 289 - mail/folder-info.h | 44 - mail/importers/.cvsignore | 12 - ...tion_Mail_Elm_Intelligent_Importer.server.in.in | 21 - .../GNOME_Evolution_Mail_Mbox_Importer.oaf.in | 29 - ...GNOME_Evolution_Mail_Mbox_Importer.server.in.in | 29 - ...Mail_Netscape_Intelligent_Importer.server.in.in | 21 - .../GNOME_Evolution_Mail_Outlook_Importer.oaf.in | 29 - ...ME_Evolution_Mail_Outlook_Importer.server.in.in | 29 - ...ion_Mail_Pine_Intelligent_Importer.server.in.in | 21 - mail/importers/Makefile.am | 31 - mail/importers/evolution-mbox-importer.c | 404 - mail/importers/evolution-outlook-importer.c | 317 - mail/importers/mozilla-status-headers.h | 29 - mail/local-config.glade | 313 - mail/mail-account-editor.c | 174 - mail/mail-account-editor.h | 67 - mail/mail-account-gui.c | 1985 -- mail/mail-account-gui.h | 136 - mail/mail-accounts.c | 505 - mail/mail-accounts.etspec | 12 - mail/mail-accounts.h | 97 - mail/mail-autofilter.c | 397 - mail/mail-autofilter.h | 50 - mail/mail-callbacks.c | 3201 --- mail/mail-callbacks.h | 144 - mail/mail-composer-prefs.c | 964 - mail/mail-composer-prefs.h | 136 - mail/mail-config-druid.c | 1035 - mail/mail-config-druid.h | 90 - mail/mail-config-factory.c | 139 - mail/mail-config-factory.h | 42 - mail/mail-config.c | 2004 -- mail/mail-config.glade | 5689 ----- mail/mail-config.h | 233 - mail/mail-crypto.c | 214 - mail/mail-crypto.h | 63 - mail/mail-display-stream.c | 104 - mail/mail-display-stream.h | 62 - mail/mail-display.c | 2818 --- mail/mail-display.h | 137 - mail/mail-folder-cache.c | 901 - mail/mail-folder-cache.h | 50 - mail/mail-font-prefs.c | 130 - mail/mail-font-prefs.h | 66 - mail/mail-format.c | 2080 -- mail/mail-format.h | 65 - mail/mail-identify.c | 132 - mail/mail-importer.c | 258 - mail/mail-importer.h | 49 - mail/mail-local.c | 1522 -- mail/mail-local.h | 36 - mail/mail-mt.c | 1009 - mail/mail-mt.h | 126 - mail/mail-offline-handler.c | 353 - mail/mail-offline-handler.h | 65 - mail/mail-ops.c | 2296 -- mail/mail-ops.h | 165 - mail/mail-preferences.c | 470 - mail/mail-preferences.h | 126 - mail/mail-search-dialogue.c | 185 - mail/mail-search-dialogue.h | 61 - mail/mail-search.c | 381 - mail/mail-search.h | 79 - mail/mail-send-recv.c | 936 - mail/mail-send-recv.h | 45 - mail/mail-session.c | 986 - mail/mail-session.h | 58 - mail/mail-signature-editor.c | 384 - mail/mail-signature-editor.h | 41 - mail/mail-summary.c | 521 - mail/mail-summary.h | 31 - mail/mail-tools.c | 498 - mail/mail-tools.h | 80 - mail/mail-types.h | 40 - mail/mail-vfolder.c | 977 - mail/mail-vfolder.h | 35 - mail/mail.h | 55 - mail/main.c | 161 - mail/message-browser.c | 363 - mail/message-browser.h | 61 - mail/message-list.c | 2862 --- mail/message-list.etspec | 35 - mail/message-list.h | 160 - mail/message-tag-editor.c | 130 - mail/message-tag-editor.h | 73 - mail/message-tag-followup.c | 354 - mail/message-tag-followup.h | 83 - mail/message-tags.glade | 364 - mail/subscribe-dialog.c | 1691 -- mail/subscribe-dialog.etspec | 9 - mail/subscribe-dialog.glade | 332 - mail/subscribe-dialog.h | 62 - mail/upgrade-mailer.c | 1170 - 114 files changed, 76806 deletions(-) delete mode 100644 mail/.cvsignore delete mode 100644 mail/ChangeLog delete mode 100644 mail/GNOME_Evolution_Mail.oaf.in delete mode 100644 mail/GNOME_Evolution_Mail.server.in.in delete mode 100644 mail/Mailer.idl delete mode 100644 mail/Makefile.am delete mode 100644 mail/README.async delete mode 100644 mail/Spell.idl delete mode 100644 mail/component-factory.c delete mode 100644 mail/component-factory.h delete mode 100644 mail/e-attchmt.png delete mode 100644 mail/e-searching-tokenizer.c delete mode 100644 mail/e-searching-tokenizer.h delete mode 100644 mail/evolution-mail.schemas delete mode 100644 mail/folder-browser-factory.c delete mode 100644 mail/folder-browser-factory.h delete mode 100644 mail/folder-browser-ui.c delete mode 100644 mail/folder-browser-ui.h delete mode 100644 mail/folder-browser.c delete mode 100644 mail/folder-browser.h delete mode 100644 mail/folder-info.c delete mode 100644 mail/folder-info.h delete mode 100644 mail/importers/.cvsignore delete mode 100644 mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in delete mode 100644 mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in delete mode 100644 mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in delete mode 100644 mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in delete mode 100644 mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in delete mode 100644 mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in delete mode 100644 mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in delete mode 100644 mail/importers/Makefile.am delete mode 100644 mail/importers/evolution-mbox-importer.c delete mode 100644 mail/importers/evolution-outlook-importer.c delete mode 100644 mail/importers/mozilla-status-headers.h delete mode 100644 mail/local-config.glade delete mode 100644 mail/mail-account-editor.c delete mode 100644 mail/mail-account-editor.h delete mode 100644 mail/mail-account-gui.c delete mode 100644 mail/mail-account-gui.h delete mode 100644 mail/mail-accounts.c delete mode 100644 mail/mail-accounts.etspec delete mode 100644 mail/mail-accounts.h delete mode 100644 mail/mail-autofilter.c delete mode 100644 mail/mail-autofilter.h delete mode 100644 mail/mail-callbacks.c delete mode 100644 mail/mail-callbacks.h delete mode 100644 mail/mail-composer-prefs.c delete mode 100644 mail/mail-composer-prefs.h delete mode 100644 mail/mail-config-druid.c delete mode 100644 mail/mail-config-druid.h delete mode 100644 mail/mail-config-factory.c delete mode 100644 mail/mail-config-factory.h delete mode 100644 mail/mail-config.c delete mode 100644 mail/mail-config.glade delete mode 100644 mail/mail-config.h delete mode 100644 mail/mail-crypto.c delete mode 100644 mail/mail-crypto.h delete mode 100644 mail/mail-display-stream.c delete mode 100644 mail/mail-display-stream.h delete mode 100644 mail/mail-display.c delete mode 100644 mail/mail-display.h delete mode 100644 mail/mail-folder-cache.c delete mode 100644 mail/mail-folder-cache.h delete mode 100644 mail/mail-font-prefs.c delete mode 100644 mail/mail-font-prefs.h delete mode 100644 mail/mail-format.c delete mode 100644 mail/mail-format.h delete mode 100644 mail/mail-identify.c delete mode 100644 mail/mail-importer.c delete mode 100644 mail/mail-importer.h delete mode 100644 mail/mail-local.c delete mode 100644 mail/mail-local.h delete mode 100644 mail/mail-mt.c delete mode 100644 mail/mail-mt.h delete mode 100644 mail/mail-offline-handler.c delete mode 100644 mail/mail-offline-handler.h delete mode 100644 mail/mail-ops.c delete mode 100644 mail/mail-ops.h delete mode 100644 mail/mail-preferences.c delete mode 100644 mail/mail-preferences.h delete mode 100644 mail/mail-search-dialogue.c delete mode 100644 mail/mail-search-dialogue.h delete mode 100644 mail/mail-search.c delete mode 100644 mail/mail-search.h delete mode 100644 mail/mail-send-recv.c delete mode 100644 mail/mail-send-recv.h delete mode 100644 mail/mail-session.c delete mode 100644 mail/mail-session.h delete mode 100644 mail/mail-signature-editor.c delete mode 100644 mail/mail-signature-editor.h delete mode 100644 mail/mail-summary.c delete mode 100644 mail/mail-summary.h delete mode 100644 mail/mail-tools.c delete mode 100644 mail/mail-tools.h delete mode 100644 mail/mail-types.h delete mode 100644 mail/mail-vfolder.c delete mode 100644 mail/mail-vfolder.h delete mode 100644 mail/mail.h delete mode 100644 mail/main.c delete mode 100644 mail/message-browser.c delete mode 100644 mail/message-browser.h delete mode 100644 mail/message-list.c delete mode 100644 mail/message-list.etspec delete mode 100644 mail/message-list.h delete mode 100644 mail/message-tag-editor.c delete mode 100644 mail/message-tag-editor.h delete mode 100644 mail/message-tag-followup.c delete mode 100644 mail/message-tag-followup.h delete mode 100644 mail/message-tags.glade delete mode 100644 mail/subscribe-dialog.c delete mode 100644 mail/subscribe-dialog.etspec delete mode 100644 mail/subscribe-dialog.glade delete mode 100644 mail/subscribe-dialog.h delete mode 100644 mail/upgrade-mailer.c (limited to 'mail') diff --git a/mail/.cvsignore b/mail/.cvsignore deleted file mode 100644 index 9284b056f7..0000000000 --- a/mail/.cvsignore +++ /dev/null @@ -1,25 +0,0 @@ -.deps -.libs -.pure -Makefile -Makefile.in -Mailer-stubs.c -Mailer-skels.c -Mailer-common.c -Mailer.h -evolution-mail -evolution-mail.pure -test-mail -test-sources -test-thread -*.bb -*.bbg -*.da -*.gcov -GNOME_Evolution_Mail.server -GNOME_Evolution_Mail.server.in -Spell-common.c -Spell-skels.c -Spell-stubs.c -Spell.h -evolution-mail-upgrade diff --git a/mail/ChangeLog b/mail/ChangeLog deleted file mode 100644 index 58a4c4247b..0000000000 --- a/mail/ChangeLog +++ /dev/null @@ -1,22679 +0,0 @@ -2003-01-09 Not Zed - - * mail-config.c (xml_get_prop): g_free->xmlFree - (account_to_xml): copy xml memory to glib memory when adding the 0 - on the end of the string. - (accounts_save): Use slightly different logic with appending to - the tail of the list, we can't use the &node trick with gslists. - (accounts_changed): Same here. - -2003-01-08 Ettore Perazzoli - - * Makefile.am: Images are now in $(datadir)/evolution/images - instead of $(datadir)/images/evolution. - -2003-01-08 Jeffrey Stedfast - - * folder-browser-ui.c (folder_browser_ui_add_global): Call - folder_browser_set_message_preview(). - - * mail-config.c (mail_config_get_show_preview): Removed. - (mail_config_set_show_preview): Removed. - - * folder-browser.c (folder_browser_toggle_preview): Simply set the - gconf show_preview setting and let the code in folder-browser-ui.c - detect it and update the UI. - - * folder-browser-ui.c (folder_browser_ui_add_global): Listen for - changed events on the show_preview setting. - - * mail-config.c (mail_config_set_default_account): Save the - setting via gconf. - (mail_config_add_account): Immediately save the list of accounts. - (mail_config_remove_account): Same. - (mail_config_signature_run_script): g_free the charset value and - use the composer's charset rather than the display charset. - (mail_config_get_default_account_num): Removed. - -2003-01-07 Jeffrey Stedfast - - * folder-browser.c (save_cursor_pos): Use gconf to get the paned - size. - (folder_browser_set_message_preview): Same. - (folder_browser_toggle_hide_deleted): Use gconf to set the - hide-deleted state. - (folder_browser_set_message_display_style): Same but for the - message_display_style. - (fb_resize_cb): Save the paned_size via gconf. - (paned_size_changed): Callback for when the paned_size gets - changed. Change the folder-browser's paned size to the new - setting. - (folder_browser_gui_init): Listen to changes to the paned_size and - also get the initial size from gconf. - - * message-list.c (message_list_set_folder): Use gconf. - (regen_list_regen): Use gconf. - - * message-browser.c (transfer_msg_done): Use gconf to get the - hide_deleted setting. - - * mail-account-gui.c (sig_add_new_signature): Use gconf. - - * folder-browser-ui.c (folder_browser_ui_add_list): Use gconf. - - * folder-browser.c (save_cursor_pos): Use gconf. - (folder_browser_set_message_preview): Same. - (folder_browser_toggle_hide_deleted): Here too. - (folder_browser_set_message_display_style): And here. - (folder_browser_gui_init): Here too. - (done_message_selected): And here. - - * mail-config.c (mail_config_get_thread_subject): Removed. - (mail_config_set_thread_subject): Removed. - (mail_config_get_empty_trash_on_exit): Removed. - (mail_config_set_empty_trash_on_exit): Removed. - (mail_config_get_last_filesel_dir): Removed. - (mail_config_set_last_filesel_dir): Removed. - (mail_config_get_hide_deleted): Removed. - (mail_config_set_hide_deleted): Removed. - (mail_config_get_paned_size): Removed. - (mail_config_set_paned_size): Removed. - (mail_config_get_send_html): Removed. - (mail_config_set_send_html): Removed. - (mail_config_get_confirm_unwanted_html): Removed. - (mail_config_set_confirm_unwanted_html): Removed. - (mail_config_get_citation_highlight): Removed. - (mail_config_set_citation_highlight): Removed. - (mail_config_get_citation_color): Removed. - (mail_config_set_citation_color): Removed. - (mail_config_get_do_seen_timeout): Removed. - (mail_config_set_do_seen_timeout): Removed. - (mail_config_get_mark_as_seen_timeout): Removed. - (mail_config_set_mark_as_seen_timeout): Removed. - (mail_config_get_prompt_empty_subject): Removed. - (mail_config_set_prompt_empty_subject): Removed. - (mail_config_get_prompt_only_bcc): Removed. - (mail_config_set_prompt_only_bcc): Removed. - (mail_config_get_confirm_expunge): Removed. - (mail_config_set_confirm_expunge): Removed. - (mail_config_get_confirm_goto_next_folder): Removed. - (mail_config_set_confirm_goto_next_folder): Removed. - (mail_config_get_goto_next_folder): Removed. - (mail_config_set_goto_next_folder): Removed. - (mail_config_get_http_mode): Removed. - (mail_config_set_http_mode): Removed. - (mail_config_get_default_forward_style): Removed. - (mail_config_set_default_forward_style): Removed. - (mail_config_get_default_reply_style): Removed. - (mail_config_set_default_reply_style): Removed. - (mail_config_get_message_display_style): Removed. - (mail_config_set_message_display_style): Removed. - (mail_config_get_default_charset): Removed. - (mail_config_set_default_charset): Removed. - (mail_config_get_x_mailer_display_style): Removed. - (mail_config_set_x_mailer_display_style): Removed. - - * subscribe-dialog.c (populate_store_list): Use the list of - accounts. We can't get the list of sources anymore. - (populate_store_foreach): Updated. - - * mail-callbacks.c (guess_me_from_accounts): Use account->enabled. - (mail_generate_reply): Same. - (empty_trash): Here too. - - * mail-accounts.c (account_delete_clicked): Use account->enabled - rather than source->enabled. - (account_able_clicked): Same. - (account_cursor_change): Here too. - (mail_accounts_load): And here. - - * component-factory.c (owner_unset_cb): Use gconf empty-on-exit - settings. - (mail_load_storages): Use account->enabled rather than - account->source->enabled. The struct changed. - - * mail-composer-prefs.c (sig_add): Get the send_html pref from gconf. - - * message-tag-followup.c (target_date_new): Use gconf. - - * mail-config.c (mail_config_get_week_start_day): Removed. - - * mail-tools.c (mail_tool_quote_message): Use gconf here too, but - we don't need to parse the colour - just use it as a raw string. - (mail_tool_forward_message): Use gconf. - - * mail-format.c (mail_format_data_wrapper_write_to_stream): Use gconf. - (write_headers): Use gconf. - (handle_text_plain): Same. - - * mail-display.c (mail_text_write): Updated to use gconf and parse - GdkColour strings. - (on_url_requested): Updated to use gconf. - - * mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Use gconf - rather than the old mail-config APIs which will be removed. - (ask_confirm_for_empty_subject): Same. - (ask_confirm_for_only_bcc): Here too. - (composer_get_message): And here. - (create_msg_composer): Same. - (transfer_msg_done): Again here. - (delete_msg): Here too. - (confirm_expunge): And finally here. - - * mail-config.c (mail_config_write): Use gconf. - (mail_config_get_sources): Removed. - - * mail-account-gui.c (mail_account_gui_save): No need to save - enabled-state anymore for a source. - - * mail-config-druid.c (wizard_finish_cb): Instead of setting - account->source->enabled to TRUE, just set account->enabled to - TRUE. The structures changed a bit. - - * mail-send-recv.c (mail_send_receive): Get the list of accounts - instead of sources, and pass them along to build_dialogue. I'm - trying to get rid of the mail_config_get_sources() api. - (mail_autoreceive_setup): Here too. - - * mail-config.c (mail_config_get_filter_log): Removed. - (mail_config_set_filter_log): Removed. - (mail_config_get_filter_log_path): Removed. - (mail_config_set_filter_log_path): Removed. - (mail_config_get_new_mail_notify): Removed. - (mail_config_set_new_mail_notify): Removed. - (mail_config_get_new_mail_notify_sound_file): Removed. - (mail_config_set_new_mail_notify_sound_file): Removed. - - * mail-session.c (main_get_filter_driver): Updated to use the - gconf settings. - -2003-01-07 Dan Winship - - * mail-account-gui.c (mail_account_gui_auto_detect_extra_conf, - mail_account_gui_build_extra_conf): Don't translate the conf - strings. Camel already did it. - -2003-01-06 Dan Winship - - * Makefile.am: remove idldir definition. (It's defined in - configure.in now) - -2003-01-04 Jeffrey Stedfast - - * mail-callbacks.c (composer_get_message): Use - e_destination_get_email() instead of e_destination_get_address() - when checking that we have a list of valid recipients to send the - message to because get_email() returns the addr-spec portion of - the address, which is what we care about. if that doesn't exist, - then the address is useless. This does all we can do mailer-side - for the recent "SMTP Problem" thread. - -2003-01-03 Jeffrey Stedfast - - * mail-display.c: Fixed some build issues. - - * mail-search.c: Same. - - * mail-callbacks.c (save_draft_done): Use - g_signal_handlers_disconnect_by_func(). - (manage_subscriptions): Use a weak_ref instead of connecting to - the destroy event. - -2002-12-17 Jeffrey Stedfast - - ...And a whole bunch more build fixes. - - * mail-vfolder.c (mail_vfolder_delete_uri): Don't use - g_string_sprintfa() anymore since it is apparently deprecated. - - * mail-session.c (main_get_filter_driver): Don't use - g_string_sprintfa() anymore since it is apparently deprecated. - - * mail-ops.c (build_from): Don't use g_string_sprintfa() anymore - since it is apparently deprecated. - - * mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Don't use - g_string_sprintfa() anymore since it is apparently deprecated. - - * mail-autofilter.c: Don't use g_string_sprintfa() anymore since - it is apparently deprecated. - - * folder-browser.c: Don't use g_string_sprintfa() anymore since it - is apparently deprecated. - - * mail-search.c (mail_search_set_subject): Remove the unnecessary - g_strdup()'age as well as fix a possible buffer overrun. - - * mail-local.c (mail_local_folder_construct): Use - g_path_get_basename(). - - * mail-config-druid.c (make_account): Don't use e_utf8_* - functions. - -2002-12-16 Jeffrey Stedfast - - * mail-format.c #define a STANDARD_ISSUE_TABLE_OPEN string used - for wrapping textual message parts to keep them being fully-left - justified. - (mail_format_raw_message): Wrap the content with a table so that - text isn't fully left-justified. - (write_hr): Use it here too. - (handle_text_plain): And finally here. - -2002-12-16 Jeffrey Stedfast - - * mail-display.c (mail_error_printf): Use camel_text_to_html() - instead of e_text_to_html(). - (mail_text_write): Write the content directly to gtkhtml through - an html stream filter. - - * mail-format.c (attachment_header): Use camel_text_to_html() - instead of e_text_to_html(). - (write_text_header): Same. - (write_address): Here too. - (mail_get_message_rfc822): And here. - (mail_get_message_body): And finally here. - -2002-12-16 Jeffrey Stedfast - - * mail-format.c (handle_text_plain): Re-implemented to use - streams. Also no need to check for html since - camel-mime-part-utils.c now does this for us and will re-tag the - mime-type as text/html thus the UI can be completely ignorant of - this process. - (handle_text_plain_flowed): Removed. - (write_one_text_plain_chunk): Removed. - (try_uudecoding): Removed. - (try_inline_binhex): Removed. - (handle_text_enriched): Re-implemented to use streams too. - -2002-12-15 Jeffrey Stedfast - - * mail-format.c (write_text_header): Change the order of the args - to be consistant with other write functions. - (write_date): Same. - (write_field_row_begin): Here too. - (write_headers): Here too. - (write_one_text_plain_chunk): Don't strdup just to pass it to - mail_text_write() so that it can dup it yet again into html text - and dup it yet a 3rd time into a GByteArray. Instead just write it - to gtkhtml. - (handle_*): Fixed arguments to take a MailDisplayStream instead of - a GtkHTML widget and a GtkHMLStream. - - * mail-display.c (mail_display_render): Create a MailDisplayStream - to pass to mail_format_mime_message() and - mail_format_raw_message(). - - * mail-display-stream.[c,h]: New stream to replace - mail-stream-gtkhtml.c - - * mail-stream-gtkhtml.[c,h]: Removed. - -2002-12-13 Jeffrey Stedfast - - * mail-callbacks.c (check_send_configuration): Make sure the - folder-browser is not NULL or we'll crash. - - * mail-preferences.c (mail_preferences_construct): Fix the colour - code to get a guint32 rgb correctly (I think - can't test because - the shell keeps crashing, yay). - - * message-tag-followup.c (construct): Don't re-use cell renderers - - I'm not sure this is actually safe to do. - - * mail-session.c: Get rid of unneeded CamelObject casts. - (user_message_response): Don't unref the dialog object after we've - destroyed it. - - * mail-display.c (write_data_to_file): Don't unref the dialog - object after we've destroyed it. - - * mail-callbacks.c: Same here. - - * component-factory.c: Here too. - - * message-tag-editor.c: Added MESSAGE_TAG_EDITOR_GET_CLASS macros. - -2002-12-12 Jeffrey Stedfast - - * mail-accounts.c (mail_accounts_tab_construct): Setup - double-click here. - -2002-12-12 Jeffrey Stedfast - - * mail-accounts.c (account_delete_clicked): Get rid of the ETable - #ifdef's - we won't ever be using ETable. - (account_default_clicked): Same. - (account_able_clicked): Here too. - (mail_accounts_load): And here. - (mail_accounts_treeview_new): Renamed from etable_new since we - won't ever be using an etable. - (mail_accounts_tab_construct): And finally here. - -2002-12-12 Not Zed - - * folder-browser.c (my_folder_browser_init): cast a-warning a-way. - - * mail-composer-prefs.c (spell_setup): Terminate list_store_set - with -1. - - * mail-accounts.c (mail_accounts_etable_new): clist -> gtktreeview - stuff. Yes, this is not an etable. - (mail_accounts_tab_construct): Same. - (mail_accounts_load): Same. - (account_cursor_change): Same. - (account_able_clicked): And this. - (account_default_clicked): Same. - (account_delete_clicked): Guess? - (account_edit_clicked): And here too. - -2002-12-11 Jeffrey Stedfast - - * mail-format.c (mail_format_data_wrapper_write_to_stream): New - function to handle a lot of the filtering/etc that was done in - mail_format_get_data_wrapper_text(). This is the first step toward - getting rid of e-text-to-html crap and using my tohtml stream - filter instead. - (mail_format_get_data_wrapper_text): Use the new function. - (mail_format_raw_message): Use camel streams to write the content - to gtkhtml rather than using get_data_wrapper_text() and then - converting that to html and then writing it to the gtkhtml stream. - -2002-12-10 Not Zed - - * mail-composer-prefs.c (mail_composer_prefs_construct): language - is a treeview now. Not sure what to do with it yet, but get rid - of one warning anyway. - (mail_composer_prefs_construct): Same for sig_clist, but setup - model. - (sig_fill_clist): Change to use a gtktreeview instead of a clist. - (sig_selection_changed): New method to handle signature selection - changes with the new widgets. - (sig_delete): clist -> treeview. - (mail_composer_prefs_new_signature): Same. - (sig_edit): ditto. - (sig_current_sig): removed. - (sig_row_unselect): Removed. - (sig_row_select): Removed, now redundant. - (spell_select_lang): Removed, redundant. - (spell_set_ui_language): New implementation using list model more - effectively. - (spell_get_language_str): Same here. - (spell_set_ui_language): Removed this too, merged into - spell_set_ui, it was just wasting stack space. - (spell_language_selection_changed): renemd from - spell_language_select_row, converted to gtktreeview, etc. - (spell_language_unselect_row): Removed. - (spell_language_enable): Redone to use tree model. - (spell_language_button_press): Removed, i dont think this is - needed anymore. - (spell_setup): dont hook onto redundant signals. - - * mail-config-factory.c (config_control_factory_cb): ignore - mail-font-prefs in a different way (so we dont assert) - -2002-12-09 Chris Toshok - - * mail-session.c (pass_response): pass "Mail" to e_passwords_*. - (do_get_pass): same. - (main_forget_password): same. - (mail_session_get_password): same. - (mail_session_remember_password): same. - (mail_session_forget_password): same. - - * mail-config.c (mail_config_write_on_exit): pass "Mail" to - e_passwords_*. - - * main.c (main): e_passwords_init is gone. - -2002-12-03 Jeffrey Stedfast - - * mail-callbacks.c (guess_me_from_accounts): Use the same logic as - mail_generate_reply(). Fixes bug #34882 - - Fixes bug #34315 - - * component-factory.c (message_rfc822_dnd): Return TRUE if we - successfully handled all messages in the mbox stream, or FALSE - otherwise. - (destination_folder_handle_drop): For TEXT_URI_LIST, use the - retval from message_rfc822_dnd() rather than relying on an - exception, because one will not always necessarily be set. For - MESSAGE_RFC822, also use the retval from message_rfc822_dnd(). - -2002-12-03 Not Zed - - * folder-browser.c (folder_browser_finalise/destroy): frobbed - around with these till it exits without crashing. - - * message-list.c (message_list_destroy): made a destroy - handler again (was dispose). Frobbed around with this and - finalise till it can destroy without crashing. - - * message-browser.c (message_browser_new): ref/sink the - folderbrowser. - -2002-11-25 Radek Doulik - - * mail-preferences.c (mail_preferences_construct): magic_check --> - magic_links_check - -2002-11-27 Not Zed - - * message-tag-followup.c (construct): gnome_pixmap -> gtkimage. - (construct): gtk_clist -> gtk_tree_view, setup columns. They dont - size well :-/ - (message_tag_followup_append_message): Append using model, remove - clist stuff. - (construct): Show date edit (glade bugs?) - - * folder-browser.c (folder_browser_class_init): gtk_marshal -> g_cclosure_marshal - (setup_popup_icons): gnome_pixmap -> gtk_image. - (on_right_click): gtk_pixmap -> gtk_image. - - * mail-accounts.c (account_delete_clicked): removed #if 0'd out code. - - * mail-send-recv.c (receive_done): remove FIXME and extra unref. - - * mail-session.c (request_password): Removed #if 0'd out stuff. - - * mail-vfolder.c (new_rule_clicked): proper cast for g_object_get_data. - - * mail-local.c (reconfigure_response): cast for g_object_get_data. - - * mail-account-editor.c (construct): GNOME_DIALOG -> GTK_DIALOG. - - * *.[ch]: re-ran fix.sh for e_notice change - - * mail-callbacks.c (save_msg_ok): g_object_get_data + - gtk_object_remove_no_notify -> g_object_steal_data. - (find_socket): gtk_container_children -> - gtk_container_get_children - (edit_msg): gnome_*_dialog -> gtk_message_dialog. - (resent_msg): " - (search_msg): " - (confirm_goto_next_folder): gtkmessagedialogised (even if not - used). - (confirm_expunge): gtkmessagedialogised - (filter_edit): " - (do_mail_print): e_notice -> gtk_message_dialog. - (are_you_sure): removed e_gnome_ok_cancel_dialog crap, replaced - with a gtk dialog. - (are_you_sure): gtkmessagedialogised. - (edit_msg_internal): Dont free uids array, are_you_sure() free's - it. - (resend_msg): Same. - (check_send_configuration): Use e_notice for stuff. Sigh, here we - go again ...! - (e_question): A utility function to ask a question, potentially - with 'dont ask again' as well. - (configure_mail): use e_question to save code. Here we go again, - again ... - (ask_confirm_for_unwanted_html_mail): " - (ask_confirm_for_only_bcc): " - (ask_confirm_for_only_bcc): " - (composer_get_message): Use e_notice. - (composer_save_draft_cb): Use e_question - (edit_msg): use e_notice, & change to an ERROR. - (resend_msg): same. - (save_msg_ok): Properly initialise ret to OK, and use e_question, - and use access() to determine existance/write access rather than - stat, display an error if we can't write to a file that exists, - and print the filename in all dialogues. - (confirm_goto_next_folder): Use e_question. - (confirm_expunge): use e_question. - (filter_edit): Use e_notice. - (do_mail_print): use e_notice. - -2002-11-26 Not Zed - - * mail-vfolder.c (vfolder_gui_add_rule): clicked->response signal - for gtk dialogue. - (new_rule_clicked): Dont unref after destroy (duh, idiot again). - (edit_rule_response): Same here. - (mail_vfolder_delete_uri): Connect response signal to - gtk_widget_destroy directrly using g_signal_connect_swapped. - (close_dialogue): Removed, as no longer needed. - - * message-list.c (get_normalised_string): Duh idiot, "un-fixed" - the memleak i added. - - * mail-callbacks.c (composer_get_message): Set parent window in - message dialogue & DESTROY_WITH_PARENT flag. - (composer_save_draft_cb): - (configure_mail): - (check_send_configuration): Add DESTROY_WITH_PARENT flag to - gtk_message_dialog's - (local_configure_done): remove some unecessary/wrong casts. - (empty_trash_expunged_cb): " - (do_mail_print): use gtk_window_set_transient_for instead of - e_dialog_set_parent. - -2002-11-26 Not Zed - - * mail-account-editor.c (mail_account_editor_new): - gtk_widget_set_parent_window -> gtk_window_set_transient_for. - - * mail-callbacks.c (composer_send_queued_cb): dont unref composer. - - * message-browser.c (message_browser_destroy): moved back from - finalise. - -2002-11-25 Not Zed - - * message-list.c (message_list_dispose): move saving tree state - here. - (message_list_finalise): And take it from here. - - * mail-display.c (mail_display_destroy): @#$@# gtk. changed this - around a bit. - (mail_display_init): Fix prototype, its a gobject. - (mail_display_init): ref/sink the invisible gtkobject. - -2002-11-22 Not Zed - - * mail-callbacks.c (ask_confirm_for_unwanted_html_mail): removed - e_messagebox, and use gtk_message_dialog directly. - (ask_confirm_for_empty_subject): and here. - (ask_confirm_for_only_bcc): And here too. - (msgbox_destroy_cb): Removed, since no longer needed. - -2002-11-15 Harry Lu - - * mail-display.c (write_data_to_file): Show file name when prompt - to user for overwrite. Fixes bug #34180. - -2002-11-21 Harry Lu - - * mail-display.c (do_attachment_header): Enable dragging of all - attachments. For bug #34327. - -2002-11-21 Jeffrey Stedfast - - * mail-preferences.c (mail_preferences_construct): Since the - GSList returned from gconf needs to be free'd by us, we don't need - to strdup the values. Also make sure we don't leak the GSList - itself. - (mail_preferences_apply): Don't leak our GSList data. - -2002-08-30 Radek Doulik - - * mail-display.c (mail_display_render): don't set margins for raw - message view - - * mail-format.c (mail_format_raw_message): as below - (handle_text_plain_flowed): as below - (mail_format_raw_message): don't use data_urls - - * mail-display.c (mail_text_write): put text in iframe, so it has - margins and should not be placed in table which changes wrapping - behavior - -2002-11-20 Jeffrey Stedfast - - * mail-composer-prefs.c (mail_composer_prefs_construct): gconfify. - (mail_composer_prefs_apply): gconfify this also. - - * mail-preferences.c (mail_preferences_construct): - gconf_client_get_string() probably returns an allocated buffer. - -2002-11-20 Not Zed - - * importers/Makefile.am (%.server.in): provide a proper implicit - rule for building .server.in from .server.in.in. The other one - just copied the first target to all destinations(!). - - * importers/evolution-outlook-importer.c (outlook_factory_fn): - destroy -> weak ref. - -2002-11-19 Jeffrey Stedfast - - * mail-preferences.c (mail_preferences_apply): Save the settings - via gconf. - (mail_preferences_construct): Load the values from gconf. - -2002-11-19 Radek Doulik - - * mail-composer-prefs.c (sig_load_preview): use - gtk_html_begin_content to specify utf-8 - -2002-11-19 Not Zed - - * importers/evolution-mbox-importer.c (mail_importer_module_init): - fix warning message, outlook->mbox. - - * importers/Makefile.am: fix serverdir to point to - $libdir/bonobo/servers. - - * mail-callbacks.c (addrbook_sender): add type to - bonobo_widget_set_property. - - * mail-vfolder.c (vfolder_editor_response): dont unref after destroy. - - * mail-session.c (pass_response): dont unref aftrer destroy. - - * mail-local.c (reconfigure_response): dont unref after destroy. - - * mail-display.c (launch_cb): dont unref after destroy. - (launch_cb): " - (drag_data_get_cb): " - (html_button_press_event): add type to bonobo_widget::set_property - - * mail-config.c (mail_config_check_service): dont unref after - destroy. - - * component-factory.c (send_receive_cb): dont unref after destroy. - (request_quit): " - - * mail-signature-editor.c (mail_signature_editor): Use version 3.0 - of gtkhtml editor interfaces. - (do_exit): dont unref after destroy. - (format_html_cb): Add type to bonobo_widget::set_property. - -2002-11-18 Radek Doulik - - * mail-composer-prefs.c (spell_setup_check_options): check - exception state and take care when exception raised - -2002-11-18 Jeffrey Stedfast - - * mail-accounts.c (mail_accounts_load): Specify the default - account. Also, don't need to use e_utf8_to_gtk_string() here. - -2002-11-18 Not Zed - - * Makefile.am (evolution_mail_LDADD): Added back - libevolution-importer stuff. - (SUBDIRS): Added back importers. - - * importers/evolution-mbox-importer.c (load_file_fn): build the - uri without deprecated funcs. - (load_file_fn): dont free/alloc a camel_exception for no obvious - purpose. - (mbox_factory_fn): use weak_ref rather than destroy. - (importer_destroy_cb): fix signature for weak ref notify. - (mbox_factory_fn): add cid param. - - * importers/*.[ch]: ran fix script over everything. - - * importers/*.server.in.in: Added bonobo activation files. Moved - evolution-mail to @LIBEXEC@ as below. - - * importers/Makefile.am: oaf->bonobo activation stuff. - - * importers/evolution-outlook-importer.c (outlook_factory_fn): Add - component id to callback. - -2002-11-15 Ettore Perazzoli - - * Makefile.am: Add rules to substitute @LIBEXEC@ in - GNOME_Evolution_Mail.server.in.in and install evolution-mail in - $(libexecdir) instead of $(bindir). - - * GNOME_Evolution_Mail.server.in.in: Replaced evolution-mail with - @LIBEXECDIR@/evolution-mail. - -2002-11-15 Rodney Dawes - - * component-factory.c: Use bonobo_main_quit instead of gtk - -2002-11-15 Jeffrey Stedfast - - * mail-composer-prefs.c (sig_edit): Correctly spell Advanced. - -2002-11-15 Not Zed - - * mail-summary.c (create_summary_view): weak notify -> ref. - - * mail-send-recv.c (build_dialogue): weak notify -> ref. - - * mail-accounts.c (account_edit_clicked): weak notify -> ref, i - presume this is what jeff meant, 'cause it dont compile otherwise. - -2002-11-14 Jeffrey Stedfast - - * mail-accounts.c (account_edit_clicked): Use g_object_weak_ref - rather than connecting to destroy. - (account_add_clicked): Same. - - * mail-callbacks.c (addrbook_sender): Make this use - g_object_weak_notify also. - (subscribe_dialog_destroy): Add NULL guards here since I think we - really do want to connect to the "destroy" signal in the function - that connects us to that signal. - - * mail-config-factory.c (config_control_factory_cb): Same. - - * mail-display.c (save_part): Here too. - (make_popup_window): And here. - - * mail-send-recv.c (build_dialogue): Same here. - - * mail-summary.c (create_summary_view): Use g_object_weak_notify - instead of connecting to the destroy signal. - -2002-11-14 Ettore Perazzoli - - * component-factory.c (owner_set_cb): Want a (GWeakNotify) cast - here, not (GWeakNotify *). - - * subscribe-dialog.c (fete_init): g_object_set() instead of - gtk_object_set(). - (populate_store_list): Likewise. - (menu_item_selected): g_object_get_data() instead of - gtk_object_get_data(). - - * message-list.c (message_list_create_extras): g_object_set() - instead of gtk_object_set(). - - * message-browser.c (message_browser_message_list_built): - g_object_get_data() instead of gtk_object_get_data(). - - * mail-vfolder.c (edit_rule_response): g_object_get_data() instead - of gtk_object_get_data(). - - * mail-summary.c (generate_folder_summaries): g_object_unref() the - context instead of gtk_object_destroy(). - - * mail-local.c (reconfigure_response): g_object_get_data() instead - of gtk_object_get_data(). - - * mail-display.c (pixbuf_gen_idle): g_object_unref() the GdkPixbuf - loader instead of gtk_object_destroy(). - (pixbuf_gen_idle): Likewise. - (embeddable_destroy_cb): Likewise. - - * mail-config-druid.c (mail_config_druid_destroy): No need to - gtk_object_destroy() the GladeXML object. - (construct): g_object_set() instead of gtk_object_set(). - - * folder-browser.c (folder_browser_gui_init): g_object_get_data() - instead of gtk_object_get_data(). - -2002-11-14 Not Zed - - * component-factory.c (create_view): shell client objref. - (mail_add_storage): " - (mail_remove_storage): " - -2002-11-13 Joe Shaw - - * Makefile.am: Remove a couple backslashes that were causing - automake to complain, even though they were on lines that were - -commented out-. Sigh. - -2002-11-13 Ettore Perazzoli - - * folder-info.c (evolution_folder_info_factory_fn): Use - g_object_new() instead of gtk_type_new(). - * folder-browser.c (folder_browser_new): Likewise. - * mail-account-gui.c - (mail_account_gui_folder_selector_button_new): Likewise. - * mail-font-prefs.c (mail_font_prefs_new): Likewise. - -2002-11-13 Ettore Perazzoli - - * mail-format.c: Do not #include . - * mail-importer.c: Likewise. - * mail-mt.c: Likewise. - * mail-ops.c: Likewise. - * mail-search-dialogue.c: Likewise. - * mail-session.c: Likewise. - * mail-vfolder.c: Likewise. - * message-tag-followup.c: Likewise. - * main.c: Likewise, and . - - * mail-callbacks.c: Do not #include . - (do_mail_print): Remove the GnomePaper local variable. - -2002-11-13 Not Zed - - * component-factory.c (owner_set_cb): destroy->weak ref. - (owner_set_cb): shell client changes. - - * mail-signature-editor.c (mail_signature_editor): bonobo api changes. - - * mail-local.c (save_metainfo): go back to using xmlSaveFile. - - * Makefile.am: Removed libevolution-importer from mail. - -2002-11-13 Not Zed - - * GNOME_Evolution_Mail.server.in.in: Added to cvs. Currently - contains no configurable stuff, but maybe it will one day. - - * Makefile.am (server_DATA): change oaf stuff to server stuff for - bonobo activation. - - * mail-preferences.c (mail_preferences_apply): handle const entry text. - - * mail-composer-prefs.c (url_requested): Fixed typo. - (mail_composer_prefs_construct): gnomepixmap->gtkimage. - - * mail-callbacks.c (configure_mail): destroy dialogue before dealing - with response. - (mail_generate_reply): Fix a typo. - (popup_listener_cb): fix prototype. - (tag_editor_response): Handle gtk dialog response. - (flag_for_followup): Change gnome dialog to gtk dialog stuff. - (tag_editor_destroy_cb): - (tag_editor_cancel): - (tag_editor_ok): Removed, handled in _response(). - (filter_editor_response): renamed from _clicked, handle gtk - dialogue signal. - (filter_editor_destroy): Removed. - (footer_info_new): gnome font api changes. - (do_mail_print): port to gnome print 2. - - * mail-autofilter.c (mail_filter_delete_uri): message_dialog uses - a specific button enum, not the stock ones. - - * mail-accounts.c (mail_accounts_tab_get_type): gobjectify. - (account_delete_clicked): gdkdialogise. - - * mail-account-gui.c (mail_account_gui_setup): Hack around font - metric determination code. - - * mail-account-editor.c (mail_account_editor_get_type): - gobjectise. - (mail_account_editor_new): "" - - * folder-info.c (evolution_folder_info_notify_ready): use pbclient - interface. - - * folder-browser-factory.c (control_destroy_cb): fix a typo. - (folder_browser_factory_new_control): More typos. - - * folder-browser.c (on_right_click): cast around const warning. - (context_menu_position_func): fix for api change. - - * e-searching-tokenizer.c (e_searching_tokenizer_finalise): - Changed from destroy since it only frees memory. - (e_searching_tokenizer_get_type): glibify. - - * component-factory.c (request_quit): gtkdialogise. - (send_receive_cb): " - (create_component): gdk_pixbuf api. - (component_factory_init): bonobo activation stuff. - (warning_response): renamed from warning_clicked. - (owner_set_cb): gtkdialogise. - -2002-11-12 Jeffrey Stedfast - - * Makefile.am: Added files I've ported. - - * mail-config.c: Remove gnome-defs.h, this header no longer exists - in GNOME2. - -2002-11-13 Not Zed - - * Makefile.am: Commented out stuff that doesn't build yet. Also - fixed idl build rule. importers still not built. - - * main.c (main): bonobactivationise. remove push visual/colormap. - (main): no longer activate activation, let bonobo_init do it. - - * mail-signature-editor.c (menu_help): Change help api. - - * mail-session.c (user_message_destroy_noreply): removed. Not - used? - - * mail-local.c (load_metainfo): xml root->children. - - * mail-format.c (g_string_append_len): Removed, it exists now. - -2002-11-12 Not Zed - - * subscribe-dialog.c: gnome2ised, use gtkdialog. - (subscribe_get_global_extras): use a weak ref rather than destroy - signal. - - * message-tag-followup.c: gnome2ised. - - * message-tag-editor.c: gnome2ised & converted to gtkdialog. - - * message-list.c: gnome2ised. - (message_list_finalise): From destroy method. maybe should be - destroy still. - - * message-browser.c: port to gnome2 - (message_browser_finalise): renamed from destroy method. - - * mail-stream-gtkhtml.c: removed redundant - camel_class_get_global_classfuncs() call. - - * mail-signature-editor.c: gtkdialogised, & bonobo api changes. - - - * mail-search-dialogue.c: gtkdialogised. - - * mail-folder-cache.c: cleaned up camel ref/hook casts. - - * mail-composer-prefs.c (mail_composer_prefs_get_type): convert to - gtype. - - * mail-font-prefs.c (mail_font_prefs_destroy): from finalise. - - * mail-config.c: s/bonobo_config/e_config_listener/ Added - /apps/Evolution prefix to the evolution keys. Changed to use - e_config_listener, etc. - (mail_config_init): remove bonobo_config stuff. - (mail_config_check_service): gtk dialogise. - (check_response): from check_cancelled. - - * mail-config-druid.c (mail_config_druid_destroy): renamed from - _finalize, turned into destroy handler. - (construct): set type to toplevel, GTK_WINDOW_DIALOG no longer - exists. - - * mail-config-factory.c (mail_config_register_factory): bonobo api - changes. - - * mail-crypto.c (mail_crypto_get_pgp_cipher_context): cleaned up - unref casts. - - * mail-display.c (write_data_to_file): gnome->gtkdialog. - (on_link_clicked): use ascii_str*cmp on url. - (save_part): g_path stuff. - (launch_cb): gtk dialog. - (pixmap_press): de-oafify. - (pixbuf_for_mime_type): gnome-vfs api changes. - (do_attachment_header): Change the pixmap to a gtkimage. - (do_signature): " - (pixbuf_gen_idle): " - (do_attachment_header): ascii_str*cmp - (do_attachment_header): gnome pixmap->gtkimage. - (mail_display_destroy): protect against gtk mentalness. - (html_button_press_event): ascii_str*cmp - (drag_data_get_cb): added comment for translators of filename. - - * mail-format.c (component_supports): de-oafise. - (is_anonymous): ascii_strncmp - (attachment_header): remove utf8<>locale stuff, and gnomevfs api - changes. - (format_mime_part): fix g_strdown call. - (write_field_row_begin): kill utf8->gtk stuff. - (write_address): " - (default_header_index): ascii_strcasecmp - (handle_text_plain): " - (handle_text_enriched): " - (handle_multipart_encrypted): remove utf/gtk stuff. - (handle_message_external_body): ascii_str*cmp - - * mail-identify.c (mail_identify_mime_part): - (identify_by_magic): gnome vfs api changes. - - * mail-importer.c: Converted. - - * mail-local.c (load_metainfo): xml childs -> children. - (mls_get_folder): g_strerror. - (mls_delete_folder): g_strerror. - (reconfigure_got_folder): Gnome->GtkDialog - (reconfigure_response): from reconfigure_clicked. - - * mail-mt.c (mail_msg_check_error): gnome -> gtk dialog - (error_response): renmae from error_gone. destroy widget on any - response. - - * mail-offline-handler.c (impl_finalise): renamed from - impl_destroy since thats what it should be anyway. - - * mail-ops.c: removed utf8 widget conversion & camel_object_un/ref - casts. - - * mail-preferences.c (mail_preferences_get_type): glib2'ised. - - * mail-search.c (mail_search_finalise): renmaed from destroy & - properly chain. - (mail_search_get_type): glib2 & make gtkdialog parent. - (entry_run_search): run search when entry activated. not sure if - gtkdialog has anohter way to do this on an arbitrary widget. - - * mail-send-recv.c (dialogue_response): renamed from clicked. Use - gtkdialog. - - * mail-session.c (request_password_deleted): removed, redundant. - (pass_response): rename from pass_got, changed for gtkdialog. - (user_message_destroy): Removed, redundant. - (user_message_response): Renamed from user_message_clicked. - -2002-11-11 Not Zed - - * mail-stream-gtkhtml.c (mail_stream_gtkhtml_class_init): dont use - get_global_classfuncs, just get the type - - * mail-tools.c: converted gnome2 api's. - - * mail-vfolder.c (vfolder_editor_response): clicked->response. - (vfolder_editor_destroy): Removed. - (vfolder_edit): gtk dialog api - (edit_rule_response): clicked->response. - (vfolder_edit_rule): gnomedialog->gtkdialog. - (vfolder_gui_add_rule): " - (new_rule_clicked): clicked->response - -2002-11-11 Jeffrey Stedfast - - * mail-callbacks.c: Half way ported. I'll finish the rest later. - - * mail-autofilter.c: Ported. - - * mail-account-gui.c: Ported. - - * mail-account-editor.c: Ported. - - * folder-browser-ui.c: Ported. - - * folder-browser-factory.c: Ported. - - * folder-browser.c: Ported. - - * e-searching-tokenizer.c: Roughly ported. - -2002-11-10 Jeffrey Stedfast - - * *.glade: Converted to libglade-2's format. - -2002-11-08 Jeffrey Stedfast - - * mail-composer-prefs.c: Ported. - -2002-10-28 Jeffrey Stedfast - - * folder-browser.c (folder_browser_query_changed): No longer need - to check for a CLEAR_ID. - -2002-10-28 Larry Ewing - - * mail-format.c (handle_multipart_mixed): instead of bailing with - an assertion dump the body. - -2002-10-27 Larry Ewing - - * mail-display.c (fetch_next): don't queue the action until we've - added ourselves to the active list, because the fetch_done - callback can fire immediately and we'll end up queueing something - that has already been destroyed. - -2002-10-24 Jeffrey Stedfast - - Update the upgrade script to handle the new url format introduced - with NotZed's most recent commits. - - * upgrade-mailer.c (mailer_upgrade): Save an encoded version of - the namespace too, for use later. - (si_free): Free the encoded namespace too. - (imap_url_upgrade): Use the encoded namespace when creating the - new url. - (shortcuts_upgrade_xml_file): Upgrade the default: urls. Fixes bug - #32127. - -2002-10-25 Not Zed - - * mail-config.c (mail_config_uri_renamed): Always strdup the new - key in the threaded/preview hash/always free the working copy. - For #32799. - -2002-10-24 Jeffrey Stedfast - - * mail-display.c (write_data_to_file): Use the mode 0666 when - creating a new file and let the user's umask handle permissions. - - * folder-browser.c (message_list_drag_data_get): When using open() - with the O_CREAT flag, we need to pass a mode argument. Also use - O_EXCL. - -2002-10-24 Not Zed - - * subscribe-dialog.c (fe_got_children): Use a hashtable to only - insert nodes we dont have already, rather than relying on the - scanning logic. Also, only re-sort this tree level once done - rather than on each insert. - (folder_etree_init): Setup hash to track nodes setup. - (folder_etree_clear_tree): Reset hash. - (fe_destroy): Free hash. - -2002-10-23 Jeffrey Stedfast - - * folder-browser.c (folder_browser_query_changed): Only perform - the search if it is either a clear or advanced search. - -2002-10-22 Mike Kestner - - * mail-callbacks.c (transfer_msg): pass fb->uri to the folder - selection dialog so the current folder is selected on display. - "fixes" 15966. - -2002-10-21 Dan Winship - - * upgrade-mailer.c (mailer_upgrade): Fix the transport URL on any - Exchange accounts. Fixes #30209, which is to say that it fixes - #28490 correctly. - -2002-10-17 Jeffrey Stedfast - - * mail-tools.c (mail_tool_quote_message): Strip the signature from - the body-text. Fixes bug #5529. - -2002-10-16 Jeffrey Stedfast - - * mail-format.c (handle_multipart_signed): Don't need to pass a - path to camel_gpg_context_new () anymore. - (mail_get_message_body): Same here. - (handle_multipart_encrypted): Use camel_gpg_context_new () instead - of mail_crypto_get_pgp_cipher_context (). - - * mail-preferences.c (mail_preferences_construct): There's no - security tab anymore. - (mail_preferences_apply): No need to save any pgp config data, - there's nothing to configure! - - * mail-crypto.c (mail_crypto_get_pgp_cipher_context): Updated to - not pass a pgp path into camel_gpg_context_new (). - - * mail-config.c (mail_config_clear): No need to free a pgp_path - variable anymore, we don't need one. - (config_read): Don't read in a pgp-path or pgp-type anymore. - (mail_config_write_on_exit): Don't save a pgp-path or pgp-type - anymore, we don't use them. - (pgpopen): Removed. - (pgpclose): Removed. - (mail_config_pgp_type_detect_from_path): Removed. - (auto_detect_pgp_variables): Removed. - (mail_config_get_pgp_type): Removed. - (mail_config_set_pgp_type): Removed. - (mail_config_get_pgp_path): Removed. - (mail_config_set_pgp_path): Removed. - -2002-10-16 Jeffrey Stedfast - - * mail-callbacks.c (mail_generate_reply): If mode == REPLY_LIST - and the mlist is "" (we only checked NULL before), change the mode - to REPLY_ALL so that we don't accidently reply to the user's - address. Fixes bug #28735 - -2002-10-12 Jeffrey Stedfast - - * mail-callbacks.c (mail_generate_reply): If we are trying to - reply to a list, first check that we can by getting the mlist - token (makes it easier to fix the mem leak). If not, then change - the mode to REPLY_ALL. If we can reply to list, the make sure we - free the CamelMessageInfo when we're done so we don't leak. - -2002-10-15 Jeffrey Stedfast - - * mail-session.c (main_get_filter_driver): Add the new-mail-notify - rule to the filter driver before adding the user defined filter - rules so that we can be sure that the new-mail-notify rule gets - invoked. Fixes bug #32328. - - * mail-composer-prefs.c (mail_composer_prefs_new_signature): Make - sure that name[0] cannot ever be NULL. Should maybe fix bug - #32230. - -2002-10-15 Dan Winship - - * upgrade-mailer.c (shortcuts_upgrade_xml_file): Change the type - in LDAP shortcuts from "ldap-contacts" to "contacts/ldap". Rewrite - this to use libxml since that was easier than trying to make the - old code do both kinds of changes at once. - -2002-10-10 Jeffrey Stedfast - - * mail-config-druid.c (management_prepare): Only set an account - name if one doesn't already exist. Also use the - e_utf8_gtk_entry_get/set_text functions since account names are - supposed to be in UTF8. Fixes bug #31891. - -2002-10-09 Jeffrey Stedfast - - * folder-browser.c (main_folder_changed): Don't do anything if the - message_list is NULL (this means the FolderBrowser has been - destroyed). Fixes bug #32002. - -2002-10-08 Jeffrey Stedfast - - * component-factory.c (storage_remove_folder): The CamelFolderInfo - that we get back has nodes for all parent folders, so do not - delete all folders that have nodes in the returned tree. Instead, - descend into the tree until we find the folder we want to delete - and start deleting from there. - -2002-10-08 Jeffrey Stedfast - - * mail-signature-editor.c (mail_signature_editor): Mark a string - for translation, fixes bug #31942. Thanks to kmaraas@gnome.org for - this patch. - - * mail-offline-handler.h: Don't #include config.h here. Fixes bug - #31941. - -2002-10-07 Jeffrey Stedfast - - * mail-composer-prefs.c (spell_load_values): Don't mark "en" for - translation. Fixes bug #31788. - - * mail-config.glade: Removed a "xxxxxxxxxxx" string so that - translators don't need to translate it. It was only a filler - string. Fixes bug #31789. - -2002-10-02 Jeffrey Stedfast - - * mail-callbacks.c (mail_generate_reply): Don't default 'me' to - the source account until after we've tried to detect the account - based on recipients. When adding accounts to the account hash, if - any accounts have identical email addresses, the ones that are - enabled take precedence over ones that aren't. This will hopefully - make everyone happy with reply account picking. Fixes bug #31693. - -2002-10-01 Larry Ewing - - * mail-display.c (drag_data_get_cb): add support for dragging the - content type directly. - (do_attachment_header): add the target for the mime type to the - drag source. - (drag_data_get_cb): silence warning. - -2002-10-01 Jeffrey Stedfast - - * mail-config-druid.c (get_fn): Connect to the changed signal for - the reply_to entry box. Fixes bugs #31553 and #31554. - - * mail-composer-prefs.c (spell_setup): Only setup the languages if - the language_seq is not CORBA_OBJECT_NIL. Fixes bug #31559 - (presumably at least). - - * mail-account-gui.c (mail_account_gui_new): Use - e_utf8_gtk_entry_set_text for the email address and reply-to - fields. Fixes bug #31555. - - * mail-format.c (mail_get_message_body): Handle a - multipart/encrypted part. Fixes bug #31547. - - * upgrade-mailer.c: Shut up some compiler warnings. - - * importers/evolution-mbox-importer.c (process_item_fn): Use the - camel_message_info_new/free functions rather than g_new0 and - g_free. Also, if we fail to parse a message make sure we don't - later try to use that message object. - (get_info_from_mozilla): Use camel_message_info_new and strtoul - instead of string_to_int. - -2002-09-30 Jeffrey Stedfast - - * subscribe-dialog.c (fe_node_to_shell_path): Removed (useless). - -2002-10-01 Ettore Perazzoli - - [Fix #24732] - - * importers/evolution-mbox-importer.c (process_item_fn): Set - deleted to FALSE when not having Mozilla status headers. Before - it was being left uninitialized and so there was a pretty good - chance that its value would be nonzero and hence the message would - not be imported... - -2002-10-01 Not Zed - - * folder-browser.c (on_cursor_activated): cursor activated on - etable is required to know when the selection changes on a single - row, update selection changed info with this signal too. Sounds - like an etable bug to me, but this fixes #29808. - (folder_browser_gui_init): Hook onto above signal. - -2002-09-30 Aaron Weber - - * mail-signature-editor.c (mail_signature_editor): change - string to "Enter a name for this signature" on line 372. - - * mail-callbacks.c (ask_confirm_for_unwanted_html_mail): change - HTML-mail warning on 255 - - * component-factory.c (component_factory_init): change - "Evolution's foo" to "the Evolution foo" in string on 1078 - -2002-09-30 Not Zed - - * mail-session.c (request_password): translate prompt from utf8 to - gtk widget. #31365. - -2002-09-27 Jeffrey Stedfast - - * e-searching-tokenizer.c: #include for alloca - (searcher_next_token): Changed slightly to make sure that m is not - NULL before dereferencing it. Also initialise m to NULL so that it - can't be used uninitialised (NULL is a safe initialised value - here). - (build_trie): Same, but for n. - -2002-09-26 Dan Winship - - * mail-config.c (impl_GNOME_Evolution_MailConfig_addAccount, - impl_GNOME_Evolution_MailConfig_removeAccount): Set a timeout to - call mail_config_write() in 2 seconds. Otherwise changes made by - this interface would not be saved to disk unless the user also - changed some other preference. - (mail_config_write_on_exit): If there's a config_write_timeout - pending, call mail_config_write() too. - -2002-09-25 Dan Winship - - * mail-display.c (mail_display_render): Add a margin around the - "flag for followup" table so it lines up with everything else. - Also, don't add "at your earliest convenience" after the flag if - there's no date set, since that doesn't make any sense for half of - the flags. ("For Your Information at your earliest convenience"). - -2002-09-25 Dan Winship - - * component-factory.c (folder_types): add "mail/public". Leave - "vtrash" as it is rather than renaming it to "mail/vtrash", - because we want it to behave differently from normal mail folders - more often than we want it to behave the same. - (type_is_mail, type_is_vtrash): utility funcs - (create_view, create_folder, remove_folder, xfer_folder, - populate_folder_context_menu, unpopulate_folder_context_menu, - destination_folder_handle_drop, storage_create_folder): Use - type_is_mail/type_is_vtrash. - (create_component): Register "New Post" with "mail/public" instead - of "mail" so it becomes the default New icon for it. (29024) - - * mail-callbacks.c (transfer_msg): Use "mail/*" for allowed type. - - * message-browser.c (transfer_msg): Likewise. - - * mail-account-gui.c (mail_account_gui_new): Use "mail/*" instead - of "mail" here for sent/drafts allowed type. (?) - -2002-09-25 Jeffrey Stedfast - - * upgrade-mailer.c (imap_url_upgrade): NULL-check si->folders - before passing it into find_folder so we don't crash. Fixes bug - #30915. - -2002-09-24 Jeffrey Stedfast - - * folder-browser-ui.c: Allow users to delete already deleted - messages, fixes bug #30827. - -2002-09-24 Not Zed - - * folder-browser.c (folder_browser_query_changed): Always do a - search if the query changed. For #31060 & #29625. - -2002-09-23 Radek Doulik - - * mail-config.c (mail_config_signature_run_script): pass name of - the script as 1st parameter - - * mail-composer-prefs.c (sig_add_script_add): fix entry's glade - name - -2002-09-23 Dan Winship - - * mail-signature-editor.c (exit_dialog_cb): Fix non-ANSI switch - statement. - - * mail-account-gui.c (mail_account_gui_auto_detect_extra_conf): - Likewise. - - * mail-composer-prefs.c (spell_load_values): add some dummy - typedefs to avoid empty macro arguments, which have undefined - behavior. - - * mail-importer.c: #include for OS X - -2002-09-23 Jeffrey Stedfast - - * mail-ops.c (save_part_save): Use 0666 as the create mode so that - the user's umask is used to it's fullest. - -2002-09-23 Dan Winship - - * Makefile.am (idldir, idl_DATA): add these and install Mailer.idl - -2002-09-20 Jeffrey Stedfast - - * mail-preferences.c (mail_preferences_construct): Connect signal - handlers to the GtkHTML preferences so that when the widgets - change we can update the OK/Apply buttons. Also removed the - omenuShortcutsType widget reference since this was not being used? - Fixes bug #30731. - -2002-09-19 Jeffrey Stedfast - - * mail-callbacks.c (do_edit_messages): Unset the changed bit on - the composer and also drop any undo operations (since we loaded - the message into the composer). Fixes bug #30580. - -2002-09-19 Not Zed - - * mail-session.c (main_get_filter_driver): Fix for filter driver - api change. - -2002-09-18 Not Zed - - * mail-config-druid.c (wizard_back_cb): If going back from a page - past our end (i.e. the final page), jump to the last page we know - of. For #29293. - - * component-factory.c (notify_listener_exception): helper to map a - camel excpeiton to a listener result. - (storage_create_folder): Use above to return more meaningful error. - (storage_remove_folder): " - (storage_xfer_folder): ". For #28209. - -2002-09-17 Jeffrey Stedfast - - * mail-display.c (mail_display_render): Use e_strftime_fix_am_pm - here which fixes locale issues as well as working around systems - that don't support %P (afaik). - - * mail-ops.c (prep_offline_do): Cache important messages too. - - * mail-composer-prefs.c (d): Disable debugging printf's - - * mail-ops.c: fixed a comment - -2002-09-13 Dan Winship - - * folder-browser.c (fb_resize_cb): If the vpaned isn't realized, - don't call mail_config_set_paned_size. Fixes a problem with the - saved pane size being repeatedly lost (#29933) - -2002-09-13 Dan Winship - - * Mailer.idl: rename this from "Mail.idl" so that the generated .h - file won't overwrite "mail.h" on Mac OS X. Remove some - never-implemented IDL and add MailConfig_removeAccount. - - * Makefile.am: Update for IDL rename - - * mail-config.c: #include Mailer.h, not Mail.h - (impl_GNOME_Evolution_MailConfig_removeAccount): Implement. - - * folder-info.c: #include Mailer.h, not Mail.h - - * message-list.c: Remove Mail.h include. - -2002-09-12 Jeffrey Stedfast - - * main.c (main): Ignore SIGXFSZ to fix bug #30269. - - * upgrade-mailer.c (cache_upgrade_and_free): The new callback - function for the g_hash_table_foreach which both upgrades the - cache for that store and then free's the struct _storeinfo - afterwards. - (cache_upgrade): Upgrade a cached folder by moving the old cache - folder into the appropriate new location. - -2002-09-11 Jeffrey Stedfast - - * folder-browser.c (folder_browser_query_changed): Only abort if - the user selected ADVANCED_SEARCH, not the other way around. Any - other menu item and we are supposed to perform an actual - search. Fixes bug #30183. - - * mail-display.c (pixbuf_for_mime_type): check the new gnome-vfs - icon_filename key. If that fails, fall back to checking - icon-filename. Also don't leak the fm_icon string and rearranged - some code. - -2002-09-11 Not Zed - - * component-factory.c (configure_folder_popup): Handle file uri's - too. - - * mail-callbacks.c (configure_folder): clear message list before - calling configure folder. - (local_configure_done): completion callback to reset message list - when done. - - * mail-local.c (mail_local_reconfigure_folder): changed args to - accept uri, and done callback. - (reconfigure_got_folder): moved code to callback which presents - the configure uri once we have the folder. - -2002-09-10 Not Zed - - * component-factory.c: Handle file: as well as vfolder: uri's. - Pass both to the normal configure_folder callback. For #20849. - - * folder-browser.c (got_folder): If we already have a folder, make - sure we unref/unhook from it. Fixes a crash on exit. - - * message-list.c (message_list_hide_clear): clear thread tree - cache if set. - (message_list_set_search): Same. For bug #28834. - -2002-09-09 Jeffrey Stedfast - - * folder-browser-ui.c (folder_browser_ui_scan_selection): Make - sure that fb->message_list is non-NULL before checking - fb->message_list->threaded? I guess this'll fix bug #29965. - - * mail-callbacks.c (composer_save_draft_cb): NULL-check the ccd - before reffing it. - (composer_send_cb): Same. - - * upgrade-mailer.c (shortcuts_upgrade_xml_file): Don't look for an - end quote, instead look for to terminate the uri. - (shortcuts_upgrade_uri): Hex decode the imap folder name after - we've constructed the final version of it. - -2002-09-08 Dan Winship - - * upgrade-mailer.c (exchange_url_upgrade): Don't modify the URL if - the path doesn't start with "exchange". (Means it's already a 1.2 - URL.) - (shortcuts_upgrade_uri): Need to hex-decode exchange URLs here too. - (shortcuts_upgrade_xml_file): Fix an off-by-one error here (twice) - so it actually works instead of always claiming shortcuts.xml - doesn't need to be upgraded. - (mailer_upgrade): Check the size of the accounts hash rather than - imap_sources since we have work to do if the user has an exchange - account but no imap accounts. - -2002-09-06 Jeffrey Stedfast - - * upgrade-mailer.c (upgrade): Sync the database after upgrading - mailer stuff. - (imap_url_upgrade): Since we need 'p' if we fail to find the - folder, don't g_free it until later. - (hex_encode): Don't forget to increment inptr after hex encoding a - character. - (exchange_url_upgrade): Apprently exchange uri's are rebelious and - do not want to be hex encoded like every other url, so hex decode - the folder names here before concatenating them onto the base url. - -2002-09-05 Jeffrey Stedfast - - All this snot is to fix bug #29930. What I think was happening was - that the composer's destroy callback got fired off before the - async callback did. - - * mail-callbacks.c (ccd_new): New convenience function to malloc a - new ccd. - (ccd_ref): ccd is now ref_counted (it needs to be) so we now have - this. - (ccd_unref): And we need this now too of course. - (composer_destroy_cb): composer's new destroy callback function - - unref's the ccd. - (composer_send_queued_cb): unref the ccd. - (composer_send_cb): ref the ccd here. - (save_draft_done): unref the ccd. - (composer_save_draft_cb): ref the ccd. - -2002-09-05 Jeffrey Stedfast - - * upgrade-mailer.c (imap_url_upgrade): Hex decode the folder names - when searching for them in the memory buffer, and re-hex encode - them when combining them with the rst of the URL. - (mailer_upgrade): Instead of reading in the storeinfo file as raw - binary data, use the camel-file-utils to correctly parse it. - -2002-09-05 Anna Marie Dirks - - * GNOME_Evolution_Mail.oaf.in: Changed the descriptions of the - fonts, mail, accounts and composer pages of the settings dialog to be - hopefully more descriptive and less confusing. - -2002-09-04 Ettore Perazzoli - - * upgrade-mailer.c (upgrade): Return FALSE here. - (get_base_url): Add a cast. - - * component-factory.c (storage_xfer_folder): Removed unused - variables. - - * Makefile.am: Rename upgrade-mailer to evolution-mail-upgrade. - -2002-09-04 Jeffrey Stedfast - - * Makefile.am: Add upgrade-mailer.c to the build. - - * upgrade-mailer.c: New program to upgrade configuration files - from 1.0 to 1.2. - -2002-09-04 Jeffrey Stedfast - - * mail-callbacks.c (mail_generate_reply): Made sure - account->id->address is not NULL before adding it to the hash - table. This is to prevent bug #29877 from crashing, although it is - still an invalid error condition. - -2002-09-04 Dan Winship - - * folder-info.c (get_prop): Remove the "Get!" printf. - (set_prop): Likewise for "Set!" - -2002-09-04 Ettore Perazzoli - - * mail-account-gui.c (mail_account_gui_save): Remove unused - variable. - - * component-factory.c (unpopulate_folder_context_menu): New. - (create_component): Pass it to evolution_shell_component_new(). - -2002-09-03 Jeffrey Stedfast - - * folder-browser.c (mark_as_seen_cb): - (mark_as_unseen_cb): - (mark_as_important_cb): - (mark_as_unimportant_cb): New callback functions that wrap the - mail-callbacks versions of mark_as_. Thanks to Owen - Taylor for this fix. - -2002-09-04 Not Zed - - * component-factory.c (storage_xfer_folder): Dont translate / to - dir_sep anymore, we always use /. - -2002-08-29 Peter Williams - - * folder-browser-ui.c: Add HAS_FLAGS to a few miscellaneous commands - that don't use IS_xMESSAGE. - -2002-08-28 Dan Winship - - * GNOME_Evolution_Mail.oaf.in: Add an - evolution:shell_component_launch_order and rename - evolution:shell_component_icon. - -2002-08-28 Jeffrey Stedfast - - * mail-display.c (make_safe_filename): Fix some broken logic here, - `p = strrchr (path, '/') + 1` will *never* be NULL!! If the - strrchr returns NULL, then that expression will evaluate to 0x1!! - - * main.c (main): We now always need to init gconf for our later - call to e_proxy_init() which initialises the proxy settings for - soup to use. - -2002-08-28 Peter Williams - - * folder-browser-ui.c (default_ui_nodes): Add some new flags for - sensitizing nodes based on the flags of the currently selected - messages. - (folder_browser_ui_add_message): Reset the sensitivity cache when - we re-add UI items. - (folder_browser_ui_add_list): Same. - (folder_browser_ui_add_global): Same. - (fbui_sensitise_item): Only cache the sensitivity in the hash - table if we actually change it. - (folder_browser_ui_scan_selection): New function, getting the bulk - of the contents of folder_browser_ui_set_selection_state. Now - with code to iterate over the currently selected messages and - check their flags so we can sensitize based on them. - (folder_browser_ui_set_selection_state): Now just set the - selection state if necessary and pass off to _scan_selection. Don't - skip of we're trying to go from SELSTATE_SINGLE to SELSTATE_SINGLE, - eg, as the flags of the selected messages may have changed. - - * folder-browser-ui.h: Prototype folder_browser_ui_scan_selection. - - * folder-browser.c (main_folder_changed): Call - folder_browser_ui_scan_selection as the flags on a selected - message may have just changed. - -2002-08-28 Peter Williams - - * mail-format.c (component_supports): Also check that the component - has PersistStream. - (mail_lookup_handler): Get a list of all components and go with the - first matching one. - -2002-08-27 Jeffrey Stedfast - - * message-list.c (regen_list_regen): Pass - mail_config_get_thread_subject() as the third argument to - camel_folder_thread_messages_new(). - - * mail-config.c (config_read): Read in the thread_by_subject - config option. - (mail_config_write_on_exit): Save the thread_by_subject config - option. - (mail_config_get_thread_subject): New function to get the - thread_subject value. - (mail_config_set_thread_subject): New function to set the - thread_subject value. - -2002-08-27 Radek Doulik - - * mail-signature-editor.c: removed tip frame - -2002-08-27 Jeffrey Stedfast - - Fixes for bug #4480 - - * folder-browser-factory.c (control_activate): Call - folder_browser_reload() instead of refreshing the folder - ourselves. - - * folder-browser.c (folder_browser_reload): New convenience - function. If the folder-browser's folder is already loaded, - refresh the contents, otherwise if the folder has not been loaded - - try loading the folder again (it may have failed to open last - time for some reason?). - -2002-08-27 Peter Williams - - * mail-format.c (handle_text_plain_flowed): Fix bug #29493. - -2002-08-26 Peter Williams - - * mail-callbacks.c (toggle_flags): Logic change for when untoggling - a message from deleted-dom. - -2002-08-26 Peter Williams - - * mail-ops.c (transfer_messages_transfer): Enforce the mailer policy - that deleted messages are marked as seen. Fixes 29448. This could - go in camel_folder_transfer_messages_to, but I don't think we - necessarily want to enforce that policy for Camel in general. - -2002-08-23 Peter Williams - - Address most of bug #4940. Fails on the last page of the add account - dialog as called from the prefs dialog due to EvolutionWizard being - weird. - - * mail-config-druid.c (goto_next_page): New function, little - wrapper around wizard_next_cb. Also potential place to work around - EvolutionWizard weirdness in the future. - (identity_activate_cb): New function, calls goto_next_page if - identity page is complete. - (source_activate_cb): Analogous. - (transport_activate_cb): Analogous. - (management_activate_cb): Analogous. - (get_fn): Hook up the activate signals of the various GtkEntries - to the correct callbacks above. - (management_check): Return the result of the check so that - management_activate_cb can use it. - -2002-08-22 Jeffrey Stedfast - - * mail-tools.c (mail_tool_restore_xevolution_headers): Reset the - X-Evolution-PostTo header. - (mail_tool_remove_xevolution_headers): Remove the - X-Evolution-PostTo header. - -2002-08-21 Jeffrey Stedfast - - * mail-folder-cache.c (ping_store): Spawn a new thread to ping the - server but only if it is connected. - (ping_cb): This needs to return TRUE so the timeout keeps getting - called. - -2002-08-21 Jeffrey Stedfast - - * mail-session.c (class_init): Don't bother overloading the - timeout virtual methods since they don't exist anymore. - - * mail-folder-cache.c (mail_note_store): Register a ping timeout - callback to ping each store to keep the connections alive. - -2002-08-20 Radek Doulik - - * mail-callbacks.c (do_mail_print): be sure that widget is - realized so that e_utf8_from_gtk_string works properly - (footer_print_cb): save/restore - -2002-08-20 Mike Kestner - - * folder-browser-ui.c (folder_browser_ui_setup_view_menus): guard - against the view_instance disappearing during earlier CORBA work. - -2002-08-20 Peter Williams - - * message-list.c (search_func): Once we hit the target node, - update the cursor_uid if it's set. Fixes #29085. - -2002-08-19 Jeffrey Stedfast - - * mail-preferences.c (mail_preferences_apply): Fix a - copy/paste-o. Use the pgp_path GnomeFileEntry widget rather than - the notify_sound_file GnomeFileEntry widget for the pgp path stuff - :-) - -2002-08-19 Dan Winship - - * mail-account-gui.c (mail_account_gui_setup): source_type_changed - may try to change the transport optionmenu (incorrectly in this - case), so don't call gtk_option_menu_set_history on it until after - emitting "activate" on the source type menuitem. - (mail_account_gui_save): Fix the saving of STORE_AND_TRANSPORT - transports and add a comment so it doesn't get mistakenly unfixed - again. - -2002-08-09 Peter Williams - - * subscribe-dialog.c: Change this into a GnomeApp so we get a - statusbar and the dialog is a little more comprehensible. - - * subscribe-dialog.c: (struct _FolderETree): Add members for - tracking activity callback information. - (get_short_folderinfo_got): Notify the activity callback. - (subscribe_get_short_folderinfo): Here too. - (folder_etree_init): Initialize the activity level to 0. - (folder_etree_construct): Take new parameters of our activity - callback and user_data. - (folder_etree_new): Here too. - (store_data_get_widget): Take the parameters here and pass them - on. - (sc_close_pressed): New callback for when close button is pressed. - (sc_activity_timeout): New timeout to move the activity bar when - folders are being scanned. - (sc_activity_cb): If activity_level > 0, start the progressbar - moving and set the status. - (menu_item_selected): Pass the callback to store_data_get_widget. - (subscribe_dialog_construct): Load some more widgets and adapt to - some changes in the XML. Also connect the close button signal and - initialize the progress bar's settings. - - * mail-callbacks.c (manage_subscriptions): Don't call - gnome_dialog_set_close on it anymore since it's no longer a gnome - dialog. - -2002-08-14 Dan Winship - - * mail-config.glade: Add a "don't sign meeting requests" option to - the security pane, since some versions of Outlook won't recognize - pgp-signed meeting requests. Sigh. - - * mail-config.c (account_copy, config_read, mail_config_write): - Handle pgp_no_imip_sign. - - * mail-account-gui.c (mail_account_gui_new, - mail_account_gui_save): Setup/save "don't sign meeting requests" - button. - -2002-08-13 Jeffrey Stedfast - - * mail-callbacks.c (forward_message): Removed an unused variable. - - * mail-account-editor.c (construct): Set the focus on the Account - Name entry widget. Fixes bug #10350. - -2002-08-12 Dan Winship - - * mail-display.c (on_url_requested): Replace no-longer-existent - e_book_query_address_locally with e_book_query_address_default. - -2002-08-12 Jeffrey Stedfast - - * mail-callbacks.c (forward_message): Use mail_get_messages() - instead of mail_get_message(). - (do_forward_non_attached): Fixed to work as a callback from - mail_get_messages(). - (do_edit_messages): Only set the drafts_folder and drafts_uid if - the folder-browser is a drafts folder. Fixes bug #28863. - -2002-08-09 Jeffrey Stedfast - - * mail-callbacks.c (save_draft_done): If the ccd is NULL, create a - new ccd, disconnect the old signal handlers, and then reconnect - the signal handlers using the non-NULL ccd as the user_data. - (composer_send_queued_cb): Same, but only if the queue append - operation failed. - -2002-08-09 Dan Winship - - * mail-callbacks.c (composer_send_queued_cb, save_draft_done): - Handle the fact that ccd may be NULL (if the composer was created - via CORBA). Quick temporary fix for sending meeting requests. - -2002-08-09 Peter Williams - - * mail-config.c (mail_config_uri_renamed): When a URI is changed, - try to copy over threaded view settings, preview pane shown - settings, headers, hide state, tree expansion, and GAL view files. - (uri_to_evname): New utility function. - -2002-08-08 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_save): Instead of comparing - old/new CamelStore objects, just compare their account urls since - changing params would still result in the same CamelStore - object. Fixes bug #18539. - - * mail-callbacks.c (delete_msg): Don't check permanent_flags for - the CAMEL_MESSAGE_DELETED bit here, if we are gonna check to see - if the folder supports the permanent flag then there are better - places to check this. Besides, it was the cause for bug #28038. - -2002-08-08 Not Zed - - * folder-browser.c (folder_browser_toggle_threads): Force a - refresh of the menu sensitivity when the thread state changes. - -2002-08-07 Not Zed - - * folder-browser-ui.c: Added EditSelectThread to only enable - threaded mode if threaded is on. For #19941. Added some macro's - to simplify the table. - (folder_browser_ui_set_selection_state): Implement IS_THREADED - mask. - -2002-08-07 Jeffrey Stedfast - - * mail-callbacks.c (composer_send_queued_cb): Delete the Draft - item that this was edited from if that is the case as well as - setting any replied flags if we need to. Fixes bug #18171. - (save_draft_done): Not only delete the previously saved draft, but - also set any PostSendData on the message being replied to or - whatever. Fixes bug #20224. - (compose_msg): Create an empty callback data struct which is now a - MUST. - (mail_reply): Fill in the new post_send_data info and also move - the creation of the post_send_data to AFTER the creation of the - composer widget so we don't leak on fail. - (forward_get_composer): Pass an empty post_send_data structure as - the user_data to the signal callbacks. - (send_to_url): Same. - (post_to_url): Here too. - (redirect_get_composer): And here. - (do_edit_messages): We no longer use the evil kludge of setting - data on the composer object to denote the drafts_uid etc, this is - now part of the post_send_data struct. - -2002-08-07 Peter Williams - - * component-factory.c (request_quit): If outbox_folder is NULL, - don't try and get its message count (this should never happen, but - has.) - -2002-08-06 Jeffrey Stedfast - - * mail-local.c (save_metainfo): No need to save a temporary file - first anymore since I updated e_xml_save_file() to do this for us. - -2002-08-07 Not Zed - - * folder-browser-ui.c: Enable the view type menu's always. See - #20901. - - * message-tag-followup.c (target_date_new): Set the week start day - from the calendar prefs, do same for 24 hour format. See #23423. - - * mail-config.c (config_read): Added week_start_day from - Calendar/Display config. Also time_24hour format. - (mail_config_get_week_start_day): - (mail_config_get_time_24hour): And read-only accessors. - -2002-08-06 Jeffrey Stedfast - - * mail-local.c (save_metainfo): Save to a temporary file first - using e_xml_save_file rather than xmlSaveFile, if the save - completes successfully then rename it to the real filename. Make - sure that errno is saved. - (mls_get_folder): save_metainfo doesn't return -1 on fail, it - returns FALSE. - -2002-08-06 Not Zed - - * folder-browser.c (folder_browser_search_menu_activated): Set the - rule name to include the search string, for #10979. - - * message-list.c (message_list_hidden): Only count hidden messages - which are in the folder. Should probably maintain hidden table - better. For #4334. - - * mail-ops.c (filter_folder_filter): Unref the driver before - returning to main thread, so any closing operations are handled - async (as in fetch_mail_fetch()), for #28072. - (fetch_mail_fetch): Check driver != NULL, if folder_filter freed - it already. - - ** fixes for #24605. - - * mail-vfolder.c (vfolder_gui_add_from_mlist): Removed. - - * folder-browser.c (filter_type_uid,vfolder_type_uid): Changed to - accept args directly. Fixed callers. - (filter_mlist_uid,vfolder_mlist_uid): Use filter_type_uid instead - of mlist variant. - (vfolder_type_current): new function to handle setup of vfolders - from the main menu. It now uses the vfolder_type_uid function the - same as the popup. - (vfolder_subject, vfolder_sender, vfolder_recipient, - vfolder_mlist): Changed to use vfolder_type_current. - (filter_type_current): Similar for filters. - (filter_subject, filter_sender, filter_recipient, - filter_mlist): Changed to use filter_type_current. - - * mail-autofilter.c (rule_from_message): Handle AUTO_MLIST type. - (rule_from_mlist): - (vfolder_rule_from_mlist): - (filter_rule_from_mlist): Removed. - (filter_gui_add_from_mlist): Removed. - - * mail-autofilter.h: Added AUTO_MLIST type. - -2002-08-05 Jeffrey Stedfast - - * mail-mt.c (mail_msg_check_error): If we are not in interactive - mode, don't display error dialogs. - - * component-factory.c (interactive_cb): Updated to use the new - function mail_session_set_interactive(). - (owner_unset_cb): Same here. - - * mail-session.c (mail_session_set_interactive): Renamed from - mail_session_enable_interaction(). - (mail_session_get_interactive): New function to get the - interactive state. - -2002-08-01 Peter Williams - - * mail-offline-handler.c (struct _sync_info): Add a GHashTable pointer - so we can remove the info once the operation is done. - (sync_done): Remove the info from the hash table. - (impl_syncFolder): Save the table to which the info was added. - -2002-08-05 Jeffrey Stedfast - - * component-factory.c (user_create_new_item_cb): Updated to call - post_to_url if the id is "post". - - * mail-callbacks.c (post_to_url): New function so that we don't - need a FolderBrowser to post a new message. - (post_message): Call post_to_url since they shared so much code. - -2002-08-05 Dan Winship - - * mail-callbacks.c (mail_reply): Only reply to all or reply to - list, set CAMEL_MESSAGE_ANSWERED_ALL too. - -2002-08-02 Jeffrey Stedfast - - * message-tag-followup.c (construct): Set the default flag to - Follow-Up. - - * mail-display.c (mail_display_render): Updated to use the new - Follow-Up tags. Instead of storing a string containing the - follow-up tag value, we now have to store the CamelMessageInfo. - (mail_display_destroy): Unref the folder and the message-info. - - * folder-browser.c (followup_tag_complete): No longer needed. - (on_right_clicked): Use the individual follow-up tags to decide - whether or not to enable something. - - * message-list.c (ml_tree_value_at): Update to use the new - Follow-Up tags. - - * mail-callbacks.c (flag_for_followup): Update to use the new - MessageTagEditor API. - (tag_editor_ok): Update this too. - (flag_followup_completed): Updated this too. - (flag_followup_clear): Set all the follow-up tag values to "". - -2002-08-01 Ettore Perazzoli - - * component-factory.c (create_component): Use - "post-message-16.png" as the icon for the "New Message Post" item. - -2002-08-01 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_save): If we are editing an - account, then get the CamelStore associated with the old account - info and save it in a struct that we will pass along as user_data - to mail_get_store() for the new account url. - (add_new_store): If the old account and new account stores are - identical, then don't remove the old store from the folder - tree. If they are not the same, then remove the old store and add - the new store to the folder tree. - -2002-07-31 Peter Williams - - * mail-folder-cache.c: Add another bitfield "unsub" - (real_flush_updates): If unsubscribing, manually remove the folder - from the shell. - (unset_folder_info): Add another parameter which is used to set - the unsub member. - (store_folder_unsubscribed): Pass true for @unsub. - (unset_folder_info_hash): Pass false for @unsub. - - * subscribe-dialog.c (fe_done_subscribing): Don't notify the shell - here. The folder cache does it now, and it was broken to make the - CORBA call in another thread anyway. - -2002-08-01 Jeffrey Stedfast - - * mail-format.c (setup_mime_tables): Don't setup a handler for - multipart/digest. - (handle_multipart_digest): Removed. - -2002-07-31 Jeffrey Stedfast - - * Makefile.am: Removed folder-browser-window from the build. - - * folder-browser-window.[c,h]: Removed. - - * mail-callbacks.c (view_digest): Removed. - - * mail-display.c (mail_display_digest_clicked): Removed. - (on_link_clicked): Don't handle digest: urls anymore. - -2002-07-31 Ettore Perazzoli - - * component-factory.c (create_component): Put "New Mail Message" - before "New Message Post" instead of vice versa. - -2002-07-31 Ettore Perazzoli - - * component-factory.c (create_component): Pass "mail" as - @folder_type to - evolution_shell_component_add_user_creatable_item(). - -2002-07-31 Not Zed - - * mail-display.c: Added global cameldatacache for managing remote - image cache. - (fetch_remote): Lookup data in cache first, use that if available, - or setup a new cache item. - (fetch_data): Write any retrieved data to cache as well as html - stream. - (fetch_free): Unref cache stream. - (fetch_done): - (fetch_cancel): If failed/cancelled, remove cache items so they - dont foul the result. Probably need a header in cache items to - guarantee this, but this is ok for now. - (mail_display_class_init): Setup cache structure. Also ensure - globals are initialised at-most once. - -2002-07-30 Radek Doulik - - * mail-config.c (mail_config_signature_set_name): save signature - here to remember the changed name - -2002-07-30 Jeffrey Stedfast - - * mail-format.c (write_date): Use camel_medium_get_header to get - the date header rather than getting the time_t and converting it - into a string. - -2002-07-29 Not Zed - - * mail-display.c (mail_display_init): setup private data. - (mail_display_destroy): cancel any outstanding fetches, and free - private data. - (mail_display_set_message): Cancel any outstanding fetches. - (fetch_cancelled): - (fetch_next): - (fetch_remote): - (fetch_data): - (fetch_free): - (fetch_cancel): - (fetch_done): Implement, used to use soup to download remote - images. - (load_http): Removed. - (on_url_requested): When requesting a http* url, use the - fetch_remote call above. - - * mail-display.h (struct _MailDisplay): Added priv(ate) member. - -2002-07-29 Ettore Perazzoli - - * mail-session.c (request_password): Left-align the check button's - label. - -2002-07-29 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_new): Get the "Reset - Defaults" folders button and connect to the clicked signal. - (default_folders_clicked): Set the default uris on for the Drafts - and Sent folders. - -2002-07-26 Peter Williams - - * mail-offline-handler.c (storage_go_online): Call mail_note_store - to get the folders to be updated and new ones to be inserted into - the tree. - -2002-07-29 Ettore Perazzoli - - * mail-session.c (request_password): Add an accelerator for the - "Remember this password" checkbox. - -2002-07-26 Jeffrey Stedfast - - * mail-ops.c (mail_execute_shell_command): No real need for this - to be an async function sync we are going to call - gnome_execute_async anyway. - - * component-factory.c (create_component): Add a new menu item for - posting to the New toolbar button thing. - (destination_folder_handle_drop): Don't use a NULL exception when - we already have one to use anyway. - (got_folder): Move the *fp = folder; to before the check to make - sure folder != NULL, this makes it so that if getting a folder - fails at least have have a known value to look out for (NULL) - rather than some random garbage. - -2002-07-25 Jeffrey Stedfast - - * mail-config-druid.c (create_label): Make the gtk label line-wrap - instead of us forcing \n's in the label, that was just - wrong. Fixes bug #10320. - - * mail-callbacks.c (composer_send_cb): Make sure that the url - isn't an empty string and also make sure to free it when we're - done with it. Also check that we got the folder - if it is NULL, - then just abort. - -2002-07-24 Jeffrey Stedfast - - * mail-config.c (mail_config_folder_to_safe_url): Use - mail_tools_folder_to_url(). - - * mail-tools.c (mail_tools_folder_to_url): New convenience - function to take a CamelFolder and return the URL associated with - it. - - * mail-callbacks.c (composer_get_message): Pass in a 'post' - argument so we know whether or not we can ignore a NULL set of - recipients. - (composer_send_cb): Default send->send to TRUE unless we are in - Post-To mode, in which case set send->send to FALSE (since we'll - have nothing to send). Also, if we are in Post-To mode, append to - the folder the user wants to post to rather than appending to - Outbox. - (composer_send_queued_cb): Only queue a send thread if send->send - is TRUE (ie, the composer was not in Post mode - if it was in Post - mode, then the message post has already been saved in the correct - folder so there is nothing to do). - (post_message): New function to create an empty composer widget in - Post mode. - (post_reply): New function that calls mail_reply with the new mode - of REPLY_POST. - (mail_generate_reply): If the mode is REPLY_POST, create a Post - composer widget otherwise create a normal composer widget. - -2002-07-25 Jeffrey Stedfast - - * mail-ops.c (mail_execute_shell_command): Update to take argc and - argv arguments since this is the new definition for the - CamelFilterDriverShellFunc. - - * mail-session.c (main_get_filter_driver): Updated for the renamed - function. - - * mail-display.c (link_open_in_browser): Make sure that the - html->pointer_url is non-NULL. Should fix bug #28159 (this seems - to be the only questionable way for a NULL url to be passed into - on_link_clicked). - -2002-07-24 Peter Williams - - * mail-callbacks.c (do_mail_fetch_and_print): Check for whether - current_message is NULL as well as preview_shown (if we tried to - load the message and failed, as may happen in offline mode.) - (done_message_selected): Only print if we actually got the message. - - * folder-browser.c (folder_browser_query_changed): New function, - use this on the query_changed signal. Don't run the search if - they only changed the dropdown. - -2002-07-23 Peter Williams - - * mail-ops.c (get_store_get): Call camel_session_get_service - instead of camel_session_get_store, as _get_store calls - _get_service_connected which is not what we want to do on startup. - (set_offline_do): Rework the logic here. It was failing when - trying to go online with a disco store that couldn't work offline. - - * mail-folder-cache.c (mail_note_store): If we're using an offline - (well, non-online) disco store that cannot work offline, don't get - the folderinfo as that will fail. - -2002-07-24 Radek Doulik - - * mail-composer-prefs.c (sig_add): use - mail_config_get_send_html for html format flag - - * mail-account-gui.c (sig_add_new_signature): use - mail_config_get_send_html for html format flag - -2002-07-24 Not Zed - - * mail-folder-cache.c (real_flush_updates): Propagate name changes - or removes to the mail config. #15951. Doesn't enitrely work for - local folders, because they are never renamed only removed and - added thanks to the shell's api. - - * mail-config.c (mail_config_uri_renamed): If a store folder is - renamed, this checks for any config that needs updating, so far - sent and drafts folders. - (mail_config_uri_deleted): Same, for deleted folders. - -2002-07-24 Jeffrey Stedfast - - * mail-format.c (handle_multipart_encrypted): Commit a fix that I - thought I committed a while ago: - - * mail-format.c (handle_multipart_encrypted): Pass the correct - pointer into camel_multipart_encrypted_decrypt(). - - * mail-ops.c (mail_send_message): Rework the logic a bit. If we - find an account, use that to set the sent_folder_uri and the - transport_url, otherwise use the X-Evolution-Transport and - X-Evolution-Fcc headers. - -2002-07-23 Jeffrey Stedfast - - * message-tag-followup.c (message_tag_followup_decode): Don't pass - the length of the tag name into strncmp, instead use the length up - to the first ':' in the value string. - -2002-07-22 Peter Williams - - * folder-browser.c (folder_browser_gui_init): Also perform a search - on the query_changed signal, which is what gets emitted when the - Search menu is used. - -2002-07-24 Not Zed - - * component-factory.c (owner_set_cb): Initialise the standard - uri's before doing anything else. - - * mail-vfolder.c (uri_is_ignore): Return true if the uri is any - sent, drafts or outbox folder uri. - (mail_vfolder_add_uri): Dont automagically add any - sent/outbox/drafts folder with "local" or "remote" etc rules, only - add sent folders if explictly listed as folder rules. Maintain - the remote/local folders list accordingly. - (vfolder_adduri_do): dont check against sent_folder, drafts_folder - or outbox_folder, this is checked by above code. For #14863. - - * mail-display.c (drag_data_delete_cb): use uri_list before we set - "uri-list" to NULL, which will automagically free it for us, so - dont free it either. Found with vagrind. - -2002-07-23 Not Zed - - * message-browser.c (message_browser_destroy): Disconnect from - folderbroser signals when we unref it, so we dont get signals - later on if someone else has a ref on it (causing crash). - -2002-07-22 Jeffrey Stedfast - - * mail-config.c (mail_config_signature_run_script): Check to make - sure the script output is valid UTF-8, if not then attempt to - convert it into UTF-8. Fixes bug #28086. - -2002-07-22 Not Zed - - * message-list.c (regen_list_regened): Remove the assert, and - always copy over the threadtree which represents the current view, - unreffing the old one if set. For #28021. Haven't tested this a - lot, but i guess it cant be worse than what is there. - - * mail-vfolder.c (store_folder_renamed): When renaming, use - full_name to set the folder, not name, so the path is preserved. - -2002-07-20 Larry Ewing - - * mail-format.c (mail_get_message_body): recognize urls in plain - text reply quoting logic (bug #27908). - -2002-07-19 Not Zed - - * mail-callbacks.c: Try including gtkhtml/gtkhtml.h instead. Test - really is a 4 letter word obviously. - -2002-07-18 Ettore Perazzoli - - * mail-folder-cache.c: Removed bogus static pre-declaration. - - * e-searching-tokenizer.c (e_searching_tokenizer_end): Removed - unused variables. - - * mail-callbacks.c: #include . - - * folder-info.h (evolution_folder_info_get_type): Add prototype. - -2002-07-18 Peter Williams - - * mail-format.c (handle_multipart_digest): Change the HTML to - make this a little prettier. - - * folder-browser-window.c (folder_browser_window_new): Load the - messagedisplay XML file as a base for the UI, so that things - appear. Don't add the global UI items as they don't make sense - here. - (fb_window_close): New function, used to ... close the window, - suprisingly. - -2002-07-18 Not Zed - - * main.c (main): Put the mcheck stuff back in, which was removed - without a changelog entry. - -2002-07-08 Peter Williams - - * Makefile.am: Reference the new libefilterbar.a. - -2002-07-17 Radek Doulik - - * mail-callbacks.c (save_draft_done): use "saved" gtkhtml command - -2002-07-17 Jeffrey Stedfast - - * component-factory.c (add_storage): Oops, Don't comment out the - mail_note_store call. - -2002-07-16 Jeffrey Stedfast - - * mail-accounts.c (account_able_clicked): Re-enable some #if 0'd code. - - * mail-vfolder.c (vfolder_load_storage): Updated to not pass TRUE - for an auto_connect argument since that argument no longer exists. - - * mail-account-gui.c (add_new_store): Updated to not pass an - auto_connect argument. - - * component-factory.c (add_storage): Don't ever auto-connect here. - (mail_add_storage): No longer takes an auto_connect argument. - (mail_load_storages): Only load the account storages that are - enabled. - -2002-07-15 Jeffrey Stedfast - - * mail-callbacks.c (composer_send_cb): Pass 'info' into - mail_append_mail(), seems I created the info but forgot to pass it - in. - (composer_send_queued_cb): If the message is successfully queued, - we destroy the composer, otherwise we unref it. Don't ever destroy - and then unref it. - -2002-07-15 Radek Doulik - - * mail-callbacks.c: use new save_header_state flag - -2002-07-15 Peter Williams - - * mail-offline-handler.c (service_is_relevant): Account for the - case that when a disco store is "online" but actually offline and - we're going online, we should actually connect it. - - * component-factory.c (mail_load_storages): Always set - auto_connect to FALSE, same reason as below. - - * mail-session.c (mail_session_init): Initialize our session to - not be online, since the shell will tell us to go online if we - need to. - -2002-07-10 Peter Williams - - * Makefile.am (importerdir): Define this in terms of the new - privlibdir, again resulting in a new directory name. - - * importers/Makefile.am (importersdir): Here too. - -2002-07-15 Not Zed - - * message-list.c (ml_tree_value_at): Lookup the label colour based - on the label token, not an integer. - - * folder-browser.c (on_right_click): Lookup the label name from - the filter type. Sigh, a bunch of other code should do similar - but i'm going to leave it as integers. - (set_msg_label): Set the label directly. - - * mail-vfolder.c (vfolder_editor_clicked): Set the vfolder_editor - variable to null before we close the dialogue, otherwise the close - destroys it and reverts the file. - - * component-factory.c (populate_folder_context_menu): Oops, - accidentally checked in some unfinished, unworking code. - Reverted. - -2002-07-10 Not Zed - - ** fixes for #10781 - - * mail-callbacks.c (filter_edit): Add back a cancel button. We - dont need to do anything special to 'undo' here, as the rules are - loaded every time they're used. - - * mail-vfolder.c (vfolder_editor_clicked): If ok wans't clicked, - revert the ruleset. - (vfolder_editor_destroy): Fake a button of -1 if we get destroyed - with no click. - (context_rule_removed): Unref the folder after we delete it. If - we're the last ref to the folder, unrefing it means it no longer - exist,s which means no delte processing occurs ... - -2002-07-04 Not Zed - - * mail-accounts.c (news_add_destroyed): Pass teh autoconnect flag, - whcih shoudlnt' exist anyeway. - -2002-07-03 Not Zed - - * component-factory.c (populate_folder_context_menu): If this is a - file url, look up its component, if we have it, then use the - mail-callback reconfigure call. - - * folder-browser-factory.c (folder_browser_factory_get_browser): - Util to get the folder browser from a uri. - -2002-07-11 Jeffrey Stedfast - - * mail-display.c (pixmap_press): Rename "Save to disk..." to "Save - Attachment..." - -2002-07-10 Jeffrey Stedfast - - * folder-browser-ui.c: Modified to use a single list of UI node - elements with an enable-mask rather than split into groups. This - allows much more control and easier modification to get the - desired enable/disable effects. - - * mail-display.c (mail_display_set_message): If we unref'd a - current_message, clear the datalist. Don't bother connecting to - the message's finalise signal because something else may own a ref - to the original message when we replace it with a new one. - (mail_display_destroy): Only clear the datalist if we have a - current_message, otherwise it's safe to assume that it is already - cleared. - -2002-07-08 Peter Williams - - * Makefile.am (INCLUDES): Add -I flags to get the ebook headers. - -2002-07-10 Ettore Perazzoli - - * subscribe-dialog.c (recursive_add_folder): Pass zero as - @sorting_priority to evolution_storage_new_folder(). - - * mail-folder-cache.c (real_flush_updates): Pass zero as - @sorting_priority to evolution_storage_new_folder(). - -2002-07-09 Ettore Perazzoli - - * subscribe-dialog.c (recursive_add_folder): Pass NULL for - @custom_icon_name to evolution_storage_new_folder(). - - * mail-folder-cache.c (real_flush_updates): Pass NULL for - @custom_icon_name to evolution_storage_new_folder(). - -2002-07-08 Jeffrey Stedfast - - * mail-callbacks.c (redirect): Don't ever use the mail-display's - current_message, this can cause problems. - - * mail-ops.c (get_message_free): Unref the gotten message. All of - the callers seemed to think that they didn't have to unref the - message. - - * mail-display.c (mail_display_set_message): Now refs the message. - (mail_display_destroy): Unref the current_message if we still have - ownership of it. - -2002-07-05 Jeffrey Stedfast - - * mail-callbacks.c (composer_send_queued_cb): Only queue a send - operation if we are in Online mode, otherwise don't bother wasting - our time. - -2002-07-05 Jeffrey Stedfast - - * main.c (main): No longer need to pass a postpone_cb function - into the composer factory_init. - - * mail-send-recv.c (get_receive_type): If the provider is a - transport, return SEND_SEND. - - * mail-config.c (mail_config_get_default_transport): If the - default account doesn't have a transport, find the first account - that does. - - * mail-callbacks.c (append_mail_cleanup): Don't bother freeing the - appended_uid here. - (composer_send_internal): New helper function that does all the - similar work that composer_send_cb and composer_postpone_cb did. - (composer_send_cb): Append the message to Outbox and in the async - callback, queue a message send operation. - (composer_postpone_cb): Removed. - (composer_send_queued_cb): The new async callback for - composer_send_cb(). If the append is successful, queue a message - send operation and destroy the composer otherwise re-show the - composer. - (save_draft_done): g_strdup the appended uid. - (compose_msg): Don't connect to the postpone signal anymore as it - no longer exists. - (send_to_url): Same. - (mail_reply): Here too. - (forward_get_composer): And here. - (redirect_get_composer): Again here. - (do_edit_messages): And finally here. - - * mail-ops.c (append_mail_free): Free the appended uid. - -2002-07-04 Jeffrey Stedfast - - * mail-account-editor-news.[c,h]: Removed. - - * mail-accounts.c: Removed special-case code for NNTP support. - - * mail-account-gui.c (mail_account_gui_setup): Allow configuration - of both mail and news accounts. - - * component-factory.c (mail_load_storages): No longer need the - is-account argument. - - * subscribe-dialog.c (populate_store_list): Don't special-case - news accounts anymore. - - * mail-config.c (mail_config_get_default_news): Removed. - (mail_config_get_news): Removed. - (mail_config_add_news): Removed. - (mail_config_remove_news): Removed. - -2002-07-03 Jeffrey Stedfast - - * mail-vfolder.c (vfolder_load_storage): Pass TRUE as the - auto_connect argument to mail_load_storage_from_uri(). - - * mail-account-gui.c (add_new_store): Pass FALSE as the - auto_connect value to mail_load_storage_from_uri(). - - * mail-format.c (handle_multipart_encrypted): Pass the correct - pointer into camel_multipart_encrypted_decrypt(). - - * component-factory.c (mail_add_storage): Now takes an - auto-connect argument which it passes along to add_storage(). - (mail_load_storage_from_uri): Same. - (add_storage): Only call mail_note_store() if we plan on - auto-connecting. - -2002-07-02 Jeffrey Stedfast - - * folder-browser.c (on_right_click): Increase the size of the - escapped mlist buffer, we can't assume that there can only ever be - a single '_' in the mlist name afaik. - (filter_type_uid): Ugh, we need to copy the fdata->source here. - - Fixes bug #27263. - - * folder-browser.c (filter_subject): Decide the filter source type - based on the folder we are in (Sent/Outbox folders use - FILTER_SOURCE_OUTGOING). - (filter_sender): Same. - (filter_recipient): Here too. - (filter_mlist): And here. - (on_right_click): Set the fdata->source. - (filter_type_got_message): Pass fdata->source into - filter_gui_add_from_message(). - (filter_mlist_uid): Same. - - * mail-autofilter.c (filter_gui_add_from_message): Now takes a - source argument so that we don't always add incoming rules. - (filter_gui_add_from_mlist): Same. - - * mail-tools.c (mail_tool_make_message_attachment): Remove Bcc - headers too. Fixes bug #27302. - -2002-07-02 Ettore Perazzoli - - * folder-browser.c (folder_browser_gui_init): Don't connect - folder_browser_search_do_search to "query_changed" since we don't - want the search to happen unless the user clicks "Find Now", for - consistency. - -2002-07-02 Ettore Perazzoli - - * component-factory.c (create_component): Pass a tooltip to - evolution_shell_component_add_user_creatable_item. - -2002-07-02 Sean Atkinson - - * mail-preferences.c: remove dependency on removed file - camel/camel-pgp-context.h - -2002-07-01 Jeffrey Stedfast - - * mail-format.c (handle_multipart_related): Make sure that cid is - non-NULL. - -2002-07-01 Not Zed - - * mail-folder-cache.c (folder_deleted): Removed. The - folder's deleted event isn't needed since we're listening to the - store's folder_deleted signal. Also, the code was wrong, it - cleared the folder without disconnecting events, etc. See #16486, - and probably others. - (mail_note_folder): Dont hook onto deleted anymore. - (unset_folder_info): Or unhook from it. - -2002-06-28 Jeffrey Stedfast - - * component-factory.c (mail_load_storages): Don't skip over - disabled accounts - put them in the folder tree too. - -2002-06-28 Jeffrey Stedfast - - Fixes bug #27055. - - * mail-accounts.c (account_add_finished): Unref the main accounts - widget. - (account_add_clicked): Ref the main accounts widget. - (account_edit_finished): Unref the main accounts widget. - (account_edit_clicked): Ref the main accounts widget. - -2002-06-27 Jeffrey Stedfast - - * component-factory.c (storage_remove_folder): Recursively delete - any subfolders. - -2002-06-26 Jeffrey Stedfast - - * mail-config.c (config_read): Don't allow the pgp type to be - anything except NONE or GPG. - - * mail-preferences.c (mail_preferences_apply): Don't allow someone - to use anything other than GnuPG. - - * mail-crypto.c (mail_crypto_get_pgp_cipher_context): No need to - handle pgp5 or pgp6 types anymore since we are no longer - supporting them. Ding dong the witch is dead! - - * mail-format.c (handle_multipart_encrypted): Rewritten to use - camel_multipart_encrypted_decrypt. - - * mail-crypto.c (mail_crypto_pgp_mime_part_verify): Removed. - (mail_crypto_pgp_mime_part_encrypt): Removed. - (mail_crypto_pgp_mime_part_decrypt): Are we seeing a trend yet? - -2002-06-25 Jeffrey Stedfast - - * mail-display.c (on_url_requested): Also handle https urls. - - * component-factory.c (mail_add_storage): Some compiler warning - fixes. - - * mail-crypto.c (mail_crypto_pgp_mime_part_sign): Removed. - (mail_crypto_get_pgp_cipher_context): New convenience function to - construct a pgp cipher context. - (mail_crypto_pgp_mime_part_verify): Use the new - get_pgp_cipher_context function. - (mail_crypto_pgp_mime_part_encrypt): Same. - (mail_crypto_pgp_mime_part_decrypt): Here too. - - * mail-account-gui.c (mail_account_gui_new): Initialise the - pgp_always_trust checkbox. - (mail_account_gui_save): Get whether or not to always_trust the - user's pgp keys. - - * mail-config.c (account_copy): Copy over the pgp_always_trust - option. - (config_read): Read in the always_trust option. - (mail_config_write): Save the always_trust option. - -2002-06-21 Jeffrey Stedfast - - * mail-crypto.c (mail_crypto_pgp_mime_part_verify): If the pgp - type is gpg, then use the gpg context. - (mail_crypto_pgp_mime_part_sign): Same. - (mail_crypto_pgp_mime_part_encrypt): Same. - (mail_crypto_pgp_mime_part_decrypt): Same. - - * mail-format.c (handle_multipart_signed): Use the new gpg cipher - context. - -2002-06-18 Jeffrey Stedfast - - * message-list.c (message_list_change_first_visible_parent): New - convenience function to find the first parent node that is visible - and emit a changed signal on it. - (main_folder_changed): If a message changed, call - change_first_visible_parent() in case we are in a collapsed thread - so that our first visible parent gets updated as well. Fixes bug - #26263. - - * component-factory.c (storage_remove_folder): Simplify the error - checking. - -2002-06-17 Jeffrey Stedfast - - * message-list.c (get_normalised_string): New convenience function - to get a cached normalised string. - (subject_compare): Removed, as we strip Re:'s when normalising the - subject strings now. - (ml_tree_value_at): Added support for the normalised columns (used - for a sorting optimisation). - (message_list_init): Initialise normalised_hash. - (message_list_destroy): Destroy normalised_hash. - (message_list_create_extras): Removed subject_compare. - (main_folder_changed): De-cache normalised strings for any removed - uids. - -2002-06-17 Not Zed - - * message-list.c (regen_list_regen): If we dont support searching, - dont try to. - -2002-06-11 Jeffrey Stedfast - - * message-list.c (regen_list_regen): Move m->complete = TRUE; to - within the cancel-check block, this way complete only ever gets - set to TRUE if we weren't cancelled. I assume this is how it was - supposed to work. - -2002-06-11 Not Zed - - * folder-info.c (do_get_info): If we dont get a folder, dont try - and get details off it. Should get rid of most of those annoying - summary warnings, but not the cause of them. - -2002-06-10 Jeffrey Stedfast - - * mail-accounts.c (account_able_clicked): Comment out the code to - add/remove the store to the folder-tree when it gets - enabled/disabled. - - * mail-callbacks.c (mail_generate_reply): If we are doing - Reply-to-All, do not include any of the user's email accounts in - the To: field. If, after this, the To: field is empty - then - promote the first recipient in the Cc: list to the To: field. - -2002-06-07 Radek Doulik - - * mail-config.c (mail_config_write_account_sig): call - mail_config_init to be sure we have the db, save auto_signature as - well - - * mail-composer-prefs.c (sig_add_script_cancel): hook this to - cancel button in signature script dialog - - * mail-signature-editor.c (mail_signature_editor): fix some typos, - set label usize to 500, -2 - (menu_help): added help link to Help menu - -2002-06-06 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_save): If this account is - not a completely new account (ie, it is an edited account), then - remove any trace of it from the shell storages. If the new account - belongs in the folder-tree, add it to the list of storages. - - * component-factory.c (mail_add_storage): New function to add a - single storage. - -2002-06-06 Radek Doulik - - * mail-composer-prefs.c (mail_composer_prefs_construct): disable - edit and delete when there are no signatures defined - -2002-06-06 Not Zed - - * message-list.c (mail_regen_list): Keep track of the regeneration - request in a list. - (regen_list_free): Remove the request from the regenreation list. - (message_list_set_folder): If there are any outstanding - regneration requests, cancel them. - (regen_list_regened): If we were cancelled, do nothing. - (regen_list_regen): If we were cancelled, shortcut processing. - This is all for #23571. - - * message-list.c (regen_list_regen): Change the way we calculate - the hide deleted messages and tree view options. Do it based on a - search and uid's rather than a summary. - (regen_list_regened): Handle changes to tree storage. - (mail_regen_list): The tree is now stored between updates, so we - can update the tree structure incrementally. This blows out - memory use some however. We need an etree that uses this as its - model directly? - (message_list_destroy): Free the thread tree. - (message_list_set_folder): Clear the thread tree when changing - folder. - -2002-06-05 Jeffrey Stedfast - - * mail-format.c (mail_get_message_rfc822): Don't forget to free - the date string buffer. - -2002-06-05 Radek Doulik - - * mail-composer-prefs.c (sig_fill_clist): use gtk string instead - of utf8 one - -2002-06-04 Jeffrey Stedfast - - The following changes take a great leap toward fixing bug #1042. - - * mail-display.c (mail_display_push_content_location): New - function to push a Content-Location value onto the MailDisplay. - (mail_display_get_content_location): Gets the current - Content-Location CamelURL value. - (mail_display_pop_content_location): Pop the Content-Location off - the stack. - - * mail-format.c (get_location): Do URL merging if the - Content-Location isn't a full URL. If the Content-Location doesn't - exist, pretend the URL is actually the Content-Location URL of our - parent multipart (assuming it exists). If that doesn't exist, then - yes - return NULL. - (handle_multipart_related): Push the Content-Location header value - of the multipart/related so that we can do URL merging in - get_location() as we process each of the subparts. When we're - done, pop it back off the stack. - -2002-06-04 Christopher James Lahey - - * message-list.etspec: Added priorities. - -2002-06-04 Christopher James Lahey - - * folder-browser-ui.c (folder_browser_ui_setup_view_menus): Set - the title of our GalViewCollection. - -2002-06-04 Not Zed - - * mail-accounts.c (mail_accounts_tab_construct): Duh, we want to - set the news_edit/delete buttons for the news page, not overwrite - the mail ones! That would've saved a bit of angst ... - - * mail-config-druid.c (extra_prepare): dont call build_extra_conf, - otherwise it blows away any settings with defaults. - -2002-06-04 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_save): Write the signature - after the account has been added. - (sig_new_html): Don't write the signatures at this time. - (sig_new_text): Same. - -2002-06-03 Jeffrey Stedfast - - * mail-accounts.c (account_delete_clicked): Correctly get the - GtkWindow ancestor of the prefs widget. - -2002-06-03 Not Zed - - * mail-callbacks.c (composer_get_message): Changed to check - everything from the composer before the message is requested. - Otherwise we could end up signing/encrypting it twice, etc. - - * mail-format.c (handle_multipart_signed): removed some dead wood. - -2002-06-03 Jeffrey Stedfast - - * component-factory.c (request_quit): Prompt the user to see if he - really wants to quit when there are queued messages in the Outbox. - -2002-06-01 Not Zed - - * mail-local.c (mlf_getv): Implement, return a text description of - the localfolder. - - * message-list.c (ml_duplicate_value): - (ml_free_value): - (ml_initialize_value): - (ml_value_is_empty): - (ml_value_to_string): - (ml_tree_value_at): Implement COL_LOCATION, original location of - message (useful for vfolder). - -2002-06-02 Larry Ewing - - * mail-tools.c (mail_tool_quote_message): make these citations as - well. - - * mail-format.c (handle_text_plain_flowed): make these blockquotes - into citations. - -2002-05-31 Not Zed - - * mail-format.c (handle_multipart_signed): Changed to handle new - multipart-signed type. - -2002-05-30 Jeffrey Stedfast - - * mail-send-recv.c (mail_send_receive): Noop if we are in offline - mode. - - * component-factory.c (mail_remove_storage): If the store is not - in the storage hash, then it must not have ever been added. Fixes - bug #25456. - - * mail-callbacks.c (view_msg): Oops, create a message-browser - window here, not a folder-browser-window window. - -2002-05-29 Radek Doulik - - * mail-composer-prefs.c: moved spell checking options to separate - page, updated UI by Anna's design - - * mail-accounts.c (mail_accounts_load): use _ instead of U_ for - clist - (mail_accounts_tab_construct): justify marks column to right - -2002-05-28 Jeffrey Stedfast - - * folder-browser-window.c (folder_browser_window_new): Revert a - failed idea. - -2002-05-24 Radek Doulik - - * mail-composer-prefs.c (mail_composer_prefs_construct): ops, - revert array size - -2002-05-24 Jeffrey Stedfast - - * mail-callbacks.c (mail_generate_reply): If we can't find the - mailing list address in the recipients list, just Reply-to-All - instead. - -2002-05-23 Jeffrey Stedfast - - * folder-browser-window.c (folder_browser_window_new): Set the ui - to be the evolution-mail-global.xml file thingy. Still broken but - oh well. I give up. bonobo-ui sucks. - - * message-browser.c (set_bonobo_ui): Fixed to not crash. - -2002-05-23 Jeffrey Stedfast - - * folder-browser-window.c (folder_browser_window_new): If the - folder-browser has a parent, reparent it. - - * message-browser.[c,h]: Revert back to the old broken - implementation since that's what users want. They're not happy - unless it's broken. - -2002-05-23 Radek Doulik - - * mail-composer-prefs.c: be more careful about language_str{_orig} - (mail_composer_prefs_construct): add auto smiley check button - -2002-05-21 Jeffrey Stedfast - - * mail-account-gui.c (sig_fill_options): Only clear the text/html - signature menus if they are non-NULL. - - * mail-composer-prefs.c (spell_save_values): Use a new macro, - STR_EQUAL, to tell if the 2 values are equal or not rather than - using strcmp since one or both strings could be NULL. - -2002-05-21 Not Zed - - * folder-browser.c (folder_browser_config_search): Split the - search word up for a body search and add it to the tokeniser to - highlight. - -2002-05-18 Not Zed - - * e-searching-tokenizer.c - (e_searching_tokenizer_add_primary_search_string): - (e_searching_tokenizer_add_secondary_search_string): New functions - to add additional search strings one at a time. Maybe it should - just split the word itself? - (all): Basically, entirely rewritten. Now implements the - Aho-Corasick multiple pattern search algorithm and handles - multiple search strings and only ever has to decode any utf8 - character once, etc etc. - -2002-05-20 Jeffrey Stedfast - - * mail-format.c (mail_get_message_body): Only get the contents of - a mime part if it is marked as "inline". Fixes bug #7527. - - * mail-display.c (mail_display_render): Fixed the "Overdue:" - string to not contain any HTML tags. - -2002-05-20 Ettore Perazzoli - - * subscribe-dialog.c (recursive_add_folder): Pass TRUE for - @sync_offline to evolution_storage_new_folder(). - - * mail-folder-cache.c (real_flush_updates): Pass TRUE for - @sync_offline to evolution_storage_new_folder(). - -2002-05-20 Ettore Perazzoli - - * mail-callbacks.c (composer_sent_cb): Always unref the composer - [even when we are destroying it], otherwise we leak it and we get - the nasty bug where you can't quit. - -2002-05-16 Jeffrey Stedfast - - * message-list.c (ml_tree_value_at): Check for a label tag when - doing a lookup on the COLOR column. - - * mail-config.c (mail_config_get_label_color_string): Return the - colour in string format. - - * folder-browser.c (set_msg_label): Replaces colourise_msg and - sets the "label" tag rather than the "colour" tag. - - * mail-preferences.c (mail_preferences_apply): Call - mail_config_write() so that the settings get synced to disk. - -2002-05-16 Ettore Perazzoli - - * component-factory.c (request_quit): New. - (create_component): Pass it as the @request_quit_fn to - evolution_shell_component_new(). - -2002-05-15 Ettore Perazzoli - - * component-factory.c (create_component): Pass NULL as - @request_quit_fn. - -2002-05-15 Not Zed - - * mail-ops.c (prep_offline_do): - (prep_offline_done): - (prep_offline_free): - (mail_prep_offline): Implement prep_offline for an individual - folder. - (set_offline_do): Only call disco_store_set_status or disconnect - for the store, dont do any offline prep stuff. - - * mail-offline-handler.c: Applied patch from Ettore to hook in - extra offline interfaces. - (impl_destroy): Dont free listener here anymore, its removed, but - free sync table. - (mail_offline_handler_init): Same for setup. - (impl_syncFolder): Implement. - (sync_done): handles finalising synchronisation of 1 folder. - (sync_status): progress reporting, camel side. - (sync_timeout): progress reporting, gmainloop side. - (impl_cancelSyncFolder): Implement. - (impl_goOffline, storage_go_offline, went_offline): Dont copy the - listener to our struct - its an argument, not a member, so give - each thread its own copy. - -2002-05-15 Jeffrey Stedfast - - * message-list.c (ml_tree_value_at): Instead of g_assert()ing that - the msg_info is not NULL, if it is NULL just return NULL. This - fixes a crash when ETree requests the value at a root node (I - don't understand why it needs to do that??). - -2002-05-14 Jeffrey Stedfast - - * folder-info.h: Added. - -2002-05-14 Christopher James Lahey - - * component-factory.c: Added #include "folder-info.h". - - * folder-browser-window.c (folder_browser_window_new), - mail-account-editor.c (apply_changes), mail-account-gui.c - (mail_account_gui_save), message-tag-editor.c: Removed some unused - variables. - - * folder-info.c: Added #include "folder-info.h". Removed static - declaration of evolution_folder_info_get_type. - - * folder-info.c (destroy), mail-callbacks.c - (confirm_goto_next_folder, find_current_folder, - find_next_folder_r, find_next_folder, - do_evil_kludgy_goto_next_folder_hack), mail-composer-prefs.c - (sig_name_changed): Commented out these unused functions. - - * mail-config.c (add_new_storage): Removed this unused function. - - * mail-local.c (mlf_init): Fix the declaration of this function to - match the required signature. - -2002-05-13 Christopher James Lahey - - * message-list.etspec: Added search="string" where appropriate. - -2002-05-13 Dan Winship - - * (various places): Update for camel_folder_append_message / - camel_folder_transfer_messages_to API change. - - * mail-ops.c (mail_append_mail): Pass the appended_uid to the - callback. - - * mail-callbacks.c (composer_save_draft_cb, save_draft_done, - do_edit_messages): Take advantage of the append_message change to - keep track of the UID of the saved draft so that we can delete the - old copy of the draft each time we save a new one. Remove the - FIXME suggesting we should do that, since we're doing it now. :) - -2002-05-10 Jeffrey Stedfast - - * mail-callbacks.c (do_view_message): Update for the new - message-browser api. - - * message-browser.c (message_browser_new): A brand new - implementation that just shows the message, none of that next/prev - crap that always caused problems anyway. - - * mail-config.c (mail_config_add_account): Don't add any shortcuts - here. - (mail_config_remove_account): And don't remove them here. This - code has never worked properly. - - * mail-ops.c (save_part_save): Use the exception enum names rather - than '1' since it makes the code clearer. - -2002-05-10 Dan Winship - - * mail-ops.c (transfer_messages_transfer): Simplify. Use - transfer_messages_to instead of picking between copy and move. - Remove vtrash special-casing since it's all in - camel-vtrash-folder.c now. Remove duplicate source == dest check. - - * mail-local.c (mail_local_folder_reconfigure): Use - transfer_messages_to instead of copy_messages_to. - -2002-05-09 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_save): Make sure that even - if the new source url is NULL, that we preserve the enabledness of - the source. - -2002-05-09 Ettore Perazzoli - - * component-factory.c (add_storage): Pass %FALSE as - @has_shared_folders to evolution_storage_new(). - -2002-05-09 JP Rosevear - - * Makefile.am: dist Spell.idl - -2002-05-08 Radek Doulik - - * mail-composer-prefs.c: implemented (c'n'p-ed and updated) spell - checking settings - -2002-05-08 Iain Holmes - - * component-factory.c (owner_set_cb): Tell the folder info listeners - that they're ready. - - * folder-info.c: Add a property bag to the CORBAObject. - (do_get_info): Remove a load of cruft. Add some error checks. - (do_free_info): Unref the listener. - (destroy): Unref the propertybag. - (set_prop): Set the property. - (get_prop): Get the property. - (evolution_folder_info_factory_fn): Create a propertybag. - (evolution_folder_info_notify_ready): Notify all the listeners that - the folder info is ready for querying. - -2002-05-08 Not Zed - - * mail-autofilter.c (mail_filter_rename_uri): Changed for - rule_context_rename_uri api changes. - (mail_filter_delete_uri): Same. Also, popup a dialogue similar to - vfolder deleted dialogue to notify the user something has - changed. Partial fix for #18826. - -2002-05-06 Jeffrey Stedfast - - * mail-ops.c (filter_folder_free): Flush the filter log to make - Tuomas happy :-) - - * mail-session.c (mail_session_flush_filter_log): New convenience - function to flush the session's filter log file. - - * mail-callbacks.c (mail_reply): Set the Seen flag as well since - it's safe to assume that if the user has replied to an email - message that he has read it. Not always true, but usually ;-) - - * folder-browser.c (on_right_click): If we are in a - Sent/Drafts/Outbox folder, don't show the "Add Sender to - Addressbook" menu item. - -2002-05-06 Not Zed - - * component-factory.c (idle_quit): Check all threads are idle as - well, using new e_thread_busy call. Should fix #22553? Also - sleep a little bit, to let the other threads run. - -2002-05-01 Jeffrey Stedfast - - * mail-account-gui.c (sig_new_text): Update the code to actually - work. - (sig_new_html): Same. - - * mail-composer-prefs.c (mail_composer_prefs_new_signature): Allow - 'prefs' to be NULL. - - * folder-browser.c (on_right_click): Fix the filter_menu static - array to use the E_POPUP_MENU_CC macros since we plan on using - custom closures for this. - (on_right_click): Fixed so that you can "Edit as New" for any Sent - folder and not just the local Sent folder. - -2002-05-01 Not Zed - - * folder-browser.h (FOLDER_BROWSER_IS_DESTROYED): Also check - folder!=NULL. Fixes race where folder isn't setup yet, and - neither is bonobo menu status (because its delayed), and we get a - menu event before we're setup yet. For bug #21939. - -2002-04-30 Dan Winship - - * mail-callbacks.c (delete_msg): If the folder's permanent_flags - don't include CAMEL_MESSAGE_DELETED, don't do anything. (In - particular, don't move the cursor.) - -2002-04-29 Jeffrey Stedfast - - * message-tag-followup.c (message_tag_followup_append_message): - Convert UTF-8 to gtkstrings since we are using a clist and not an - E-widget that takes UTF-8. - - * mail-display.c (mail_display_add_url): If the data-urls is NULL, - add a data-urls hash to the datalist. This finishes up bug #90. - - * mail-account-gui.c (save_service): Strip leading/trailing - whitespace from the username because users sometimes accidently - add extra spaces here and there. Fixes bug #24009 (along with a - number of other "bugs"). - (mail_account_gui_auto_detect_extra_conf): Use a CamelURL instead - of a GHashTable *settings. Also parse out the port # from the - hostname. - -2002-04-29 Larry Ewing - - * mail-composer-prefs.c (mail_composer_prefs_construct): clean up - propmanager initialization code. - - * mail-preferences.c (mail_preferences_construct): small clean - ups to propmanager code. - - * mail-config-factory.c (config_control_factory_cb): handle - requests for the font manager control. - - * mail-config.glade: add fonts tabs and reorder composer options - to match the new dialogs from anna. - - * GNOME_Evolution_Mail.oaf.in: add font manager control definition. - - * mail-composer-prefs.c (mail_composer_prefs_construct): hook to - the gtkhtml propmanager. - (mail_composer_prefs_apply): apply propmanager changes. - (mail_composer_prefs_finalise): unref the propmanager. - - * mail-composer-prefs.h: add propmanager member. - - * mail-font-prefs.c: initialize gui properly. - - * mail-preferences.c (mail_preferences_construct): hook to - gtkhtml's propmanager. - (mail_preferences_apply): apply propmanager changes. - (mail_preferences_finalise): unref the propmanager. - - * mail-preferences.h: add propmanager member. - - * Makefile.am (evolution_mail_SOURCES): add mail-font-prefs.[ch] - to the build. - - * mail-tools.c (mail_tool_quote_message): use the html reply logic - even for plain parts so that we can test out the new gtkhtml cite logic. - - * importers/evolution-mbox-importer.c (process_item_fn): add const - to silence warning. - - * mail-display.c: add gtkhtml.h include so to pick up the - object_relative prototype. - -2002-04-26 Larry Ewing - - * mail-font-prefs.c: Add the font config dialog. - - * mail-font-prefs.h: add font config dialog headers. - -2002-04-26 Jeffrey Stedfast - - * Makefile.am: Don't link with libibex anymore, it's been - deprecated. - - * mail-callbacks.c (next_unread_msg): Do away with the - goto-next-folder stuff, it's very annoying. - - * mail-config-druid.c (extra_prepare): After building the extra - config options into a Gtk form, auto-detect any values that we can - and populate them by calling - mail_account_gui_auto_detect_extra_conf. - - * mail-account-gui.c (mail_account_gui_auto_detect_extra_conf): - New function to auto-detect the extra config options for a source. - -2002-04-24 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_build_extra_conf): Allow - providers to override text entry boxes too. - (source_type_changed): Remove the logic to decide upon default - paths, these paths can now be set by the provider. - -2002-04-24 Jeffrey Stedfast - - * folder-browser.c (label_menu): Update to use - E_POPUP_MENU_PIXMAP_WIDGET_ITEM_CC so that our callback gets - called without per-item closure rather than being called with NULL - and causing a segfault. - - * mail-account-gui.c (mail_account_gui_build_extra_conf): Set the - default Username label and handle the new - CAMEL_PROVIDER_CONF_LABEL enum allowing the provider to setup a - label. - -2002-04-23 Jeffrey Stedfast - - * mail-accounts.c: Added back the checkmark icon for enabled - accounts. - (account_able_clicked): Don't reload the accounts list, that was - just lame. - -2002-04-22 Jeffrey Stedfast - - * mail-display.c (mail_display_render): Plug-in Anna's html for - the flag-for-followup stuff. Finishes up bug #90. - -2002-04-19 Jeffrey Stedfast - - * folder-browser.c (folder_browser_finalise): Free the - loading/pending/new/loaded_uid string buffers. - - * mail-config.c (config_read_signature): Free some temporary path - buffers. - - * mail-display.c (stream_write_or_redisplay_when_loaded): Ref the - html object here, this is an async handler so it's possible for - our caller (or someone else) to unref the html object before we - finish. - (load_content_free): Unref the async handler's ref of the html - object here. - (mail_display_new): Ref the html widget here so that we can be - sure that so long as the mail-display is "alive", so is the html - object. See bug #22328 for details. Basically, the message-browser - is being closed before the message gets loaded and so the html - object was being destroyed but the mail-display was still alive. - (mail_display_destroy): Unref the html object when the - mail-display is destroyed. - -2002-04-19 Anna Marie Dirks - - * mail-config.glade: Added yet more accelerators for the new config - dialog--this time for the composer pages - -2002-04-19 Anna Marie Dirks - - * mail-config.glade: Added a bunch of accelerators for the new config - dialog - -2002-04-18 Jeffrey Stedfast - - * mail-callbacks.c (redirect_get_composer): Removed all - Delivered-To headers before redirecting. Fixes bug #23635. - -2002-04-18 Radek Doulik - - * mail-callbacks.c (do_mail_print): use default paper name in case - of wrong translation - -2002-04-15 Not Zed - - * mail-identify.c (mail_identify_mime_part): Turn off the code - which downloads the part if we can't identify it. See discussion - in #11778. - -2002-04-17 Christopher James Lahey - - * folder-browser.c, mail-display.c: Updated these to match the new - EPopupMenu. - -2002-04-17 Jeffrey Stedfast - - * mail-format.c (handle_multipart_signed): Handle broken - multipart/signed parts such as where the signature part is not the - last part (as it should be). Fixes bug #23583. - - * folder-browser.c (message_list_drag_data_get): Free the temp - GByteArrays. - -2002-04-17 Jeffrey Stedfast - - * mail-local.c (mail_local_folder_construct): Just use g_basename. - (mlf_finalize): Free the real_path. - - * folder-browser.c (on_right_click): Unref the GdkGC so we don't - leak it. - -2002-04-16 Jeffrey Stedfast - - * mail-tools.c (mail_tool_destroy_xevolution): Free the format - string. - - * mail-config.c (config_write_signature): Don't leak the path - strings here. - - * mail-signature-editor.c (menu_file_save_cb): Free the dirname - string. - - * mail-config-factory.c (config_control_factory_cb): Ref the prefs - widget here since we unref in the destroy callback. Caught this - thanks to purify. - -2002-04-13 Jeffrey Stedfast - - * mail-accounts.c: Build fixes for --enable-nntp. - -2002-04-13 Christophe Merlet - - * mail-config.glade: Little typo. s/IS0/ISO/ - -2002-04-12 Jeffrey Stedfast - - * mail-composer-prefs.c (mail_composer_prefs_construct): Make it - so that unchecking the "Enable Advanced Options" in the signature - tab disables the advanced settings and vise versa. - - * mail-accounts.c (mail_accounts_tab_construct): Setup News - preferences too if it is enabled. - - * mail-account-gui.c (mail_account_gui_new): Set the text of the - reply-to. - (mail_account_gui_save): Get the reply-to text here. - (mail_account_gui_identity_complete): If there is text in the - reply-to widget make sure it's valid. - - * mail-config.c (identity_copy): Copy the reply-to. - (config_read): Read in the reply-to for all the accounts. - (mail_config_write): Save the reply-to. - (impl_GNOME_Evolution_MailConfig_addAccount): Get the reply-to. - (identity_destroy): Free the reply-to. - -2002-04-11 Jeffrey Stedfast - - * message-list.etspec: s/Sent/Date. This fixes bug #11159. - -2002-04-10 Jeffrey Stedfast - - * mail-callbacks.c (confirm_expunge): Set the 'No' button as the - default. - -2002-04-10 Dan Winship - - * mail-config.c (config_read, mail_config_write, - mail_config_get_x_mailer_display_style, - mail_config_set_x_mailer_display_style): Handle the X-Mailer - display style. (There is currently no GUI for configuring this.) - - * mail-format.c (write_headers, write_xmailer_header): Show - X-Mailer/User-Agent (and Rupert's stamp of approval) as - appropriate. - -2002-04-09 Jeffrey Stedfast - - * mail-account-gui.c (setup_service): Kludge around the brokeness - that is GtkOptionMenu just like we kludge around it for the - authtype option menu. - -2002-04-09 Dan Winship - - * component-factory.c (create_view): Add view_info arg, but don't - do anything with it. - -2002-04-08 Not Zed - - * mail-send-recv.c (receive_update_got_folderinfo): Argh! - get_folder_info owns and frees its *OWN* folder info, it shouldn't - be free'd here! See mail-ops.c:get_folderinfo_free. - This should fix #17259 and friends. - -2002-04-08 Jeffrey Stedfast - - * mail-signature-editor.c (menu_file_save_cb): Simplify a bit and - write to a temp file first and then rename() it to the real - filename. This protects against losing data if the drive is full - too. Also use a real mode, not 0, so that we can actually - save/read the content ;-) - - * GNOME_Evolution_Mail.oaf.in: Re-added the config wizard - interfaces. Ettore accidently removed them thinking they were - duplicates of the new mail-config interfaces. - - * mail-config.glade: Remove the OK, Apply, Cancel buttons from the - keyboard shortcut tab in the composer_prefs dialog. - - * mail-account-gui.c: No need to check gui->source before using - gui->source->url, since gui->source *has* to exist. - -2002-04-06 JP Rosevear - - * GNOME_Evolution_Mail.oaf.in: add config_item:type - -2002-04-04 Dan Winship - - * mail-account-gui.c (mail_account_gui_new): Make the drafts and - sent folder buttons be EvolutionFolderSelectorButtons. Remove the - code to deal with drafts_folder_name and sent_folder_name, since - they were only used to construct the button and aren't needed now. - (mail_account_gui_save): Remove drafts/sent name references. - (mail_account_gui_destroy): Likewise - (folder_selected): Handle the "selected" signal on the folder - selector button by updating the URI in the MailAccountGui. - (mail_account_gui_folder_selector_button_new): Glade custom widget - constructor. - - * mail-callbacks.c (transfer_msg): Update for - evolution_shell_client_user_select_folder change. - - * message-browser.c (transfer_msg): Likewise. (Sigh. Why is this - cut+pasted?) - - * mail-config.glade: Make the drafts/sent folder buttons custom - widgets. - - * mail-config.c (account_copy): Remove drafts/sent folder name - handling. - (account_destroy): Likewise. - (config_read): Likewise. - (mail_config_write): Likewise. - - * Mail.idl (MailConfig:Account): remove drafts_folder_name and - sent_folder_name. - -2002-04-03 Jeffrey Stedfast - - * message-tag-followup.c (construct): Set the window title/icon - here instead. - - * message-tag-editor.c (message_tag_editor_init): Don't set the - title or window icon here, this is a generic class. - - * mail-format.c (handle_multipart_signed): Replace - get_url_for_icon with the new mail_display_get_url_for_icon - function. - (handle_multipart_digest): Here too. - (get_cid): Use mail_display_add_url instead. - (get_location): Same. - (handle_text_enriched): Here too. - (handle_multipart_signed): And here. - - * message-tag-followup.c (message_tag_followup_i18n_name): Use the - U_() macro, not the _() macro as it is what we really want. - - * mail-ops.c (mail_send_message): Don't cast the message into a - CamelMedium before sending anymore. - - * mail-callbacks.c (expunge_folder): Set the followup argument to - NULL here. - (done_message_selected): Get the followup value here and pass it - to the mail-display here. - (do_mail_fetch_and_print): Again with the NULL followup here. - - * folder-browser.c (folder_browser_set_message_preview): Update to - pass in NULL as the followup since we are setting the message to - NULL here. - (done_message_selected): Get and set the appropriate followup - value here. - (do_message_selected): Update to pass in NULL as the followup - since we are setting the message to NULL here. - - * mail-display.c (mail_display_set_message): Now takes a followup - tag value. - (mail_display_init): Set md->followup to NULL. - (mail_display_destroy): Free md->followup. - (mail_display_add_url): New: replaces the static add_url function - originally in mail-format.c - (mail_display_get_url_for_icon): New: replaces get_url_for_icon - which was originally in mail-format.c - -2002-04-03 Dan Winship - - * mail-account-gui.c: Changes to allow combined store/transport - providers (like exchange and nntp). You can only select the - transport if the account is also using that provider for the - source. - (source_type_changed): If changing away from a combined - store/transport type, disable that provider on the transport page. - If change to a combined store/transport type, enable and select - that provider on the transport page. - (mail_account_gui_setup): Do some additional bookkeeping here to - make the above stuff work. - (transport_type_changed): If the provider is a combined - store/transport type, pretend it doesn't need any additional URL - configuration. - (mail_account_gui_transport_complete): if the transport provider - is also a store provider, then as long as it matches the source - for the account, it's considered complete. - (mail_account_gui_save): If the selected transport is a combined - store/transport provider, use the source page's information to - fill in the transport url. - - * mail-local.c (mail_local_provider_init): Don't set up - service_cache. - -2002-04-02 Jeffrey Stedfast - - * mail-callbacks.c (do_edit_messages): Pass the UID of the message - being edited to the save-draft signal handler. - (composer_save_draft_cb): Pass the old draft uid to our async - append_message function and let the append_message callback worry - about deleting the old draft message on success. - (save_draft_done): Delete the old draft message if we successfully - appended the new draft message. - -2002-04-01 Jeffrey Stedfast - - * folder-browser-ui.c: Removed an unused pixmap from - Tools/Settings to avoid a big nasty bonobo warning. - - * mail-composer-prefs.c (mail_composer_prefs_construct): - Re-Implemented the signature editor stuff (mostly just copy/paste - from Radeks original code). - - * mail-signature-editor.c (mail_signature_editor): Use the right - oafiid for the html editor control. - -2002-04-01 Dan Winship - - * importers/Makefile.am (liboutlook_la_LDFLAGS, - libmbox_la_LDFLAGS): Use -avoid-version -module. (From Max Horn - ) - -2002-03-29 Ettore Perazzoli - - * GNOME_Evolution_Mail.oaf.in: Added priorities for all the - configuration pages [evolution:config_item:priority]. - -2002-03-29 Jeffrey Stedfast - - * mail-preferences.c (colorpicker_get_color): Don't shift the r, g - and b values here either. - - * mail-composer-prefs.c (colorpicker_get_color): Don't shift the - r, g, b values. - - * mail-preferences.c (mail_preferences_construct): Restore the - labels & colours options from the grave. - (mail_preferences_apply): Save these labels & colours options. - -2002-03-29 Jeffrey Stedfast - - * mail-composer-prefs.c (mail_composer_prefs_construct): Same - here. - - * mail-preferences.c (mail_preferences_construct): Do some gtk - hackery action so we can detect if a option menu has changed. - -2002-03-29 Ettore Perazzoli - - * GNOME_Evolution_Mail.oaf.in: Cleaned up a bunch [removing - duplicates ;-)], set up icons for all the configuration pages. - -2002-03-28 Jeffrey Stedfast - - * mail-accounts.c: Use a GtkCList instead of an ETable, for some - reason the etable was getting into some infinite resize loop or - something. I probably did something wrong but I can't figure out - what so I'm using a clist for now. - (account_cursor_change): Make sure that event is non-NULL here. - -2002-03-27 Ettore Perazzoli - - * mail-accounts.c (mail_accounts_tab_construct): Use - gtk_container_add() to put the toplevel in the parent widget, - instead of just gtk_widget_set_parent(). - * mail-preferences.c (mail_preferences_construct): Likewise. - * mail-composer-prefs.c (mail_composer_prefs_construct): Likewise. - -2002-03-27 Jeffrey Stedfast - - * mail-callbacks.c (mail_generate_reply): Updated to respect the - new mail-config options for default reply style that NotZed had - started to implement before there was a gui. - -2002-03-27 Dan Winship - - * mail-display.c (do_attachment_header): unset GTK_CAN_FOCUS on - the button so that it can't grab focus when you click it. - (do_signature): Likewise on the signature button. #3904 - -2002-03-26 Jeffrey Stedfast - - Sync with yet-another-mail-config branch. - - * mail-composer-prefs.c: Updated to get the right widgets and - whatnot. Also updated to tell the evolution-config-control that - stuff has changed. - - * mail-preferences.c: Updated to get the right widgets and - whatnot. Also updated to tell the evolution-config-control that - stuff has changed. - - * mail-accounts.etspec: New file needed by mail-accounts.c - -2002-03-26 Not Zed - - * mail-callbacks.c (addrbook_sender): Changed to get the address - from the messageinfo of the current selected message rather than - from the current_message. - (requeue_mail_reply): Only re-queue if we got a message, could - potentially cause an infinite loop trying to get a message it - can't. - (reply_to_sender, reply_to_list, reply_to_all): Always pass NULL - as the msg to mail_replay, this forces mail_reply to always load - the message anew. Fixes FIXME's and popup behaviour. Basically - this and stuff below fixes #8542. Its probably not the nicest - way, but it works. - (mark_as_important): Use the flags properly, we can set all flags - to any combination of on or off as we want, so we just need to - call set_flags once, thats why its set flags and not set_option. - (toggle_flags): Fixed the logic here also, so we dont have to call - set_message_flags more than once, and also implement a true toggle - for any number of simultaneous flags (whilst simplifying code). - - * mail-vfolder.c (vfolder_gui_add_from_mlist): Removed the 'msg' - parameter, its not used, fixed callers. - - * folder-browser.c (on_right_click): Lookup the mlist from - messageinfo, and change the 'no selected' logic slightly, fixes - most of #8542. - (filter_data_free): Free filter data struct. - (vfolder_type_got_message): Actually create vfolder once we have - the message we need to use for it. Code could probably be changed - to use messageinfo instead. - (vfolder_type_uid): Lookup a message based on uid, and use that to - create a vfolder based on type. - (vfolder_subject_uid, vfolder_sender_uid, vfolder_receipient_uid, - vfolder_mlist_uid): Callbacks for the popup menu, used to create - rules based on the uid rather than the message, which it loads as - required. - (filter_type_got_message, filter_*_uid): Similar to vfolder - stuff above. - (filter_menu[]): Changed callbacks to popup specific ones, not - folderbrowser specific ones used by bonobo. - (on_right_click): Initialise callback data for the filter submenu - so it can look up messages for callback implementation. - - * local-config.glade: New version from anna, with fixed widget - names. - -2002-03-20 Ettore Perazzoli - - * folder-browser.c: Reorder folder_browser_search_menu_items - according to #16246. - -2002-03-24 Ettore Perazzoli - - * mail-send-recv.c: Remove member current_folder from struct - _send_data. - (build_dialogue): Remove arg @current_folder. - (mail_send_receive): Likewise. - (free_send_data): No need to refresh the current folder here. - [Well, hopefully, at least.] - - * component-factory.c (send_receive_callback): New. - (create_component): Connect. - - * mail-callbacks.c (send_receive_mail): Removed. - - * folder-browser-ui.c: Remove "MailGetSend" verb. - -2002-03-22 Jeffrey Stedfast - - * GNOME_Evolution_Mail.oaf.in: Add info about the new config - controls. - - * mail-config-factory.c: New file to handle the creation/etc of - the config controls. - - * mail-accounts.c: - - * mail-preferences.c: - - * mail-composer-prefs.c: No longer handle their own bonobo control - creation. - -2002-03-22 Jeffrey Stedfast - - * mail-account-gui.c (sig_new_text): Temporarily #if 0 this - function out. - (sig_new_html): Same. - - * mail-config.c (config_read): Read in the default reply style - setting. - (mail_config_write_on_exit): Same the default reply style. - (mail_config_get_default_reply_style): New function to get the - default reply style. - (mail_config_set_default_reply_style): New function to set the - default reply style. - - * folder-browser-ui.c: There is no longer a Tools/Mail Settings - menu item. - - * mail-account-gui.c: Updated the widget types for the - MailAccountsDialog->MailAccountsTab change. - - * mail_account_editor.c: Same. - - * mail-callbacks.c (providers_config): Removed. - - * mail-composer-prefs.c: New file that implements the composer - preferences tab of anna's new config design. - -2002-03-21 Jeffrey Stedfast - - * mail-accounts.c: Reimplemented. This time we only have to worry - about accounts. Also this now implements Annas config gui changes. - - * mail-preferences.c: Implements the mailer's Preferences tab in - Anna's new config GUI. - -2002-03-19 Larry Ewing - - * mail-display.c: add missing NULL closure data to popup menu - initialization. - -2002-03-19 Dan Winship - - * Makefile.am (evolution_mail_LDADD): s/libversit.la/libversit.a/ - -2002-03-18 Ettore Perazzoli - - * main.c (main): Report a message before entering bonobo_main() to - simplify debugging. - -2002-03-18 Ettore Perazzoli - - * folder-browser.c: Remove E_FILTERBAR_RESET menu entry. - -2002-03-15 Jeffrey Stedfast - - * folder-browser.c (on_right_click): Draw colour rectangles for - each of the colour items and set a closure on each. - (colourise_msg): colourise the message, yo. - -2002-03-15 Jeffrey Stedfast - - * mail-callbacks.c (colour_msg): New callback to set a colour on a - message. - - * folder-browser.c (on_right_click): Setup our popup icons and - stuff. Also add a submenu for Labels. - - * mail-display.c (pixmap_press): Sync up with the new EPopupMenu - API. Note: This code can probably now be fixed to use per-item - closures - yay! - - * mail-accounts.c (construct): Connect to the label GtkEntry's and - GnomeColorPickers and also to the Restore Defaults button. - - * mail-config.c (mail_config_get_label_name): New function to get - a label's name. - (mail_config_set_label_name): New function to set the label name. - (mail_config_get_label_color): New function to get the label - color. - (mail_config_set_label_color): New function to set the label - color. - (config_read): Read in the config options for the labels and their - colors. - (mail_config_write_on_exit): Save the label options. - -2002-03-15 Larry Ewing - - * mail-display.c: expand the relative urls of the object at the - point so that relative images can be saved correctly. - - * folder-browser.c: add a closing quote in a comment. - -2002-03-15 Ettore Perazzoli - - * folder-browser-factory.c (control_activate): Set the UI - component on the search bar. - -2002-03-14 Dan Winship - - * component-factory.c (folder_types): Remove "mailstorage", since - it's not needed any more. - (storage_activate): Gone, although some of it is moved to - storage_connect. - (create_view): Remove mailstorage code. - (add_storage): Connect to the storage's open_folder signal. - Instead of creating a "mailstorage" folder, call - evolution_storage_has_subfolders to let the shell know we haven't - finished filling it in yet. - (storage_connect): Handler for the storage's asyncOpenFolder - signal. Call mail_note_store() to try to connect. - (storage_connected): Callback for above. If the connection attempt - failed, call evolution_storage_has_subfolders again to make the - shell re-close the storage. - - * mail-folder-cache.c (update_folders): Remove a piece of - mailstorage legacy code from here. - -2002-03-14 Radek Doulik - - * mail-config.c (get_new_signature_filename): create new signature - file - (delete_unused_signature_file): be more careful about signature - file path before unlinking - -2002-03-14 Jeffrey Stedfast - - * mail-callbacks.c (next_thread): Implemented. - - * message-list.c (message_list_select_next_thread): New function - to select the next thread. - -2002-03-13 Jeffrey Stedfast - - * folder-browser-window.c (folder_browser_window_new): Set a - default size of the window, so we don't get this itty-bitty window - the size of a quarter on the screen when it first gets shown. - -2002-03-12 Jeffrey Stedfast - - * mail-display.c (on_link_clicked): Handle digest: urls. - - * mail-format.c (setup_mime_tables): Add a handler for - multipart/digest. - (handle_multipart_digest): Handle multipart/digest parts. - -2002-03-12 Jeffrey Stedfast - - * folder-browser.c (folder_browser_set_folder): Set the folder on - a folder-browser object. - - * folder-browser-window.c (folder_browser_window_new): Simple - window to display a folder-browser. - - * mail-callbacks.c (view_digest): New callback to open a - folder-browser-window with a digest folder. - -2002-03-08 Radek Doulik - - * mail-signature-editor.c (menu_file_save_cb): truncate stream - before saving - - * mail-config.c (mail_config_signature_set_html): new function - - * mail-accounts.c (sig_event_client): watch for HTML changed event - - * mail-signature-editor.c: added HTML check menu item to Format - menu - -2002-03-08 Dan Winship - - * mail-config-druid.c (management_prepare): Rewrite this to not - use stpcpy, which isn't portable. - -2002-03-08 Radek Doulik - - * mail-accounts.c (sig_event_client): handle name changed event - (sig_load_preview): don't run script before each reload - (sig_script_activate): run script only if script entry is - activated - - * mail-signature-editor.c (mail_signature_editor): added signature - name entry - -2002-03-07 Jeffrey Stedfast - - * mail-config-druid.c (management_changed): Re-focus the account - name entry widget. - (identity_prepare): If a name is not set, try and get the user's - full name for them and set the text on the entry widget. - (management_prepare): If the account name is already taken, - generate a unique one by appending " (%d)". - -2002-03-07 Radek Doulik - - * mail-account-gui.c (sig_new_html): make edit button sensitive - after new signature is created - (sig_new_text): ditto - -2002-03-07 Anna Marie Dirks - - * folder-browser.c: Made all the acclerators in the context menu - on a message work. (There are 22 different menu items here, so - picking a unique accelerator for each label was tricky, and some - of the choices I made are different from the ones I would have - made if there weren't so many stinking menu items.) - -2002-03-07 Jeffrey Stedfast - - * mail-config.c (config_import_old_signatures): Don't use an - uninitialized 'id'. - -2002-03-07 Radek Doulik - - * mail-signature-editor.c: notify accounts dialog about signature - content change - - * mail-accounts.c (run_script): run script only if file regular - file exists and has x flag - - * mail-signature-editor.c (mail_signature_editor): set initial - focus to editor - (do_exit): use hasUndo to avoid question dialog when content is - unchanged - -2002-03-07 Dan Winship - - * component-factory.c (add_storage): Update for storage changes: - explicitly create a root folder. - -2002-03-06 Dan Winship - - * mail-display.c (mail_display_render): Fix the "don't scroll back - to the top of the HTML widget when opening an attachment" hack - again by moving it here from mail_display_redisplay(). (It has to - happen after the gtk_html_begin.) - (mail_display_redisplay): Pass reset_scroll arg to - mail_display_render. - - * mail-callbacks.c (do_mail_print): Pass reset_scroll (TRUE) to - mail_display_render. - -2002-03-05 Dan Winship - - * folder-browser-ui.c: Don't try to set pixmap for - /Toolbar/MailCompose, since it doesn't exist any more. - -2002-03-05 Jeffrey Stedfast - - * mail-account-gui.c (save_service): "use_ssl" can now be 3 - options, modify the code to handle this. - (setup_service): Toggle the correct ssl option. - (source_type_changed): Show/hide the ssl hbox container widget. - (transport_type_changed): Same. - -2002-03-05 Dan Winship - - * mail-folder-cache.c (mail_note_store): Pull up assertion change - from evolution-1-0-branch to allow external storages. - -2002-03-04 Jeffrey Stedfast - - * mail-accounts.c (mail_unselect): If the clicked column was - column 0, enable/disable it. - (mail_select): Same. - - * mail-display.c (load_http): Added more debugging code to help - figure out why a certain image isn't loading - looks like - gnome-vfs is getting a premature EOF? - - * folder-browser.c (my_folder_browser_init): Connect to the - focus-in/out events on the message-list so that we can disable the - EditInvertSelection and EditSelectThread menu items when the - message-list is not in focus. - - * folder-browser-ui.c (folder_browser_ui_message_list_unfocus): - New function to de-sensitize some items if the message-list is not - in focus. - (folder_browser_ui_message_list_focus): New function to sensitize - some items if the message-list is not in focus. - - * mail-callbacks.c (invert_selection): Only invert the selection - of the message-list if it is the widget in focus. - - * message-list.c (message_list_select): Do not explicitly grab the - focus here. - -2002-03-04 Ettore Perazzoli - - [Fix #19303.] - - * mail-ops.c (mail_send_message): Set X-Mailer to say "Ximian - Evolution", not just "Evolution". - -2002-03-01 Jeffrey Stedfast - - * mail-callbacks.c (forward_message): Forward all selected - messages. Fixes bug #21190. - -2002-02-26 Jeffrey Stedfast - - * mail-format.c (handle_text_html): Get the Content-Base if the - header exists and use gtk_html_set_base to set this base url. - - * mail-display.c (on_link_clicked): No longer need to calculate - the full url. This is now handled by GtkHTML. - (on_set_base): Removed. - (on_url_requested): No longer need to calculate the full url. - (mail_display_initialize_gtkhtml): Don't connect to the set_base - signal anymore. We don't care. - - * mail-display.h: No longer need base_url (it was broken anyway). - -2002-02-26 Not Zed - - * mail-display.c (on_url_requested): If a related part is - requested, remove it from the related undisplayed list. - - * mail-format.c (handle_multipart_related): Check if related parts - are displayed, if not, remove them. For #2741. - -2002-02-24 Chris Toshok - - * folder-browser.c (folder_browser_search_do_search): rename - folder_browser_search_query_changed to this. - (folder_browser_gui_init): hook both query_changed and - search_activated up to folder_browser_search_do_search, preserving - current behavior. - -2002-02-22 Jeffrey Stedfast - - * message-list.c (on_message_list_built): Removed, this wasn't - working as intended and seemed to break other features. - -2002-02-21 Ettore Perazzoli - - * component-factory.c (create_component): Add an icon for the "New - message" user creatable item. - -2002-02-21 Jeffrey Stedfast - - * message-list.c (on_message_list_built): Connect to our own - message_list_built signal. Focus the list and select the first - unread message (or frst message depending). Fixes bug #3900. - -2002-02-20 Anna Marie Dirks - - * message-tag-editor.c (message_tag_editor_init): Gave the editor - window a title and an icon. - -2002-02-20 Anna Marie Dirks - - * message-tags.glade: Changed the policy for table2 so that it - does not expand/fill. This was necessary to allow the message list - as much growing room as possible. (And besides, there's no reason for - table2 to expand/fill; its child widgets can't change size. - -2002-02-19 Jeffrey Stedfast - - * mail-callbacks.c (confirm_goto_next_folder): Prompt the user to - find out if he/she wants to go to the next folder with unread mail - in it. - (find_current_folder): Find a given CamelFolderInfo node based on - a given uri. - (find_next_folder_r): Recursively look for a CamelFOlderInfo node - which has unread messages. - (find_next_folder): Given a currently selected CamelFolderInfo - node, look for the next node containing unread messages. - (do_evil_kludgy_goto_next_folder_hack): Find the currently - selected folder and then find the very next folder after it that - contains unread messages and then select it via a CORBA call to - the shell. - (next_unread_msg): If we fail to find an unread message in the - message-list, prompt the user to find out if we should jump to the - next fodler containing unread messages. If so, call - do_evil_kludgy_goto_next_folder_hack(). - - * message-list.c (message_list_select): Return a boolean value - based on whether the call was successfull or not. - - * mail-config.c (mail_config_get_confirm_goto_next_folder): - (mail_config_set_confirm_goto_next_folder): - (mail_config_get_goto_next_folder): - (mail_config_set_goto_next_folder): All new functions, yay. - (config_read): Read in the confirm_goto_next_folder and - goto_next_folder config options. - (mail_config_write_on_exit): Same the options here. - -2002-02-15 Jeffrey Stedfast - - * mail-account-gui.c (basename_from_uri): Ack, strip off the - leading '/' char and also only translate if it is a local uri, - imap folders and other external folders will be named by the user - so no need to translate those. - - * mail-display.c (do_attachment_header): Don't display a - down-arrow if the attachment is undisplayable. Fixes bug #6919. - (launch_cb): Some programs are buggy when it comes to parsing - file: uris, so make sure we do file://%s. Fixes bug #20456. - -2002-02-14 Jeffrey Stedfast - - * mail-account-gui.c (basename_from_uri): Replacement for using - g_basename and also translates the basename string to fix bug - #7160. - (mail_account_gui_save): Use basename_from_uri(). - (folder_picker_clicked): Here too. - - * mail-callbacks.c (mail_generate_reply): Default the from-account - to the source account. If that fails, then guess the from-account - based on the recipients. Fixes bug #20479. - -2002-02-13 Jeffrey Stedfast - - * mail-display.c (drag_data_get_cb): Implement. - (drag_data_delete_cb): Implement. - (do_attachment_header): Setup Drag & Drop. This implements - bugzilla bug #1066. - - * folder-browser-ui.c: Set the followup icon to use the new flag - icon rather than the exclamation mark icon. - - * mail-callbacks.c (flag_for_followup): Append the selected - messages to the clist in the followp editor. - - * message-list.c: Include the new flag-for-followup icon. - - * message-tag-followup.c (message_tag_followup_append_message): - New method to add a message to the message-list. - (construct): Get the message_list widget and load the flag icon - pixmap. - -2002-02-12 Jeffrey Stedfast - - * message-tag-followup.c (set_widget_values): Fixed a bug. - - * mail-callbacks.c (flag_for_followup): If only 1 message is - selected and it happens to already be marked for follow-up, set - the value of the flag on the editor so the settings are restored. - - * folder-browser-ui.c: Set the pixmaps on MarkAsRead, MarkAsUnread - and MarkAsImportant bonobo verbs. Also connect to - flag-for-followup verb. - (folder_browser_ui_set_selection_state): Added MessageFollowUpFlag - verb to the array of verb strings. - - * folder-browser.c: Set key accelerators on the follow-up - right-click menu items to match Outlook. - -2002-02-12 Jeffrey Stedfast - - * mail-callbacks.c (create_msg_composer): No longer need to call - e_msg_composer_show_sig_file(). This gets handled auto-magically - by a signal emition when the default From address chooser gets - created. - (do_forward_non_attached): No longer need to call it here either - because e_msg_composer_set_body_text() now makes sure to re-show - the signature. - -2002-02-12 Jeffrey Stedfast - - * mail-callbacks.c (do_forward_non_attached): Show the signature. - -2002-02-11 Jeffrey Stedfast - - * message-list.c (ml_tree_value_at): Get followup-up message-list - values. Also highlight the message in red if the due-by date is - past due (this is what Outlook does). - (ml_duplicate_value): Handle follow-up columns. - (ml_free_value): Same. - (ml_initialize_value): Here too. - (ml_value_is_empty): And here. - (ml_value_to_string): And finally here. - - * message-tag-followup.c (message_tag_followup_i18n_name): New - convenience function. - -2002-02-11 Radek Doulik - - * mail-callbacks.c (create_msg_composer): unset changed, drop - editor undo - (mail_generate_reply): drop editor undo - (do_forward_non_attached): ditto - (do_forward_attach): ditto - (do_redirect): ditto - -2002-02-11 Jeffrey Stedfast - - * folder-browser.c (followup_tag_complete): Implemented. - (on_right_click): Do better enabling/hiding of unwanted - flag-for-followup options. - -2002-02-09 Jeffrey Stedfast - - * message-tag-followup.c (set_widget_values): Set the correct - drop-down menu item. - (message_tag_followup_encode): Return NULL if the type is NONE. - (clear_clicked): Set the drop-down menu to None. - (type_changed): Hide the None menu item. - (construct): Create a None menu item and set it as the default. - -2002-02-08 Jeffrey Stedfast - - * message-tag-followup.[c,h]: New flag-for-followup tag editor - dialog. - - * mail-callbacks.c (flag_for_followup): New callback that pops up - a flag-for-followup editor dialog. - (flag_followup_completed): Marks all flag-for-followup'd messages - as 'complete'. - (flag_followup_clear): Clears all flag-for-followup tags from the - selected messages. - - * message-tags.glade: glade file for tag editors. - -2002-02-08 Jeffrey Stedfast - - * message-tag-editor.[c,h]: Base class for a message tag editor. - - * folder-browser.c (on_right_click): Setup the hide/enable masks - for "Flag for Follow-up" - - * mail-callbacks.c (confirm_expunge): Instead of hiding deleted - messages and then expunging, disable the use of the message-list - completely during the expunge operation. - (expunged_folder): Re-enable the use of the message-list widget - here. - -2002-02-07 Radek Doulik - - * mail-callbacks.c (mail_generate_reply): call set_body later to - allow ignored words to be sent to gtkhtml control ahead - -2002-02-07 JP Rosevear - - * component-factory.c (create_component): remove "New" from user - creatable menu item - -2002-02-07 Christopher James Lahey - - * folder-browser.c, folder-browser.h, folder-browser-ui.c, - folder-browser-ui.h - (folder_browser_ui_setup_view_menus, - folder_browser_ui_discard_view_menus): Changed this to use the new - GalViewMenus stuff. Made these exported functions. - - * mail-callbacks.c, message-browser.c: Changed these to not pass - the now removed row parameter to message_list_select. - - * mail-config.c, mail-config.h (mail_config_folder_to_safe_url): - Refactored this out of mail_config_folder_to_cachename. - - * message-list.c, message-list.h (message_list_select): Removed - the row argument. Changed this to use the new function in ETree - for finding the next cursor row that matches a test. - (message_list_construct): Handle a failed construction of the - ETree here. - (message_list_setup_etree, save_tree_state): Don't load or save - the header state. folder-browser-ui.c deals with this now. - -2002-02-06 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_new): Rearranged the #if - checks so that we don't ever try to access any smime widgets - (since they are now being destroyed) if smime isn't enabled. - (mail_account_gui_save): Same here. - - * message-list.c: Removed references to NEEDS_REPLY. - - * mail-callbacks.c (mark_as_needing_reply): Removed. - (mark_as_not_needing_reply): Removed. - (toggle_need_reply): Removed. - - * folder-browser.c (on_right_click): Remove CAN_MARK_NEEDS_REPLY - stuff, this is going to be implemented in an entirely different - way. - - * mail-format.c (handle_text_plain): Look for DOCTYPE XML comments - too to decide if the message content is really HTML. - -2002-02-06 Not Zed - - * mail-callbacks.c (mail_generate_reply): Dont double-free the - text body data. - -2002-01-31 Not Zed - - * mail-callbacks.c (mail_generate_reply): Add attachments after - we've seen if the composer object is valid. - (mail_generate_reply): Support new flag REPLY_NO_QUOTE - if set, - then dont quote any of the message in the reply. - -2002-02-02 Ettore Perazzoli - - * mail-account-gui.c (mail_account_gui_new): Destroy the S/MIME - frame if not available, instead of just graying it out. [I would - just hide it, but it looks like there is a show_all somewhere so - that doesn't work.] - -2002-02-02 Ettore Perazzoli - - * mail-config.glade: Some touchups from me and Anna. - -2002-01-31 Jeffrey Stedfast - - * mail-callbacks.c (composer_get_message): Don't bother setting - the auto-cc/bcc recipients here. I'm moving the code to add them - in the GUI in the composer so they will already be in the - recipient list by this point. - -2002-01-31 Radek Doulik - - * mail-callbacks.c (mail_generate_reply): ignore spell checking of - words in addresses, move set_body_text after all ignored words are - set so we don't have to spell check whole document again - (mail_ignore_address): helper function - (mail_ignore): ditto - -2002-01-30 Jeffrey Stedfast - - * mail-accounts.c (mail_edit): Pass the parent window to - mail_account_editor_new(). - - * mail-account-editor.c (mail_account_editor_new): Set the parent - window here because construct() inadvertantly - gtk_widget_show_all's the editor. - - * mail-account-gui.c (mail_account_gui_save): Use g_basename() - rather than strrchr for '/' especially since the strrchr code - wasn't doing any NULL checks. - -2002-01-30 Radek Doulik - - * mail-format.c (handle_text_plain_flowed): print quoted text in - italic - -2002-01-30 Not Zed - - * component-factory.c (create_component): re-enable popup menu. - (populate_folder_context_menu): If we're on a vfolder, and its not - UNMATCHED, create a change properties item, and set it up - approriately. - (change_prop_popup): Callback to edit the vfolder rule. For - #3358. - -2002-01-29 Dave West - - * mail-callbacks.c (create_msg_composer): Changed the function - signature so that we can pass in whom we want to compose as. - Should fix bug #10391. - (compose_msg): Get the current profile account and pass it along - to create_msg_composer. - (send_to_url): Pass in a NULL profile account to cause - create_msg_composer to use the default account. - -2002-01-29 Jeffrey Stedfast - - * mail-ops.c (mail_send_message): Make X-Evolution-Account take - priority over X-Evolution-Transport. Should we just get rid of - X-Evolution-Transport? Anyways, this ought to fix a number of - complaints. - - * mail-accounts.c (construct): Don't pass NULL text to - gtk_entry_set_text. Maybe this will fix bug #18971. - -2002-01-29 Jeffrey Stedfast - - * mail-callbacks.c (redirect): New function that implements the - Redirect feature. - - * mail-ops.c (mail_send_message): If we are redirecting a message, - get the Resent-* recipients otherwise get the normal To/Cc/Bcc - recipients and use them in the CamelTransport::send_to() method. - - * mail-session.c (main_get_filter_driver): Set the beep_func to - the beep_cb, not the play_sound_func. Oops ;-) - - * folder-browser-ui.c: Add Redirect bonobo verb thingy here. - (folder_browser_ui_set_selection_state): Add MessageRedirect to - the proper string arrays. - -2002-01-29 Radek Doulik - - * mail-callbacks.c (do_mail_print): initialize line to 0 to make - everybody happy ;-) - ops, set local_font to NULL - (do_mail_print): get rid of static global variables, as they are - not thread safe (thanks to clahey for pointing this out) - (footer_info_free): unref footer font - -2002-01-28 Jeffrey Stedfast - - * mail-callbacks.c (composer_get_message): Don't bother checking - for invalid recipients anymore. If a recipient is invalid, the - transport error message will specify that now. - -2002-01-28 Radek Doulik - - * mail-callbacks.c (do_mail_print): print footer - (footer_print_cb): print page number and number of pages - -2002-01-27 Ettore Perazzoli - - * importers/Makefile.am: Use IMPORTERS_CFLAGS. - -2002-01-25 Jeffrey Stedfast - - * mail-account-gui.c (delete_event_cb): We need to return a value - here. I think FALSE is fine (I hope). - - * mail-display.c (save_data_cb): Save the pathname. - (save_part): Use the new mail_config cruft to get the last used - save pathname. - - * mail-config.c (config_read): Read in last_filesel_dir string. - (mail_config_write_on_exit): Save the last_filesel_dir setting. - (mail_config_get_last_filesel_dir): New - (mail_config_set_last_filesel_dir): New - - * component-factory.c (destination_folder_handle_motion): Do some - NULL checking on the url before using it. - (destination_folder_handle_drop): Make sure the uri is non-NULL - before freeing. - -2002-01-24 Ettore Perazzoli - - * Makefile.am: s/MAILER_CFLAGS/EVOLUTION_MAIL_CFLAGS/, - s/MAILER_LIBS/EVOLUTION_MAIL_LIBS/. - -2002-01-24 Jeffrey Stedfast - - * mail-session.c (session_system_beep): This wrapper for gdk_beep(). - - * mail-account-gui.c (is_email): Don't bother trying to see if the - domain looks like a FQDN. - - * mail-callbacks.c (select_all): If the mail-display is in focus, - then select-all in the mail display rather than the - message-list. Fixes bug #19126. - -2002-01-23 Ettore Perazzoli - - * component-factory.c (create_component): Pass a NULL icon to - `evolution_shell_component_add_user_creatable_item()'. - -2002-01-23 Jeffrey Stedfast - - Implements bug #15692 - - * folder-browser.c (html_button_press_event): New callback that - checks to make sure that the mouse isn't over a link or image in - the html view and then calls the on_right_click handler after - getting the appropriate args. - (my_folder_browser_init): Connect to the button_press_event here. - -2002-01-23 Dan Winship - - * Makefile.am (INCLUDES): Define CAMEL_PROVIDERDIR to be the - configure.in-defined camel_providerdir. (Was supposed to have been - committed a month ago... oops.) - -2002-01-22 Jeffrey Stedfast - - * mail-ops.c (mail_filter_folder): Now takes a boolean notify - argument. If this is *not* set, then remove the sound-notify - filter rule that mail-session adds. Kinda kludgy, but good enough - for the moment. - - * mail-callbacks.c (guess_me): Simplified. - -2002-01-21 Jeffrey Stedfast - - * mail-format.c (handle_text_plain): If the first "token" in the - body is "", then treat this as a text/html part rather than - a text/plain part. Fixes bug #16817. - - * component-factory.c (destination_folder_handle_drop): Removed - some unused variables. - -2002-01-17 Jeffrey Stedfast - - * mail-format.c (try_uudecoding): Update to match new uudecode - interface (ie, no longer need a uulen state variable). - -2002-01-15 Jeffrey Stedfast - - * mail-display.c (on_set_base): New callback to handle the - set_base signal. - (on_url_requested): If the base_url is set, prepend it to the data - url (we don't want to do this for cid urls or part urls tho). - (mail_display_init): Initialize md->base_url to NULL. - (mail_display_destroy): Free the base_url. - (mail_display_initialize_gtkhtml): Connect to the set_base signal. - (on_link_clicked): If the base_url is set, prepend it to the url - string passed to us from gtkhtml. - -2002-01-10 Jeffrey Stedfast - - * mail-callbacks.c (do_edit_messages): Don't remove any - X-Evolution* headers here, the composer already knows to ignore - these. Besides, it needs to know the X-Evolution-Format header. - -2002-01-08 Jeffrey Stedfast - - * mail-callbacks.c (composer_save_draft_cb): Do proper refcounting - on the draft folder. - - * message-list.c (message_list_select): When performing a - wraparound, check to see if the first (or last depending on - direction) message fits the selection criteria before telling - etable to find the next/previous matching node. - - * mail-account-gui.c (mail_account_gui_new): When connecting to - the transport username changed event, pass the gui->transport not - the gui->source. - -2002-01-08 Iain Holmes - - * importers/evolution-mbox-importer.c (string_to_int): Takes a hex - string and converts it to an int. - (get_info_from_mozilla): Creates a CamelMessageInfo structure from - the X-Mozilla-Status header. - (process_item_fn): Check for the X-Mozilla-Status header and if it - is present call get_info_from_mozilla. If get_info_from_mozilla - returns that the message was marked as deleted but never expunged - it isn't imported. - - * importers/mozilla-status-headers.h: Stuff Evolution cares about - from the mozilla header. - -2002-01-07 Jeffrey Stedfast - - * mail-config.c (mail_config_set_new_mail_notify_sound_file): Renamed. - (mail_config_get_new_mail_notify_sound_file): Renamed. - - * mail-accounts.c (notify_radio_toggled): Replace EXEC with - PLAY_SOUND. - (construct): renamed the exec_command stuff to play_sound. - - * main.c (main): Init and shutdown gnome_sound. - - * mail-ops.c (fetch_mail_fetch): Don't do any new-mail - notification here. - (filter_folder_filter): call camel_filter_driver_flush. - - * mail-session.c (main_get_filter_driver): Set the filter-driver - exec_func here instead. - - * mail-ops.c (mail_fetch_mail): Don't set the filter-driver - exec_func here. - -2002-01-03 Jeffrey Stedfast - - * mail-callbacks.c (composer_get_message): Add an Organization - header. - -2002-01-02 Jeffrey Stedfast - - * mail-callbacks.c (list_add_addresses): Simplified. Also no - longer needs an "ignore_addr" argument as far as I can tell so - that has been removed. - (mail_generate_reply): Don't pass an ignore_addr argument to - list_add_addresses and also change to use g_strcase_hash and - g_strcase_equal since addresses are not case snesitive - (mostly). Also, Reply-To can contain multiple addresses, so handle - this case too. - -2002-01-02 JP Rosevear - - * mail-callbacks.c: remove e_gnome_dialog util functions and use - e-util ones instead - -2001-12-21 Jeffrey Stedfast - - The idea here is that if we consistantly name the movemail file - between Send&Receive sessions that if the user cancells the - "download" of a mbox spool that the next Send&Receive will not - "lose" mail that didn't finish the previous session. Fixes bug - #17759. Well, mostly. If you have 200 messages and cancel after - the first 100, say, then the next time you hit Send&Receive, it - will start over from 1 so you'll end up duplicating the first 100 - messages, but at least you won't "lose" mail. - - * mail-tools.c (mail_tool_get_local_movemail_path): Now a static - internal function, takes a char *uri argument and no longer - generates movemail.%d filenames... they are now based on the uri - provided. - (mail_tool_do_movemail): Pass along the source_uri. - -2001-12-20 Jon Trowbridge - - * message-list.c (on_click): Makes the auto-undelete behavior when - changing message flags a bit more sane. (Fixes #17634) - -2001-12-20 Ettore Perazzoli - - [Fixes #17377, Evolution doesn't work on multi-depth displays.] - - * main.c (main): Push GdkRGB visual and colormap. - -2001-12-19 Jeffrey Stedfast - - * mail-callbacks.c (composer_get_message): Add the auto-cc/bcc - recipients here. The problem with setting them in the composer is - that what if the user changes which account he wants to use? We'd - either have to clear the cc/bcc lists *or* we'd have to leave them - alone. Either way is bad. We can't just clear the entries because - the user may have added addresses since the composer was - opened. We don't want to leave any old auto-cc/bcc addresses there - because that isn't desirable either. So we give up and add them - here after the user has already hit the send button. - - * mail-config.c (account_copy): Update to copy the always-[b]cc - options. - (account_destroy): Update to destroy the above options. - (config_read): Update to read in those values. - (mail_config_write): Save those options. - - * mail-account-gui.c (mail_account_gui_new): Setup Always Cc/Bcc - widgets. - (mail_account_gui_save): Get the user-entered values for the - always-cc/bcc stuff. - -2001-12-19 Jeffrey Stedfast - - * mail-account-gui.c (setup_service): If the provider is NULL, - don't do anything. - - * mail-accounts.c (construct): Oops, no wonder the exec command - thing never stuck around... I wasn't getting the right widget from - libglade. Also connect to the GtkEntry's changed event since a - GnomeFileEntry doesn't have that signal in its ancestry. - -2001-12-18 Jeffrey Stedfast - - * mail-ops.c (filter_folder_free): Argh, don't notify about new - mail here. - (fetch_mail_fetch): Notify about new mail here instead. - - * mail-accounts.c (construct): Setup the new-mail-notification - widgets. - (notify_command_changed): Update the command-line for new mail - notification. - (notify_radio_toggled): Update the new-mail-notification type. - - * mail-ops.c (filter_folder_free): See if we got any new mail and - "sound the alarm" if we did. - -2001-12-17 Jon Trowbridge - - * mail-format.c (handle_text_plain_flowed): Set citation color to - black when we are printing. - - * mail-format.c (attachment_header): Avoid embedding tags - when we are printing. - (handle_multipart_signed): Don't do the click-for-info signature - stuff when we are printing. - (handle_via_bonobo): Don't embed an tag if we are - printing. - - * folder-browser.c: Changed context_menu[] array so that we can - print when the preview pane is closed. - -2001-12-14 Jeffrey Stedfast - - * mail-ops.c (mail_fetch_mail): Set the filter driver's shell-exec - callback. - -2001-12-12 Jeffrey Stedfast - - * mail-config.c (mail_config_check_service): Connect to the - destroy signal on the popup dialog. - -2001-12-12 Jeffrey Stedfast - - * mail-format.c (handle_text_plain): Make sure i != num_specials - after we check for any special text markers. Fixes bug #12265. - -2001-12-14 Jeffrey Stedfast - - * mail-callbacks.c (compose_msg): Connect to the save-draft signal. - (send_to_url): Here too. - (mail_reply): And here... - (forward_get_composer): Same. - (do_edit_messages): And finally here. - - * mail-format.c (try_inline_pgp): - (try_inline_pgp_sig): Start reiplementing The Right Way and not - danw's fucking half-assed kludge that doesn't work. - -2001-12-12 Jeffrey Stedfast - - * mail-config.c (mail_config_set_new_mail_notification_command): - set the new-mail-notify command. - (mail_config_get_new_mail_notification_command): get the - new-mail-notify command. - (mail_config_set_new_mail_notification): set the - new-mail-notification action. - (mail_config_get_new_mail_notification): get the - new-mail-notification action. - (mail_config_write_on_exit): save the new-mail-notification - settings. - (config_read): Read in the new-mail-notification settings. - - * mail-ops.c (mail_execute_shell_command): New function to execute - a shell command async. Will be used for playing sounds on new mail - or whatever. - -2001-12-11 Jon Trowbridge - - * mail-identify.c (mail_identify_mime_part): Fixed for - mail_content_loaded's new signature. - - * mail-format.c (attachment_header): Don't convert URLs, etc. if - we are printing. - (write_address): Don't convert addresses to mailto: links if we - are printing. - (write_one_text_plain_chunk): Add a printing flag, that we pass - along to mail_text_write. - (handle_text_plain): Pass our printing flag to - write_one_text_plain_chunk. - (mail_get_message_rfc822): Don't unneccesarily convert URLs. - (mail_content_loaded): Add a GtkHTML parameter. - - * mail-display.c (mail_display_initialize_gtkhtml): Added. Breaks - all of the signal hookups out of mail_display_new. - (mail_display_new): Call mail_display_initialize_gtkhtml. - (mail_text_write): Don't convert URLs, etc., if we are printing. - Lots of other changes to pass around GtkHTML/GtkHTMLStream objects. - - * mail-callbacks.c (do_mail_print): Call - mail_display_initialize_gtkhtml on our GtkHTML object. - - * folder-browser.c (update_status_bar): Make the status bar more - useful when you have a large number of hidden messages. - - * message-list.etspec: Add ETable magic for our new "Needs Reply" - column. (The next few entries are for bug #90) - - * message-list.h: Add COL_NEED_REPLY. - - * message-list.c: Move mail_need_reply_xpm to the end of - states_pixmaps. - (ml_duplicate_value): Handle COL_NEED_REPLY. - (ml_free_value): Handle COL_NEED_REPLY. - (ml_initialize_value): Handle COL_NEED_REPLY. - (ml_value_is_empty): Handle COL_NEED_REPLY. Added - needs_reply_map[] array. - (ml_value_to_string): Handle COL_NEED_REPLY. - (ml_tree_value_at): Fix magic numbers, undoing my changes from the - otehr day. Add handler for COL_NEED_REPLY. - (message_list_create_extras): Attach icons for COL_NEED_REPLY. - (on_click): Undo my previous changes to display need-reply status - in COL_MESSAGE_STATUS. Add handing for COL_NEED_REPLY. - - * mail.h: Change mail_format_mime_message, mail_format_raw_message - and the MailMimeHandlerFn typedef to take GtkHTML and - GtkHTMLStream args, as per our changes in mail-format.c. - - * mail-format.c: Giant refactoring. Remove the assumption - throughout that we will always want to render into the GtkHTML - object contained in the MailDisplay. Instead, always pass in the - GtkHTML and GtkHTMLStream that we want to write to. Also, ignore - theme work-arounds if the printing flag is set. (This and what - follows fixes bug #82) - - * mail-display.h: Remove GtkHTMLStream *stream from MailDisplay. - We don't need it anymore. - - * mail-display.c (mail_display_render): Added. Breaks the code - that renders the message into the GtkHTML object out of - mail_display_redisplay. - (mail_display_redisplay): Call mail_display_render. - (mail_display_init): Remove reference to ->stream. - (mail_display_new): Remove reference to ->stream. - - * mail-callbacks.c (do_mail_print): Create a new GtkHTML to render - our printed version into (via the new function - mail_display_render. Set the MailDisplay's printing flag to TRUE - before we render, and set it back to FALSE afterwards. - (do_mail_fetch_and_print): If the preview pane isn't open when we - try to print, fetch the message before printing. - (print_msg): Call do_mail_fetch_and_print. - (print_preview_msg): Call do_mail_fetch_and_print. - - * folder-browser-ui.c: Remove "PrintMessage" and - "PrintPreviewMessage" from message_pane_enables... these now work - when the preview pane is closed. Disable printing if multiple - messages are selected. - -2001-12-10 Jeffrey Stedfast - - * mail-ops.c (filter_folder_filter): Don't expunge when we sync - anymore, this fixes bug #4472. - -2001-12-04 Jeffrey Stedfast - - * mail-autofilter.c (rule_from_message): Make sure that the - message subject is non-NULL beforetrying to base a vfolder rule - off it. Fixes bug #16284. - -2001-12-07 Jeffrey Stedfast - - * mail-accounts.c (construct): Connect to the dialog's "destroy" - event and close any druids/editors that may be open when that - signal is caught. Fixes bug #16501. - - * mail-vfolder.c (vfolder_edit): Set the window title to "Virtual - Folders". Fixes bug #16695. - -2001-12-05 Radek Doulik - - * mail-callbacks.c (do_mail_print): set paper size to - _("US-Letter"), use gtk_html_print_set_master - -2001-12-08 Dan Winship - - * mail-display.c (on_object_requested): Don't just assume all of - the GtkHTMLEmbedded's fields are filled in, since HTML messages - may have s in them that we're not expecting. - -2001-12-07 Dan Winship - - * mail-send-recv.c (mail_send_receive): Add a "current_folder" - arg. - (build_dialogue): Remember the current_folder - (free_send_data): If current_folder is set, refresh it so it's - guaranteed to be synced with the folder tree. Fixes #14770. - - * mail-callbacks.c (send_receive_mail): Pass current_folder to - mail_send_receive(). - -2001-12-04 Jeffrey Stedfast - - * mail-display.c (stream_write_or_redisplay_when_loaded): Check - that the mail-display hasn't been destroyed. - (mail_display_redisplay): Same here. - -2001-12-07 Dan Winship - - * mail-send-recv.c (receive_update_got_store): If updating a store - that we don't have an associated storage for, just request a - folder tree and then free it. (For the Connector) - - * mail-callbacks.h: Add missing part of Jeff's 12-03 patch so this - actually compiles. - -2001-12-06 Jeffrey Stedfast - - * mail-ops.c (mail_send_message): s/PREVIEW_RELEASE/VERSION_COMMENT - -2001-12-03 Jeffrey Stedfast - - * mail-ops.c (mail_send_message): Don't append "(Preview Version)" - at the end of the version string. Use the PREVIEW_RELEASE #define - instead. - -2001-12-03 Jeffrey Stedfast - - * folder-browser-ui.c: Setup the UI for the AddSenderToAddressbook - ui verb thingy. - - * mail-callbacks.c (add_sender_to_addrbook): New bonobo-ui - callback that adds a sender to the addressbook. - -2001-12-04 Jon Trowbridge - - * folder-browser-ui.c (folder_browser_ui_set_selection_state): - Allow 'n' and 'p' to work when multiple messages are selected. - Fixes #12062. - -2001-11-28 Jeffrey Stedfast - - * mail-callbacks.c (save_msg_ok): If the path exists, make sure - it's a regular file (or we can't possibly save to it). Fix for - #14127. - -2001-11-28 Jeffrey Stedfast - - * message-list.c (message_list_select): Cleaned up the code. - - * mail-callbacks.c (previous_unread_msg): Pass wraparound as TRUE. - -2001-11-24 Jeffrey Stedfast - - * mail-config.c (pgpopen): Fix the boolean check to be && and not - ||. - -2001-11-20 Not Zed - - * folder-browser-ui.c: Disable search if no message - loaded/viewed. Also for #14348. - - * folder-browser.c: Disable "Add sender to addressbook" if we dont - have a message loaded (it wont work). For #14348. - -2001-11-20 Jeffrey Stedfast - - * mail-display.c (load_content_loaded): Make sure the mail-display - object is still "alive" before accessing any of it's data. - -2001-11-14 Zbigniew Chyla - - * mail-autofilter.c (rule_match_recipients, rule_from_message, - rule_from_mlist): s/_/U_/ (filter_rule_set_name requires UTF-8 string) - -2001-11-14 Dan Winship - - * main.c (segv_redirect): Instead of doing pthread_exit() after - redirecting the SEGV, try to lock a mutex we know is already - locked. This will hopefully help debug a bunch of bugs where the - crashed thread seems to be missing from the bug-buddy report. - -2001-11-13 Jeffrey Stedfast - - * mail-session.c (pass_got): Call e_passwords_remember_password() - for account passwords if the user set the "remember password" - checkbox. - -2001-11-12 Jeffrey Stedfast - - * mail-vfolder.c (vfolder_load_storage): Add a NULL check for - rule->name. - (mail_vfolder_add_uri): Same here. - -2001-11-09 Jeffrey Stedfast - - * mail-callbacks.c (forward_message): If we already have the - message loaded in the mail-display, don't bother re-loading. This - happens to fix bug #14848. - -2001-11-08 Jeffrey Stedfast - - * mail-tools.c (mail_tools_x_evolution_message_parse): Was - x_evolution_message_parse from folder-browser.c. A space char is - no longer used to separate the folder URI and the first uid, - instead this is now done with a nul-char so update to parse the - newer/better format. - - * component-factory.c (destination_folder_handle_drop): Update to - parse the new/better format. - - * folder-browser.c (x_evolution_message_parse): Moved to - mail-tools.c - (message_list_drag_data_get): Instead of placing a space char - after the folder URI, instead use a nul-char. - -2001-11-06 Jeffrey Stedfast - - * mail-accounts.c (pgp_path_changed): Call - mail_config_pgp_type_detect_from_path() instead of doing our own - lame auto-detection that didn't even work ;-) - - * mail-config.c (auto_detect_pgp_variables): Execute the pgp - binary and look at it's version string if we have a version string - to compare to. - (mail_config_pgp_type_detect_from_path): New function that takes a - pgp path and attempts to figure out what pgp version it is. - -2001-11-07 Jeffrey Stedfast - - * mail-format.c (try_inline_pgp): Add a "x-inline-pgp-hack=true" - paramter to the multipart's content-type. - -2001-11-05 Jeffrey Stedfast - - * mail-account-editor.c (construct): Don't make the account editor - modal either. - - * mail-accounts.c (mail_add): Use the new global account druid - variable so that we can avoid having more than a single druid at a - time. If a druid already exists, bring it to the top. - (mail_edit): Same idea only for the account editor this time. - (mail_editor_destroyed): Set the global editor to NULL. - (mail_add_finished): Set the global druid to NULL. - (mail_delete): Don't allow any deletes if an account editor is - opened (we don't want to be able to delete the account we are - editing...) - (news_edit): Same thing for the news editor. - (news_editor_destroyed): Set the news editor to NULL. - (news_add): And again for the news add. - - * mail-account-gui.c (service_check_supported): Updated to pass a - GtkWindow argument to mail_config_check_service(). - - * mail-config.c (mail_config_check_service): Now takes a GtkWindow - argument so we can set our parent window. Also, don't make this - dialog modal either. - - * mail-config-druid.c (construct): Don't make this druid modal. - -2001-11-05 - - * message-browser.c (set_bonobo_ui): Override the Move/Copy - handlers setup by the folder_browser_ui code, and use our own, - because we need to pass it a live window which we can't. - (transfer_msg): Our own version of mail-callbacks.c:transfer_msg, - so we can properly pass the parent to the user_select_folder. - (transfer_msg_done): Also copy this so we can pass it diff args. - All fix #13919. - - * mail-callbacks.c (transfer_msg): Set physical/uri to NULL before - calling, because althought he shell client api call is supposed to - null these out, it doesn't with its stupid assertion checks on - entry. Also free physical to plug a memleak. Bugs exposed by - #13919. - -2001-11-01 Jeffrey Stedfast - - * mail-display.h (mail_html_write): Renamed from - mail_html_write_string. - - * mail-display.c (mail_text_write): Don't bother with varargs - since nothing used them, we were only passing strings anyway... - (mail_error_printf): Renamed from mail_error_write, this makes - more sense. - (mail_html_write): Removed. - - * mail-format.c: Updated to use gtk_html_stream_printf directly - and s/mail_html_write_string/mail_html_write. - (mail_lookup_handler): Don't use %.*s here either... - (handle_text_enriched): Same. - (write_one_text_plain_chunk): And finally here (also update for - new mail_text_write api). - (handle_multipart_signed): Update for new mail_text_write api. - (format_mime_part): Update for new mail_error_text/printf name - change. - (handle_multipart_encrypted): Same. - - * mail-tools.c (mail_tool_generate_forward_subject): Same as - mail_generate_reply. - - * mail-callbacks.c (mail_generate_reply): Don't use %.*s in any - *printf* functions. - -2001-11-02 Christopher James Lahey - - * message-list.c (ml_tree_value_at): Use GINT_TO_POINTER here for - platforms where simply casting an int to void * won't work. - (build_flat_diff, main_folder_changed): Call - e_tree_model_pre_change here. - -2001-11-02 - - * message-browser.c (message_browser_message_list_built): - Disconnect from the message_list_built function so we dont do it - every time the list is rebuilt. - - * mail-callbacks.c (composer_send_cb): Disable autosave when we're - sending mail. - (composer_sent_cb): Re-enable autosave. - - * folder-browser-ui.c (fbui_sensitize_timeout): Make sure we reset - any data we're using on the folderbrowser before doing anything - 'cause things could vanish while we're doing it, and also - ref/unref the folderbrowser so it doesn't vanish while w'ere - working. - - * folder-browser.c (folder_browser_set_ui_component): If we are - changing the ui comp, remove any pending timeouts. For #13719. - -2001-11-01 Larry Ewing - - * folder-browser.c (folder_browser_copy): fix cut & paste from the - message body. - -2001-11-01 Dan Winship - - * mail-format.c (handle_multipart_signed): Write out the url - before callind add_url since add_url may free it. Fixes #13839. - Remove debug printf. - - * mail-display.c (on_object_requested): Remove debug printf. - -2001-10-31 Jeffrey Stedfast - - * mail-callbacks.c (list_add_addresses): Don't use a - case-sensitive comparison. - -2001-10-31 Dan Winship - - * mail-format.c (try_inline_pgp_sig): Make this work again. - -2001-10-30 Larry Ewing - - * mail-account-gui.c (delete_event_cb): add delete_event_handler. - (menu_file_save_close_cb): add save and close command. - (launch_signature_editor): initial the editor as having changed - and attach the delete event handler. - -2001-10-30 - - * message-browser.c (d): Turn it off. - - * mail-mt.c: Added exception strings to some of the op logging. - - * mail-format.c (elide_quotes): Remove, uh, what was this for, its - not used anywhere? Also loops the instant it had a ", good one - trow! :) - (write_address): Remove name_arg/email_arg, these aren't used - anywhere. - - * mail-mt.c (mail_msg_received): If we have a cancellation setup, - destroy it immediately, to save fd's. - (mail_msg_cancel): Check cancel != NULL. - (mail_msg_free): Same. - - * folder-info.c: Comment out the Folder: and you've got mail - prints. - - * mail-config-druid.c (wizard_next_cb): If we have a next - function, honour if it tells us its going to set the page, and - dont set it, otherwise, set it to the next page, unless we're at - the end of our pages, and let the wizard do it itself. - (wizard_back_cb): Same for going back. Rest of fix for #12127, - see e-shell-startup-wizard for the rest. - (next_func): If we're not on the last page, tell the druid we're - gonna handle the next button, so we can sync properly with it, - needed for above changes. - (back_func): Similarly for going back past page 0. - (wizard_listener_event): We want to set the page to the actual one - asked for not, pagenum-1. - - * mail-local.c (mls_rename_folder): Oops, dont use the url storage - path to offset the folder name we're renaming/opening, etc. - - * subscribe-dialog.c (fe_cancel_op_foreach): Argh!!! Dont free the - async op data here, the async op is still running and will access - it! Just try to cancel it and mark it as cancelled (id == -1) - (fe_done_subscribing): Only remove outselves from the hash table - if we're not cancelled. The handle should always be set here, - since this code runs in the gui thread. - - * message-list.c (on_cursor_activated_idle): If nothing - selected/cursor not activated, then select no message. - - * mail-folder-cache.c (update_1folder): Make the trash count - optional on EVOLUTION_COUNT_TRASH, becuase some lusers are just - too stupid to understand what its for. - - * component-factory.c (storage_xfer_folder): Return slightly - better error codes for copying folders, since its not implemented - yet. - - * mail-vfolder.c, mail-local.c, mail-folder-cache.c, - message-list.c component-factory.c, mail-ops.c, - subscribe-dialog.c, mail-session.c: d() out some debug printfs, - w() out some warnings. - - * folder-browser-ui.c (folder_browser_ui_add_message): Fix typo, - Resent->Resend. - -2001-10-29 Jeffrey Stedfast - - * mail-ops.c (transfer_messages_transfer): Don't warn the user if - the source and destination folders are the same. - -2001-10-29 Dan Winship - - * mail-format.c (handle_multipart_signed): add some debug spew re - 13839. - - * mail-display.c (on_object_requested): here too - -2001-10-29 Christopher James Lahey - - * e-searching-tokenizer.c (search_info_set_match_size_increase): - Fixed a warning by #if 0ing out this function. - - * folder-browser.c, folder-browser.h (on_selection_changed): - Update status bar in an idle call. Fixes Ximian bug #13929. - - * mail-folder-cache.c (folder_renamed, store_folder_renamed): - Fixed some warnings here. - -2001-10-29 Dan Winship - - * folder-browser.c (folder_browser_copy): Fix the focus check. - It's not fb->message_list that has focus, it's one of its - children. #13616. - -2001-10-29 - - * mail-folder-cache.c (store_folder_renamed): Sort the folder - updates first, since we dont seem to get them in the right order, - or infact in any tree representation whatsoever when using IMAP - ...? get_folder_info bugs? - - Unrelated note to self, the subscribe dialogue may interfere with - the folder cache. - - * mail-vfolder.c (rule_changed): Copy the folder's full_name - before trying to use it to rename. - (vfolder_edit_rule): Set 'orig' to be a reference of the original - rule. - (edit_rule_clicked): Dont lookup orig by name, copy it over - instead. - - * folder-browser.c (got_folder): oops, emit signal before - unreffing object, incase we got killded during getting folder. - (got_folder): Reset get_id. - (folder_browser_new): Set get_id of the get_folder task. - (folder_browser_init): Init get_id. - (folder_browser_destroy): IF we have outstanding 'get folder' op, - cancel it. - -2001-10-28 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_save): Call - mail_autoreceive_setup() instead of - mail_autoreceive_setup_account() since that code was completely - broken anyway. - - * mail-send-recv.c (mail_autoreceive_setup_account): Removed. - - * mail-callbacks.c (transfer_msg_done): Move the message-list - cursor to the next message. - (transfer_msg): If we are moving messages, then pass - transfer_msg_done() to mail_transfer_messages() so when it - finishes it can move the cursor to the next undeleted message. - - * mail-format.c (try_inline_pgp): Check that the special PGP lines - begin and end with \n so as to avoid matching against quoted PGP - lines. - -2001-10-28 - - * mail-callbacks.c (mark_all_as_seen): fb = user_data, not fb = - fb!, fixes 13844. - - * mail-local.c (mlf_rename): add the folder name to the path when - passing down to the subordinate folder. - - * folder-browser-ui.c (fbui_sensitize_timeout): Remove uic, kill - dumb warning. - - * mail-autofilter.c (mail_filter_rename_uri): Implement function - for filters to keep track of uri's being renamed. - (mail_filter_delete_uri): Similarly for deleting uri's. Note that - these functions are just noops though. - -2001-10-28 Jeffrey Stedfast - - * folder-browser.c: Deactivate the Print right-click menu option - if the message isn't loaded. Fixes bug #10346. - -2001-10-28 - - * mail-vfolder.c (mail_vfolder_rename_uri): Implemented. - (mail_vfolder_rename_uri): We do want to check renamed uri's from - vstores. - (mail_vfolder_delete_uri): Same. - (store_folder_renamed): Fix the folder hash at the same time. - - * mail-folder-cache.c (real_flush_updates): Pass the rename event - to vfolder rename uri. - (real_flush_updates): Also rename and delete uri's from filters. - - * mail-local.c (mail_local_folder_reconfigure): Change the store - path to be same as parent + mbox to be full path. - (mls_delete_folder): Change store path to be parent path, and mbox - to be full path. - (mail_local_folder_reconfigure): Fix a leak of tmpname. - (mls_delete_folder): Unref the store when done. - (mls_rename_folder): Fix implementation, shell already created - destination folder, so we can't just rename :( - - * component-factory.c (xfer_folder): Only do a rename if we have - remove set, cleaned up logic a bit. - (idle_quit): Put the components still active check last last of - all. - (storage_create_folder): IF we have a fragment, use that as part - part for parent. - (xfer_folder): Manually call rename code, since the shell will do - a remove/add later on, AND there's no way we can determine the new - path from the crock of an api we have to work with. - -2001-10-27 Jeffrey Stedfast - - * mail-format.c (mail_format_get_data_wrapper_text): Allow the - user to shoot him/herself in the foot when overriding message - charsets. Permanantly fixes bug #921. - -2001-10-26 Dan Winship - - * folder-browser.c (etree_key): Work around something that we - think is a GtkHTML bug, where sometimes the adjustments have - slightly bogus values and scrolling ends up working backwards. - (Ximian 4939) - - * mail-display.c (do_signature, do_attachment_header): Set the - icon to be 24x24 here so that (assuming it's not a thumbnail), no - resizes will have to be queued later. (There's still a bug with - the text to the left of the button being drawn twice for some - reason though.) - - * mail-callbacks.c (delete_msg): Fix a bug here that makes - deleting multiple messages cause a gratuitous message body fetch. - (Ximian 12355) - -2001-10-25 Jeffrey Stedfast - - * mail-callbacks.c (providers_config): Set the GdkWindow of the - FolderBrowser, not the GtkWindow... - -2001-10-26 - - * mail-local.c (mlf_set_folder): Changed to open the source store - from '/', so we can do renames across directories. Of course, - this doesn't quite work with different filesystems, but we'll - assume this isn't a problem we're going to have. - (mail_local_folder_get_type): Setup parent_class. - (mlf_rename): Implement folder rename call, rename internal data. - - Is this a security issue? Well, not really, no more than anything - else. - - * mail-folder-cache.c (mail_note_store): Listen to rename event. - (store_folder_renamed): Function to handle it, empty. - (mail_note_store_remove): Unhook from rename event. - (mail_note_folder): Hook onto renamed event. - (unset_folder_info): Unhook from renamed event. - (folder_finalised): Lock around update. - (folder_deleted): Lock around update. - (real_flush_updates): If we have a path to remove remove it. - (rename_folders): Scan folderinfo's, if we can find ones renamed, - rename them, otherwise add them. - - * component-factory.c (owner_unset_cb): Use a timeout not an idle - handler. - (storage_xfer_folder): Implementation of xfer_folder signal - handler, so we can rename imap/vfolders/etc. - - * component-factory.c (owner_unset_cb): Use a timeout not an idle - handler. - - * mail-callbacks.c (providers_config): Only set the parent window. - - * mail-accounts.c (mail_edit): Set the parent on the account editor. - -2001-10-25 - - * openpgp-utils.c (openpgp_verify): s/iconv/e_iconv/. - -2001-10-25 Jeffrey Stedfast - - * mail-ops.c (send_mail_free): Don't forget to unref the filter - driver here. - -2001-10-25 - - * folder-browser-ui.c (fbui_sensitize_timeout): So apparently the - uicomp can just 'vanish' while we're using it. Joy. Take care of - that case here, fixes #13482. - (fbui_sensitise_item): Check here too just for kicks. - - * mail-folder-cache.c (store_finalised): If we can't destroy our - async event, then queue another one to do it. - (store_finalised_finish): And handle it here, until we can, then - free it. - (mail_note_store): Queue an async event to get folderinfo, dont - use mail_get_folderinfo. - (update_folders_get): thread-async event to retrieve the - folderinfo, and build it, then queues gui-async event to update - the gui. - (add_unmatched_info): Taken from mail-ops, adds unmatched if - required. - (add_vtrash_info): From mail-ops, add trash if required. - (update_folders): Thread async event to update gui. - (mail_note_store): Ref the store and storage when created. - (update_1folder): Changed to assume we have info_lock, and store - updates in an updates list. - (setup_folder): Same. - (folder_changed): Changed to call update_1folder directly. - (real_folder_changed): Removed. - (mail_note_folder): Changed to call update_1folder directly. - (real_note_folder): Removed. - (store_folder_subscribed): Call setup_folder directly. - (real_folder_created): Removed. - (real_flush_update): Function that actually does the updates in - the gui thread. - (mail_note_store): Go back to using mail_get_folderinfo. - (update_folders): Fixed upf ro changed api's. - (unset_folder_info): Changed to queue pending updates. - (real_folder_deleted): Removed. - (store_folder_unsubscribed): Do the removal work directly. - (mail_note_store): Dont link to finalised event of store - we now - ref it. - (mail_note_store_remove): If we have any pending updates, clear - them out. Also cancel any pending folderinfo retrieve operations. - (update_folders): Remove our update from the storeinfo list, if it - still exists. - (update_1folder): Make 'sent folder shows all counts' optional via - an environmental variable EVOLUTION_COUNT_SENT for all those - bloody whinging lusers out there. - (mail_note_store_remove): Unref the storage when done. - - * mail-mt.c (mail_async_event_emit): If we're in main and have a - gui task, set it to run via an idle function. - (idle_async_event): Wrapper for calling do_async_event from idle - function, and freeing the message when done. - (idle_async_event): Call mail_msg_free not free on the finished - message. - - * component-factory.c (mail_remove_storage): Destroy the storage - async. - (store_disconnect): This does the work. - (free_storage): Un-note the store when we remove it, so the store - noting code can unref things properly. - (idle_quit): Return false when done, dont loop. - -2001-10-24 - - * component-factory.c (owner_set_cb): Setup an async_event - handler. - (idle_quit): Try to destroy the async_event, or keep dropping out - if it can't (deadlock). - - * mail-mt.c (do_async_event): Set the threadid of the thread we're - running in so we know its running/which thread its in. - (mail_async_event_emit): Added new argument 'type' which is the - type of thread to execute against, gui or another one. Fixed all - callers. - (mail_async_event_destroy): Return -1 if this operation will fail - (deadlock possibility). If we're in the thread of the task - we're going to wait for, then return a failure (since we will - deadlock). - (mail_async_event_emit): Changed to use MailAsyncFunc type as the - function type, which just takes 3 void args, change args to suit. - - * mail-folder-cache.c (mail_note_store): Record the pending update - events in a pending list. We should really be able to use an - async event for this, but that doesn't return to the gui loop when - done :-/ - (update_folders): Remove from pending update when done. - -2001-10-25 Jeffrey Stedfast - - * mail-send-recv.c (get_receive_type): Check for a NULL provider. - (build_dialogue): Check for invalid source urls. - (mail_receive_uri): Same. - -2001-10-24 Jeffrey Stedfast - - * mail-callbacks.c (mail_generate_reply): No longer need to pass a - settext argument. - (do_forward_non_attached): Same. - - * mail-format.c (mail_get_message_body): Fix to not always return - NULL for html parts, doh!. - -2001-10-24 - - * folder-browser-ui.c (ui_add): - (fbui_sensitize_timeout): Same. - - * folder-browser-factory.c (control_activate): Comment out freeze/thaw. - (control_deactivate): - -2001-10-24 Jon Trowbridge - - * mail-search.c (mail_search_construct): Fixed some weird casting - crack that got in here somehow, removed superfluous box-packing - that was generating a gtk warning. - -2001-10-23 Jeffrey Stedfast - - * component-factory.c (owner_unset_cb): Unref the global - search_context. - (owner_set_cb): create the global search_context. - - * folder-browser.c (folder_browser_gui_init): Pass along the - global search_context to the e_filter_bar_new call. - -2001-10-24 - - * message-browser.c (message_browser_message_loaded): Call - ui_message_loaded when we are. - - * folder-browser-factory.c (control_activate): Freeze/thaw around - all updates. - (control_deactivate): Freeze/thaw around all updates. - - * folder-browser.c (folder_browser_init): Setup a hashtable to - keep track of *our* sensitise state, so we can optimise pushes to - bonobo. - (folder_browser_finalise): Free hash here. - (folder_browser_set_message_preview): Call a ui_message_loaded, - even though it isn't, so it updates sensitivities right. - (done_message_selected): Call ui_message_loaded when it really is, - rather than the very fucked up idea of reversing the loaded_uid - check. - - * folder-browser-ui.c (folder_browser_ui_set_selection_state): - Dont enable the message-enabled options if the message display is - hidden, e.g. print, view headers, etc. - (folder_browser_ui_rm_all): Forget sensitise state. - (fbui_sensitise_item): Sensitise items via a current-state table, - so we dont have to do bonobo calls every time. - (folder_browser_setup_property_menu): Call sensitise_item. - (folder_browser_ui_add_message): - (folder_browser_ui_add_global): Leave current set_prop "sensitive" - for the stop button, so it doesn't get lost by the stuff in - mail-mt.c - (fbui_real_sensitize_items): Removed. - (fbui_sensitize_timeout): Cleaned up, use sensitise_item to do - work. - (folder_browser_ui_message_loaded): Setup sensitive based on - preview_shown too. - (folder_browser_ui_set_selection_state): And here too. - -2001-10-23 Jeffrey Stedfast - - * mail-account-gui.c (service_check_supported): Don't allow an - auth-type to be set when saving the service. - (mail_account_gui_new): Initialize the source and transport - provider_type's here so we don't forget to do it when it matters. - (mail_account_gui_setup): Don't bother setting the provider_type's - here, they are already set in mail_account_gui_new() now. - -2001-10-23 - - * mail-display.c (mail_display_destroy): Remove the idle_id when - we're destroyed so the idle func doesn't run on an invalid object. - - * message-list.c (regen_list_regened): Dont do anything if we're - destroyed #13021. - - * mail-mt.c (mail_user_message): - (mail_get_password): Removed, all functionality moved to - mail-session. - - * mail-config.c (mail_config_write_on_exit): Check - threaded/preview hash is null before using it, its setup on demand - so itmight nto be initialised here. - - * mail-session.c (request_password): Remove password_current - stuff. - (alert_user): Redont, similar to get_pass. Do things as async as - possible, and dont even wait for a response if we're not asking - for the cancel button (this may or may not be right behaviour - - need to check). mail_user_message() code replaced from the stuff - in mail-mt.c - (MailSession): Added a lock field. - (init): Setup lock. - (finalise): fRee lock. - (register_timeout): Redone. We now allocate our own 'timeoutid's, - and <> to the real things asynchronously. Use async_event's so we - can make sure we have no outstanding ones after shutdown. - (mail_session_enable_interaction): If interaction has been - disabled, and we have either a message-box open, or a password - request open and/or any pending message boxes/passwords, blow 'em - away. - (main_register_timeout): If we have pending remove of this same - timeout, dont do anything. - (timeout_timeout): Properly honour the result, remove the timout - if it returns false. - (do_user_message): Setup the message_destroy_id when we setup the - destroy handler so it doesn't get called twice. - -2001-10-23 Jeffrey Stedfast - - * mail-callbacks.c (reply_to_sender): Make sure the fb and it's - message-list exist. - (reply_to_list): same. - (reply_to_all): And here... - (forward_message): Here too. - (forward_attached): Again here. - (transfer_msg): Here too. - (apply_filters): Same. - (select_all): Yet again here... - (select_thread): And here. - (invert_selection): Same. - (flag_messages): Here too. - (mark_as_unseen): and here... - (mark_all_as_seen): ... - (zoom_in): - (zoom_out): - (zoom_reset): - (search_msg): - (load_images): - (save_msg): - (next_msg): - (next_flagged_msg): - (next_unread_msg): - (previous_msg): - (previous_unread_msg): - (expunge_folder): - (configure_folder): - (empty_trash): - -2001-10-23 - - * mail-mt.c: Added missing errno.h - (mail_msg_new): Fix the logic a bit, dont try to open the log file - unless logging is actually requested. - (mail_enable_stop, mail_disable_stop, do_set_busy, - mail_operation_statys): Dont bother propagating events if - global_shell_client isn't up yet. - -2001-10-23 Dan Winship - - * mail-mt.c (mail_msg_new): If the fopen() fails (eg, because - evolution-mail was started by oafd with PWD=/), don't try to use - the NULL file handle. - -2001-10-23 - - * mail-session.c (get_password): Completely re-done. We now hae a - completely async dialogue when requested from antoehr thread, and - dont use gtk_main() if we can avoid it (which is normally the - case). This stuff is only partially finished, and will mena the - removal of the same from mail-mt.c, and the mail_user_message() - code will be moved here and changed to work in a similar way. - - * mail-callbacks.c (empty_trash): Dont try and connect to remote - stores just to get the trash. Also, always run empty trash async, - and make sure we unref the trash. - (empty_trash): Hmm, dont unref the trash, causes a problem on - exit, i suspect something else is doing funky unrefs on it. - - * mail-tools.c (mail_tool_get_trash): Pass a 'connect' arg, tell - it whether it should tryand connect or not to the parent service, - if it isn't already connected. - - * component-factory.c (owner_unset_cb): Dont try wait_all here, - could potentially deadlock. - (idle_quit): Keep returning TRUE if we have outstanding - processing. Note that this may busy-wait during exit processign - with busy tasks :( - (idle_quit): Keep calling ourselves till we no longer get called - (i.e. gtk_main really quits). - - * mail-mt.c (mail_msg_active): New function, returns TRUE if - events are still active/outstanding. - (do_op_status): @$@$#@@!#@!! didn't unlock the mail_msg_lock if - data->activity was NULL and we had no global_shell_client anymore! - Also shortcut processing if this is going to be the case. - (mail_msg_init): Setup a temporary other gui_port for redoing with - new semantics password, user message and progress reporting. - (mail_get_password): #ifdef'd out all this code temporarily, till - it gets fully moved to mail-session.c - -2001-10-22 - - * component-factory.c (owner_set_cb): Dont call enable_interaction - here. - (interactive_cb): But here instead, let the shell tell us when its - ok to go interactive. - -2001-10-22 Jeffrey Stedfast - - * mail-format.c (write_one_text_plain_chunk): Oops, revert my - change to this function. - - * mail-display.h (mail_html_write_string): New fun macro. - - * mail-format.c (write_one_text_plain_chunk): Use gtk_html_write - instead of mail_html_write so we avoid strdup'ing the text. - (handle_text_plain_flowed): Use the mail_html_write_string macro. - (handle_message_rfc822): Here too. - (mail_format_raw_message): We can do it here also... - (attachment_header): We can do it a little bit here... - (write_address): A microscopic bit here... - (write_hr): same. - -2001-10-22 Anna Marie Dirks - - * mail-config.glade: Added several new accelerators to the edit account - dialog, and fixed the focus targets on all existing accelerators. I - was hoping that since the widgets used in the account editor are also - used in the first-time start-up druid and them mail-config druid, - that this would fix all accelerator problems for those druids as well, - but there is something wrong with Bonobo which is preventing - the druids from responding to their accelerators. Sigh. Anyway, - most accelerators in the edit account dialog work correctly - now, though there are few (such as _Full Name) which fail to - do anything. I don't know why. - -2001-10-22 Jeffrey Stedfast - - * mail-stream-gtkhtml.c (mail_stream_gtkhtml_new): New class that - wraps writing to a GtkHTML stream so that we don't have to write - to an intermediate GByteArray. - - * mail-display.c (on_url_requested): Use the new Camel->GtkHTML - stream - this means we don't have to chew up nearly as much - memory...yay! - (try_part_urls): Here too. - -2001-10-22 Ettore Perazzoli - - * mail-mt.c (do_op_status): Don't free `clientid' as it's - uninitialized. - -2001-10-22 Christopher James Lahey - - * message-list.etspec (Score): disable this column. Fixes Ximian - bug #12381. - -2001-10-22 Ettore Perazzoli - - * mail-mt.c: #include "component-factory.h". - (do_op_status): Pass the component ID instead of the msg ID. - - * component-factory.h (COMPONENT_ID): #define here instead of - `component-factory.c'. - (SUMMARY_FACTORY_ID): Likewise. - -2001-10-22 Jeffrey Stedfast - - * mail-format.c (format_mime_part): Don't wrap error text with -
, this is done inside mail_error_write. - (handle_multipart_encrypted): If we get an exception trying to - decrypt the mime part, display an error rather than trying to - treat it as multipart/mixed. - - * mail-callbacks.c (empty_trash): Confirm expunge. - - * folder-browser.c (folder_browser_destroy): Move the folder sync - code along with a few other things from folder_browser_finalise() - into here instead. - (folder_browser_finalise): Moved some cleanup functions into - destroy. - -2001-10-22 Dan Winship - - PGP verification UI changes to make it not HTML spoofable. - - * mail-format.c (handle_application_pgp): Remove this unused - hack. - (mail_format_mime_message): Initialize a fourth hash table, used - to keep track of fake MIME parts. - (mail_part_set_default_displayed_inline): New routine to set the - default disposition of a part (doesn't change it if the user has - already overridden it). - (format_mime_part): Wrap a blockquote around the error text (moved - here from mail_error_write since it doesn't apply in other cases). - (write_hr): Write a
with appropriate padding between MIME - parts. - (write_one_text_plain_chunk): Write some plain text with - appropriate margins. - (handle_text_plain): Use write_one_text_plain_chunk. Update for - inline specials handler API change. - (fake_mime_part_from_data): Use the "fake_parts" hash to avoid - recreating the same fake parts again if the message is - redisplayed. Lets you toggle the shown/hiddenness of uudecode - parts, and do the new pgp verification thing for inline pgp - signatures. - (try_inline_pgp): Don't do any actual PGP handling here: Just - rewrite as a multipart/encrypted. - (try_inline_pgp_sig): Likewise, just do a multipart/signed (with - the x-inline-pgp-hack parameter set). - (try_uudecoding, try_inline_binhex): Update for API changes. - (handle_multipart_signed): Exciting and new. Use to - create a button which the user must click to do the - verification. Change the formatting of the gpg output text a bit. - - * mail-display.c (on_link_clicked): Remove x-evolution-decode-pgp - hack, which is no longer used. - (pixbuf_gen_idle): Add a hack for the PGP verification button. - (do_attachment_header, do_external_viewer): Split out of - on_object_requeested for clarity. - (do_signature): New routine to do the PGP verification button. - (on_object_requested): Now just dispatches to - do_attachment_header, do_external_viewer, or do_signature. - (mail_error_write): Don't do
here. Fixed the problem - that was trying to fix elsewhere. - -2001-10-22 Dan Winship - - * mail-callbacks.c (transfer_msg): Fix these functions so they - don't crash evolution-mail. Too bad it still crashes in the - shell. - -2001-10-21 Jeffrey Stedfast - - * mail-display.c (on_url_requested): Use - mail_format_get_data_wrapper_text for text parts so we get free - charset conversion. - - * mail-format.c (mail_format_get_data_wrapper_text): Renamed from - get_data_wrapper_text and now returns a GByteArray. - (handle_text_plain): Updated to use the new get_data_wrapper_text. - (handle_application_pgp): Same. Wow...also fixed a mem leak and - made a bit more efficient by doing so. - (handle_text_enriched): Here too. Also use string->len instead of - strlen (string->str). - (mail_format_raw_message): Same. - -2001-10-22 - - * mail-callbacks.c (mark_all_as_seen): Instead of select_all() - then using the tree's selected nodes to iterate, just do it on the - folder which keeps the current selection. Fixes #3658. - -2001-10-21 Jeffrey Stedfast - - * folder-browser.c: Call the new move/copy_msg_cb's - - * mail-callbacks.c (move_msg_cb): Renamed from move_msg. - (copy_msg_cb): Renamed from copy_msg. - (move_msg): The bonobo-ui-component callback. - (copy_msg): Same. - -2001-10-21 - - * mail-vfolder.c (mail_vfolder_shutdown): Clear variables once - done, for debugging. - (mail_vfolder_add_uri, mail_vfolder_delete_uri): Dont do anything - if we're shutdown (context == NULL). - - * component-factory.c (idle_quit): Move mail_vfolder_shutdown - here, it should be one of the last things shutdown. - - * mail-format.c (handle_text_plain): Dont use (if (!p++), and then - check p!= later, since its now 1, oops. Fixes #13106, thought it - was a start of uuencoded stuff! - - * folder-browser.c (on_right_click): Escape _'s before adding them - to menu from mailing list name, also remove some dead code that - someone forgot to remove when refactoring. #11307. - (folder_browser_is_drafts): Use the store's uri_cmp function to - compare to the drafts uri's. - (folder_browser_is_sent): Same. Slight cleanup for #11351. - -2001-10-21 Dan Winship - - * mail-callbacks.c (mail_generate_reply): Update for - e_msg_composer_add_messages_attachments arg change. - (do_forward_non_attached): Likewise. - -2001-10-20 Jon Trowbridge - - * mail-display.c (mail_display_new): Don't leak our - ESearchingTokenizer. - -2001-10-20 Larry Ewing - - * folder-browser-ui.c: hook up zoom functions. - - * mail-callbacks.h: add prototypes. - - * mail-callbacks.c (zoom_in): added. - (zoom_out): added. - (zoom_reset): added. - -2001-10-19 Jeffrey Stedfast - - * mail-callbacks.c (transfer_msg): Allow copy/move to/from vTrash - folders as well. - - * component-factory.c (destination_folder_handle_drop): Properly - handle local vTrash folders. - -2001-10-19 - - * mail-account-gui.c (build_auth_menu): Dont translate camel strings. - (mail_account_gui_setup): " - -2001-10-19 Ettore Perazzoli - - * component-factory.c (destination_folder_handle_motion): Get - @folder_type here too [to match the changes in the - EvolutionShellComponentDnd interface]. Also, remove a debugging - message. - (destination_folder_handle_drop): Likewise. - -2001-10-19 Jeffrey Stedfast - - * mail-callbacks.c (mail_generate_reply): Update to reflect API - changes to e_msg_composer_add_message_attachments(). - (do_forward_non_attached): Same. - (providers_config): Oops, pass a GdkWindow instead of a GtkWindow. - -2001-10-19 - - * mail-folder-cache.c (store_finalised): Free folders_uri. - (real_folder_deleted): If folder is deleted, remove it from the - hashtables. - -2001-10-18 - - * subscribe-dialog.c (get_short_folderinfo_get): Remove the - register/unregister, they're already done above us. - - * mail-vfolder.c (vfolder_adduri): Added remove flag - its not - adduri, its removeuri, its less typing than creating a removeuri. - (vfolder_adduri_do): Implement the remove flag. - (mail_vfolder_remove_uri): Changed to mail_vfolder_delte_uri, to - indicate its actually been deleted. - (mail_vfolder_add_uri): Added remove flag. - (rule_changed): When adding existing folders to a new rule, strdup - the list data. - (mail_vfolder_delete_uri): Dont do any work to remove the actual - folder from the vfolder (we'd have to look it up first), let the - vfolder remove it itself. Just update the rules. - - * mail-folder-cache.c (store_finalised): Unhook from all events - when done. - (mail_note_store_remove): Remove a store from being noted. - (free_folder_info): Also if we have a folder, unhook all events. - Also remove the uri from vfolders. - (mail_note_folder): Remove warning about adding folders to stores - that aren't added yet - we might actually be removing the store. - - * component-factory.c (mail_remove_storage): Call - mail_note_store_remove when we remove the storage. - -2001-10-18 Jeffrey Stedfast - - * mail-callbacks.c (providers_config): Don't make the mail - settings dialog modal. - -2001-10-17 Ettore Perazzoli - - * mail-account-gui.c (folder_picker_clicked): Pass the toplevel to - `evolution_shell_client_user_select_folder()'. - * mail-callbacks.c (transfer_msg): Likewise. - -2001-10-18 - - * mail-send-recv.c (build_dialogue): call setup_send_data *after* - we've setup the global dialogue thingy. - (mail_send_receive): Instead of using static local to check for - re-running of dialogue, use a global, setup by build_dialogue. - These fix #12335. - (mail_send_receive): Dont assert dialogue is realized, it might - still be being built, so only show if it is realized. - -2001-10-18 Dan Winship - - * mail-mt.c (mail_call_main): Use G_VA_COPY to make this compile - on ppc again. - (do_call): Here too. - -2001-10-17 - - * mail-folder-cache.c (store_folder_subscribed): Clone the - folderinfo before passing to async event. - (real_folder_created): Free when done. - (store_folder_unsubscribed): - (real_folder_deleted): And same here. - - * mail-ops.c (mail_expunge_folder): Use the queued thread for - expunging folders. - -2001-10-17 Jeffrey Stedfast - - * mail-ops.c (mail_send_message): No longer need to copy the - description now that camel-exceptions have been fixed. - - * subscribe-dialog.h (subscribe_dialog_show): Helper macro. - - * subscribe-dialog.c (subscribe_dialog_run_and_close): Removed. - - * mail-callbacks.c (check_send_configuration): Don't use - gnome_dialog_run_and_close() here, we can easily get away with - just using a gtk_widget_show(). - (providers_config): Don't use a gnome_dialog_run_and_close() here - either. No longer need to use e_gnome_dialog utils. - (manage_subscriptions): Don't run_and_close(). - -2001-10-17 - - * mail-callbacks.c (empty_trash): Only empty trash on enabled - accounts, fixes #12821. - -2001-10-17 Dan Winship - - * mail-format.c (write_default_header): Make Reply-To bold too - since no one ever figures out why it's not currently. - -2001-10-17 Iain Holmes - - * importers/evolution-mbox-importer.c: Fix the typo. - -2001-10-16 Jeffrey Stedfast - - * mail-ops.c (uid_cachename_hack): Lets put the UID cache in - ~/evolution/mail/pop3 as this makes more sense than ~/mail/config - does. Perform checking to see what flavor cache-path the user is - on and compensate. - - * message-list.c (on_cursor_activated_idle): Check that the - cursor_uid is non-NULL before emitting a "message_selected" - signal. Fixes bug #6015. - -2001-10-16 Jon Trowbridge - - * e-searching-tokenizer.c (e_searching_tokenizer_begin): Always - explicitly clear out the SearchInfo. - -2001-10-16 - - * mail-folder-cache.c: Added an async_event handler to store_info. - (mail_note_store): Setup async event handler here. - (store_finalised): Flush out async events here. - (folder_changed): Use async event handler to emit event. - (mail_note_folder): Chagned, do most of the work in the calling - context, only do the corba stuff in main. - (store_folder_subscribed): Use async event, and do more work locally. - (store_folder_unsubscribed): Same. - (store_folder_deleted): Call store_folder_unsubscribed if we have - to do any work. - (store_folder_created): Call store_folder_subscribed if we have to - do any work. - (store_folder_unsubscribed): Ref store while busy. - (real_folder_deleted): And unref here. - (store_folder_subscribed): Reg store while busy. - (real_folder_created): Unref here. - (mail_note_folder): Ref folder while busy. - (real_note_folder): And unref here. - (mail_note_folder): Hook onto folder_deleted event. - (folder_deleted): Just mark this folder as no longer available. - - * mail-session.c (register_timeout): Use mail_call_main instead of - proxy_event. - (remove_timeout): Same here. - - * folder-browser.c (folder_changed): use the new mail_async_event - stuff. - (folder_changed_main): Remove old async event handling stuff. - (FOLDER_BROWSER_LOCK/UNLOCK): Removed. - (FolderBrowserPrivate): Removed too, sigh. - (folder_browser_set_message_preview): Return do nothing if we're - destroyed (message_list == NULL). - (folder_browser_search_query_changed): " - (folder_browser_toggle_preview): " - (folder_browser_toggle_threads): " - (folder_browser_toggle_hide_deleted): " - (folder_browser_set_message_display_style): " - (folder_browser_charset_changed): " All for #12613. - - * mail-mt.c (mail_async_event_new, mail_async_event_emit, - mail_async_event_destroy): New functions to handle async events. - (mail_proxy_event, mail_proxy_event_id): Removed old functions for - async events. - (do_call): Add suport for MAIL_CALL_p_pp. - (mail_msg_free): Use mail_async_event instead of proxy_event. - - * message-list.c (message_changed): Promote the message_changed to - a folder_changed and use main_folder_changed to process it. - (main_message_changed): Remove.d - (message_list_init): Setup async event handler. - (message_list_destroy): Remove async handler. - (folder_changed): Use async hanler to emit event in main loop. - (message_changed): Same. - - * mail-mt.c (mail_proxy_event_id): New function to return the id - of the currently executing proxied event. - - * folder-browser.h: Added private field. - - * folder-browser.c (folder_changed): Keep track of tasks - outstanding in the tasks list, locked access. - (FOLDER_BROWSER_LOCK, UNLOCK): Macros to lock the folder browser - for poking about in diff threads. - (folder_browser_finalise): Wait for any outstanding takss to - finish before cleaning ourself up. - (folder_browser_destroy): Move the seen_id handling to finalise, - also add a loading_id handling code. - (main_folder_changed): Remove our running task when done. - -2001-10-15 Larry Ewing - - * mail-display.c (mail_error_write): don't write strings longer - than they actually are. - -2001-10-15 Jeffrey Stedfast - - * folder-browser.c (folder_browser_destroy): Remove the mark_seen - timeout. - -2001-10-15 Larry Ewing - - * mail-callbacks.c (mail_generate_reply): don't apply the body - text in replys since we will just replace it anyway. - -2001-10-15 Jeffrey Stedfast - - * component-factory.c (owner_unset_cb): Call - mail_vfolder_shutdown. - - * mail-vfolder.c (mail_vfolder_shutdown): Unref all of our - VFolders. - - * mail-folder-cache.c (real_note_folder): Remember to unref the - folder before returning if we have already noted this folder. - -2001-10-15 - - * mail-session.c (get_password): Proxy get-password call to main - thread. - (forget_password): same for forget_password. - (get_filter_driver): and same for get_filter_driver, since it uses - gtk objects. - - * mail-mt.c (mail_call_main): new generic interface for calling - stuff/proxying in the gui thread. - -2001-10-14 Jon Trowbridge - - * e-searching-tokenizer.c (e_searching_tokenizer_clone): Share - more state between the parent and its clones, so that our multiple - tokenizers don't get out of sync when we are rendering frames and - iframes. (Bug #11638) - -2001-10-13 Jon Trowbridge - - * e-searching-tokenizer.c (search_info_compare): Bad hacker! - Don't implicitly assume that utf8 characters are one byte in size! - (Bug #9520) - (e_searching_tokenizer_begin): As long as I'm touching those code: - don't increase the size of search matches. I'll fix the colors - later. (part of bug #11589) - -2001-10-13 Dan Winship - - * mail-callbacks.c (create_msg_composer): Don't emit a gtk warning - if the composer creation fails. - -2001-10-12 Dan Winship - - * message-list.c, message-list.h, message-list.etspec: Revert the - change to remove the Score column until Chris can fix ETable so - it's possible to remove a column without breaking everyone's - exisiting settings. - -2001-10-12 Iain Holmes - - * importers/evolution-mbox-importer.c (load_file_fn): Don't ever create - the folder here. Wait until the shell has created it. Otherwise we get - loads of race conditions where the mailer can create a subfolder before - the shell has registered the parent. - -2001-10-12 Chris Toshok - - * main.c (main): call e_passwords_init and e_passwords_shutdown. - - * mail-session.h: add prototypes for - mail_session_{get,add}_password. - - * mail-session.c (init): empty this out - we use e_passwords - instead of a local hashtable. - (get_password): use e_passwords_get_password and - e_passwords_add_password. - (forget_password): use e_passwords_forget_password. - (mail_session_remember_password): use - e_passwords_remember_password. - (mail_session_forget_password): use e_passwords_forget_password. - (mail_session_get_password): new function, use - e_passwords_get_password. - (mail_session_add_password): same, use e_passwords_add_password. - (mail_session_forget_passwords): use e_passwords_forget_passwords. - - * mail-config.c (mail_config_write_on_exit): fix this up so it - works as desired with the e_passwords stuff. - -2001-10-12 Jeffrey Stedfast - - * mail-display.c (mail_error_write): Convert URLS so we can get - clickable links. - - * message-list.c: Removed score stuff. - -2001-10-12 Jon Trowbridge - - * mail-display.c (html_button_press_event): Store our listener id. - (popup_info_free): Disconnect our listener when we free the popup. - (Bug #11040) - -2001-10-11 Jon Trowbridge - - * mail-callbacks.c (addrbook_sender): Listen for "destroy" events - from the control, so that we don't leave stray windows laying - around. (Bug #9101) - -2001-10-11 - - * local-config.glade: Added a checkbox for body indexing. - - * mail-local.c (mail_local_reconfigure_folder): Get index_body - widget. - (mail_local_folder_reconfigure): Add an 'index_body' argument & - implement. Dont do anything if nothing changed. - - * openpgp-utils.c (openpgp_verify): Use e_iconv_open. - -2001-10-11 Jeffrey Stedfast - - * mail-callbacks.c (do_forward_non_attached): Attach the message - attachments. Fixes bug #5439. - -2001-10-11 Dan Winship - - * mail-folder-cache.c (update_1folder): No longer need to pass - folder display name to storage update_folder methods. - (setup_folder, free_folder_info): Meaning we no longer need to - keep track of it. - - * evolution-outlook-importer.[ch], evolution-mbox-importer.[ch]: - These copies are cruft. The real ones are in importers/. - -2001-10-11 Jeffrey Stedfast - - * component-factory.c (free_storage): Make sure the - service/storage are non-NULL. - - * mail-callbacks.c (e_gnome_dialog_parent_destroyed): Call - gtk_main_quit. - (send_receive_mail): Don't use e_gnome stuff since this doesn't - need to be run using gnome_dialog_run_and_close(). - (composer_send_cb): Same. - (edit_msg): Here too. - (resend_msg): And here. - (search_msg): Same. - (filter_edit): Here too. - (filter_edit): Don't use e_gnome_dialog_set_parent() because we - don't do gnome_dialog_run_and_close on this dialog. - (e_gnome_error_dialog_parented): Removed. - (e_gnome_ok_dialog_parented): Removed. - -2001-10-10 Dan Winship - - * mail-config.c (new_source_created): Fix up the logic here. - -2001-10-10 Larry Ewing - - * mail-callbacks.c (mail_generate_reply): use new function to copy - the attachments from the source message. This still isn't perfect - but it should avoid the problems with headers being transfered. - This makes images in replies work again. - - * mail-display.c (save_url): copy the data. We can't ref the byte - array and we can't free it so we have to copy it. - -2001-10-10 - - * mail-ops.c (transfer_messages_transfer): IF the source and - destination folders are the same, do nothing. Oh, and return an - error, otherwise the shell goes and removes it anyway. Fixes a - rather serious bug with dnd of folders onto their current - location. - -2001-10-09 Larry Ewing - - * mail-display.c (save_part): ref the part. - (save_destroy_cb): new function to unref the part when we have - closed the dialog. - (save_url): fake a mime part so that we can save data urls without - extra effort. This is less sucky than it seems since it handles - filenames and ref counting with minimal fuss. - -2001-10-09 - - * component-factory.c (owner_unset_cb): Disconnect from all the - signals we were listening to, so we dont try and do shit twice on - exit (one on unset_cb, one on destroy). - (create_component): Setup the signal handlers using a table, so - they're easier to disconnect on finish. - - * mail-folder-cache.c (folder_changed): Ref folder so it hangs - around till we're done with it. - (real_folder_changed): Unref folder when we are done with it. - Should fix #11981. - -2001-10-09 Jeffrey Stedfast - - * folder-browser.c (done_message_selected): Make sure the - mail-display is non-NULL. - -2001-10-09 - - * mail-local.c (mlf_search_by_uids): Implement. - -2001-10-09 Jeffrey Stedfast - - * folder-browser-ui.c (folder_browser_ui_add_message): Create a - chaqrset picker submenu in the View menu. - - * mail-format.c (mail_format_raw_message): Pass the mail-display - to get_data_wrapper_text. - (get_data_wrapper_text): Use the user's override charset if one is - provided, otherwise user the user's default charset. - (handle_text_plain): Pass along the mail-display to - get_data_wrapper_text. - (handle_application_pgp): Same. - (handle_text_enriched): Here too. - (mail_get_message_body): Pass NULL as the mail-display to - get_data_wrapper_text since we don't have access to a - mail-display. - - * mail-display.c (mail_display_set_charset): New function to set a - charset on the maildisplay. Once set, the message is redisplayed - using the new charset. - (mail_display_destroy): Free the charset. - - * folder-browser.c (folder_browser_charset_changed): New callback - for when a user overrides the message charset. - -2001-10-09 Dan Winship - - * mail-callbacks.c (e_gnome_dialog_set_parent): Use - gtk_signal_connect_while_alive here so - e_gnome_dialog_parent_destroyed doesn't get called on an - already-destroyed dialog. - - * mail-config-druid.c (*_prepare): Record which page we're - currently in. - (*_changed): Only update the druid buttons if we're the current - page. Fixes a problem that could make it impossible to get beyond - the first page of the setup wizard. - - * mail-callbacks.c (mail_generate_reply): Revert the change to use - e_msg_composer_new_with_message. That has unwanted side effects. - (This commit re-breaks replying to HTML messages with inline - images.) - -2001-10-08 Dan Winship - - * mail-local.c (mlf_set_folder, mlf_unset_folder): Update for - folder_flags. - - * folder-browser-ui.c (folder_browser_ui_add_list): Check - CAMEL_FOLDER_IS_TRASH flag rather than checking - CAMEL_IS_VTRASH_FOLDER. - - * folder-browser.c (folder_browser_toggle_hide_deleted): Likewise - - * message-list.c (message_list_set_folder): Likewise. - (message_list_set_hidedeleted): Remove redundant trash check. - -2001-10-08 Jon Trowbridge - - * mail-format.c (write_default_header): Write out the Bcc: header - when applicable. Fixes bug #5823. - -2001-10-08 Jeffrey Stedfast - - * mail-format.c (attachment_header): Convert the htmlinfo into - utf8. Fixes bug #11966. - -2001-10-08 Dan Winship - - * component-factory.c (create_view): For mailstorage folders, - connect to the control's "activate" signal, and don't try to - connect to the store. - (storage_activate): Instead, do it here, so if the connection - fails, or the user cancels, or whatever else, he can try again - later. - -2001-10-07 Dan Winship - - * mail-tools.c (mail_tool_do_movemail): Remove #ifndef - MOVEMAIL_PATH code, since the setting of that variable has been - meaningless for a while now, and the rest of the code DTRT whether - that code executes or not. - -2001-10-05 Jeffrey Stedfast - - * mail-mt.c (pass_got): Fix a merge-conflict leftover. - -2001-10-05 - - * folder-browser.c: reformatted the menu tables so they're a bit - more bloody readable. - - * mail-folder-cache.c (mail_note_store): Hook into - subscribed/unsubscribed events. Only 'add/remove' folders from - the add/removed events if we aren't subscribed, otherwise use the - subscribed events. Rest of fix for #11831 - -2001-10-05 Jon Trowbridge - - * mail-config.glade: Add toggle button to config menu to turn the - "confirm sending unwanted HTML" dialog on/off. (Bug 10794) - - * mail-accounts.c (construct): Make said toggle button actually - work. - -2001-10-05 Jeffrey Stedfast - - * mail-callbacks.c (e_gnome_dialog_set_parent): New convenience - function that not only sets the gnome-dialog's parent window but - also makes sure that the gnome-dialog closes when it's parent - closes. - (e_gnome_warning_dialog_parented): New conmvenience wrapper around - the libgnomeui version that also does the same thing as - e_gnome_dialog_set_parent. - (e_gnome_error_dialog_parented): Same. - (e_gnome_ok_dialog_parented): And again... - (e_gnome_ok_cancel_dialog_parented): And once again. - -2001-10-05 Larry Ewing - - * mail-callbacks.c (mail_generate_reply): use - e_msg_composer_new_with_message rather than e_msg_composer_new. - This way we bring in all the attachment of the message we are - replying to. - -2001-10-05 Christopher James Lahey - - * message-list.c (message_list_setup_etree): Turn on - "uniform_row_height" argument. - -2001-10-04 - - * folder-browser.c (update_status_bar): Show "nn sent" as total in - sent folder, rather than just 'total'. - - * mail-folder-cache.c (update_1folder): Also show total message - count for sent_folder. - - * folder-browser-ui.c (folder_browser_setup_property_menu): Do a - better job of setting up the name. Also de-sensitise when we - can't configure the folder. - -2001-10-04 Jeffrey Stedfast - - * mail-callbacks.c (providers_config): Set the parent window as - the fb. This fixes bug #11723. - (filter_edit): Do the same thing here too and also to the warning - dialog. - (edit_msg): Set the parent on the warning dialog. - (resend_msg): And here. - (search_msg): Here too. - (confirm_expunge): Set the parent window on the dialog here too. - (save_msg_ok): Same here. - - * mail-accounts.c (images_radio_toggled): Ignore the signal if the - radio button is not "on". This fixes bug #10532 because the on/off - signals don't always come in the off->on order. - - * mail-ops.c (mail_send_message): Reduced some redundancy. - -2001-10-04 Dan Winship - - * mail-format.c (write_address): Fix so that an email address with - no name is once again just "foo@bar.com", not "". - -2001-10-04 Iain Holmes - - * importers/evolution-mbox-importer.c (load_file_fn): Only pass - CAMEL_STORE_FOLDER_CREATE when the shell will be creating the - folder. - -2001-10-04 - - * mail-callbacks.c (configure_folder): If we're accessing a - vfolder uri, then popup the vfolder editor instead of trying the - mail local one. - - * mail-vfolder.c (vfolder_edit_rule): Edit a vfolder by name. - -2001-10-04 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_save): Added some more NULL - checks. - -2001-10-04 - - * component-factory.c (storage_remove_folder): Do the url - fragment/path -> folder name hack. Removing vfolders from shell - works now? - -2001-10-03 - - * mail-send-recv.c (build_dialogue): Only build destination data - if we have destination != NULL. Fixes crash of bug #10835. - - * folder-browser.c (folder_browser_config_search): Set 'to' -> - 'recipient' data for search object. #6199. - - * mail-local.c (local_storage_new_folder_cb): Handle vtrash case, - emit 'folder_created' event for the folder-cache to work, etc. - -2001-10-03 Jeffrey Stedfast - - * mail-format.c (mail_write_authenticity): Don't use the wax-seal - icons for the pgp stuff anymore, use Jimmac's new icons instead. - -2001-10-03 - - * mail-folder-cache.c (folder_changed): Dont wait for event to - finish before returning. This could however mean we process it - after things have vanished below us? Fixes another case of ctrl-d - deadlock. - - * folder-browser.c (update_status_bar): If we have hide deleted - set, then dont count deleted messages in the 'total' messages - count. Fixes #6591. - - * mail-ops.c (add_vtrash_info): If we have a fragment, override - that, rather than the path. Fixes #5251. - (remove_folder_get): Freeze/thaw around deleting all messages in - folder. - -2001-10-03 Rodrigo Moya - - * importers/Makefile.am: add $BONOBO_GNOME_CFLAGS to make it work - with latest Bonobo - -2001-10-02 Jeffrey Stedfast - - * mail-callbacks.c (transfer_msg): Pass an empty flags argument to - mail_transfer_messages - destination folder should already be - created by this point. - - * folder-browser.c (message_list_drag_data_received): Pass an - empty flags argument to mail_transfer_messages. - (selection_received): Same. - - * component-factory.c (xfer_folder): Pass the CREATE flag to - mail_transfer_messages() so that the dest folder gets created. - (destination_folder_handle_drop): Update for mail-ops API change. - - * mail-ops.c (mail_transfer_messages): Now takes a dest_flags - argument that it passes along to mail_tool_uri_to_folder when - opening the destination folder. - -2001-10-02 Jeffrey Stedfast - - * mail-vfolder.c (vfolder_setup_do): Pass an empty flags argument - to mail_tool_uri_to_folder. - (vfolder_adduri_do): Same. - - * mail-session.c (get_folder): Pass an empty flags argument to - mail_tool_uri_to_folder. - - * mail-send-recv.c (receive_get_folder): Pass an empty flags - argument to mail_tool_uri_to_folder. - - * mail-ops.c (get_folder_get): Pass the flags to - mail_tool_uri_to_folder. - (mail_get_folder): Now takes a flags argument. - (remove_folder_get): Pass an empty flags argument to - mail_tool_uri_to_folder. - (mail_send_message): Pass an empty argument flag to - mail_tool_uri_to_folder. - (transfer_messages_transfer): Same. Destination folder should - already be created by this time. - - * folder-info.c (do_get_info): Pass an empty flags argument to - mail_tool_uri_to_folder. - - * importers/evolution-mbox-importer.c (folder_created_cb): Pass - the CREATE flag here too. - (load_file_fn): And here. - (load_file_fn): And here too. - - * importers/evolution-outlook-importer.c (load_file_fn): Pass the - CREATE flag to mail_tool_uri_to_folder. - - * folder-browser.c (folder_browser_new): Pass an empty flags - argument. - (x_evolution_message_parse): Pass an empty flags argument to - mail_tool_uri_to_folder. - - * component-factory.c (create_folder): Pass a CREATE flag to - mail_get_folder here too. - (owner_set_cb): And here. - (xfer_folder): Shouldn't need the CREATE flag here, so not passing - any flags. - (destination_folder_handle_drop): Same. - - * mail-local.c (mail_local_store_add_folder): Pass a CREATE flag - to mail_get_folder. - (reconfigure_folder_reconfigure): Pass an empty flags argument to - mail_tool_uri_to_folder. - - * mail-tools.c (mail_tool_uri_to_folder): Take a flags argument. - (mail_tool_get_local_inbox): Pass an empty flags argument to - mail_tool_uri_to_folder. - -2001-10-02 Ettore Perazzoli - - * mail-account-gui.c (launch_signature_editor): Use - `bonobo_ui_component_new_default()', not - `bonobo_ui_component_new()'. - -2001-10-01 Jon Trowbridge - - * mail-display.c (on_url_requested): Make sure we aren't dealing - with a pathological message w/o a From: header. - (ebook_callback): Properly check that the address we queried - matches the address on the current message. (Bug #10038) - -2001-10-01 Iain Holmes - - * component-factory.c (component_factory_init): Check for errors. - - * mail.h: Change prototype for evolution_folder_info_factory_init. - - * folder-info.c (evolution_folder_info_factory_init): Return TRUE - or FALSE. - - * mail-config.c (evolution_mail_config_factory_init): Return TRUE or - FALSE. - - * mail-config.h: Change prototype for above. - -2001-10-01 Jeffrey Stedfast - - * mail-vfolder.c (mail_vfolder_remove_uri): replace my_list_find() - == NULL with my_list_find() != NULL. - -2001-10-01 Dan Winship - - * component-factory.c (mail_load_storage_by_uri): create storages - for providers that are STORAGE and aren't EXTERNAL, rather than - "(STORAGE and REMOTE) or spool, maildir, or vfolder". - (mail_remove_storage_by_uri): Use the same rule here (which makes - it possible now to remove maildir and spool stores now, which - weren't properly special-cased before). Remove some CamelException - misuse. - - * mail-config.c (new_source_created): Fix up the broken INBOX- - shortcut-generating assumption a little by only assuming that if - you call camel_store_get_inbox(), that its full_name is the same - as its path. (This happens to always be true for inboxes now, and - will be always true by definition at some point in the future.) - Now maildir stores get working Inbox shortcuts. - - * mail-send-recv.c (get_receive_type): If PROVIDER_IS_STORAGE - then use SEND_UPDATE, if not, use SEND_RECEIVE. - - * mail-local.c (local_provider): The local provider is EXTERNAL. - (The shell creates it.) - (mail_local_reconfigure_folder): Allow reconfiguring between - IS_LOCAL providers. - - * mail-accounts.c (news_delete): Don't need to check the provider - flags here... we know nntp is a STORAGE. - -2001-10-01 Dan Winship - - * mail-local.c (mail_local_reconfigure_folder): Don't use - mail_tool_get_folder_name here since that function only existed to - be clever in a certain case that this is not. - (reconfigure_folder_free): Remove the dialog from the hash table - here so that it gets removed in the successfully-reconfigured case - too. Don't unref folder_out if it never got set. - (reconfigure_clicked): Remove the hash table code from here; it's - in reconfigure_folder_free now. - - * mail-tools.c (mail_tool_get_folder_name): No longer used by - anything. - (mail_tool_get_folder_from_urlname): Also not used anywhere. - -2001-10-01 Jeffrey Stedfast - - * mail-tools.c (mail_tool_uri_to_folder): Don't pass the CREATE - flag, we shouldn't ever need this... - -2001-10-01 Larry Ewing - - * mail-identify.c (mail_identify_mime_part): if gnome-vfs returns - application/octet-stream with the magic check, use the filename - check instead since it at least has a chance of being useful. - -2001-09-28 Dan Winship - - * folder-browser-ui.c (fbui_sensitize_timeout): wrap a - bonobo_ui_component_freeze/thaw around all of the set_props so - they all update at once. - -2001-09-28 Jeffrey Stedfast - - * mail-accounts.c (construct): Don't create checkboxes for global - Threaded or Preview options as they are now removed. - -2001-09-28 - - * component-factory.c (owner_set_cb): Setup vfolder storage before - all others. - - * mail-local.c (mail_local_store_remove_folder): Emit - folder_deleted event. - (remove_find_path): Fix, compare against path, not full_name. - - * mail-tools.c (mail_tool_uri_to_folder): Dont - vfolder_register_source anymore. - - * mail-vfolder.c (rule_changed): Changed to access - mail_fodler_cahce to find out if the folder exist yet before - trying to open them, also use the cache as a cache so we dont have - to open the folder if its already been opened. - (vfolder_register_source, register_source): Removed. - (source_finalise): Removed, - (check_source): Removed. All handled through diff mechanism. - (mail_vfolder_add_uri): New function, records uri's of available - folders, and adds them to any active vfolders if required. - (mail_vfolder_remove_uri): New function, removes a uri from - available folders, and checks any rules to see fi they need - updating. - (vfolder_adduri): New async function to add a uri to all vfolders - that need it. - (store_folder_deleted): oops! free user, not rule!! - - * mail-folder-cache.c: Add uri->folderinfo hashtable, and the - store from which they come into the store info struct. - Add uri to the folder_info. - (setup_folder): Store the uri in the folderinfo. - (setup_folder): And the uri in the folder_uri hashtable. - (mail_note_store): Store the store in the storeinfo, and setup the - folders_uri hashtable via the store's hash functions. - (setup_folder): Call mail_vfolder_add_uri to note this newly setup - folder uri. - (store_folder_deleted): Proxy call to main thread. - (real_folder_deleted): And tell the vfolder to remove this uri - from its folder list. - (setup_folder): Dont call vfolder_add_uri if noselect is set on - the uri. - -2001-09-27 - - * mail-vfolder.c: Removed vfolder_info struct, vfolder_storage. - Neither used anymore. - -2001-09-28 Jeffrey Stedfast - - * mail-config.c (mail_config_get_account_by_transport_url): Use - Camel to compare the urls rather than using e_url_equal which does - all sorts of funky shit that may not work in every case. - -2001-09-28 Jeffrey Stedfast - - * mail-local.c (mail_local_provider_init): Setup the url_hash and - url_equal functions for the local provider. - - * mail-account-gui.c (mail_account_gui_save): Add code here to - check to make sure that the Drafts and Sent folders are pointing - to valid urls. This is kinda nasty and only really solves the case - where the user changes, say, his imap server or - something. Unfortunately we still have the problem where if - account A's sent/drafts folders point to account B's store and the - user changes the url for account B. - - * mail-config.c (mail_config_get_account_by_source_url): Use Camel - to compare the urls rather than using e_url_equal which does all - sorts of funky shit that may not work in every case. - -2001-09-28 Dan Winship - - * mail-mt.c (pass_got): Don't call - mail_config_service_set_save_passwd if we didn't find a service. - -2001-09-27 Ettore Perazzoli - - * mail-config.c (add_shortcut_entry): Just add the shortcut to the - first group. - -2001-09-28 Jeffrey Stedfast - - * folder-browser-ui.c (folder_browser_ui_add_list): Call - folder_browser_toggle_threads() here after setting the value. This - should fix bug #6415 and if it doesn't, then this whole deal is - just a lost cause. - - * mail-mt.h: Added mail_msg_cleanup() prototype. - -2001-09-28 Dan Winship - - * mail-format.c (get_data_wrapper_text): Deal with - camel_mime_filter_charset_new_convert returning NULL. (Every other - call to it does, and something's wrong with iconv on the Sun right - now so it keeps failing.) - -2001-09-27 Ettore Perazzoli - - * mail-mt.c (do_user_message): Always make the Cancel button the - last one. - -2001-09-27 - - * mail-folder-cache.c (real_note_folder): No such event finalized! - Its finalize. - (mail_note_store): " - - Fixed dan's comment a bit, info != NULL for folder_created, info== - NULL for changed. - -2001-09-26 - - * mail-local.c (mlf_set_message_flags): Proxy the - set_message_flags call too. Doesn't fix the 'local folder counts - dont update' problem, but its more correct. - -2001-09-27 Jeffrey Stedfast - - * mail-session.c (mail_session_remember_password): Perform a - NULL-check. Hopefully fixes bug #7874. - -2001-09-27 Dan Winship - - * mail-offline-handler.c (service_is_relevant): A service needs to - be disconnected if it's remote, not already offline, and either - connected OR connecting. - (storage_go_offline): Don't put non-relevant stores offline. (Eg, - don't force an IMAP store which you hadn't already connected to to - connect and sync.) - (storage_go_online): Likewise, don't "reconnect" stores that - weren't connected before. - - * mail-ops.c (set_offline_desc): Fix the message to say - "reconnecting" instead of "disconnecting" when appropriate. - (mail_store_set_offline): If offline is TRUE, call - camel_service_cancel_connect on the store. (We do this here - because we don't want the cancel_connect request to get queued up - behind a hanging connection attempt.) - -2001-09-26 Anna Marie Dirks - - * mail-config.glade: Added a "Description:" label and moved - the source_description and transport_description labels to - a more appropriate place. - -2001-09-26 Christopher James Lahey - - * message-list.c (mlfe_callback): Check for the root node here. - Fixes Ximian bug #11029. - -2001-09-26 Jeffrey Stedfast - - * mail-mt.c (do_get_pass): Change the wording of the password - dialog if we are getting a pgp passphrase so that users don't - misinterpret it to mean saving the passphrase forever. - -2001-09-26 Jon Trowbridge - - * mail-callbacks.c (composer_get_message): strdup our "This - message contains invalid recipients" string, since it gets freed - later. And then don't leak the message string. (Bug #10877) - - * mail-format.c (write_address): Use camel_address_format, - not camel_address_encode. - - * mail-display.c (html_button_press_event): Decode our URL before - extracting the address to pop up contact info. - - * mail-format.c (write_address): When writing out a mailto: link, - make sure we construct a valid URL w/ correct encoding. Make sure - our address is properly quoted, if necessary. - -2001-09-26 Dan Winship - - * mail-folder-cache.c: Add a big comment explaining unread message - counts so no one can mess them up again in the future. :-) - (update_1folder): If info->unread_message_count is -1, don't do - anything. - - * component-factory.c (component_factory_init): warn and exit if - oaf_active_server_register returns OAF_REG_ALREADY_ACTIVE. - -2001-09-26 Jeffrey Stedfast - - * mail-config.c (config_read): Oops, translate the fake account - name to UTF-8. - -2001-09-26 Christopher James Lahey - - * message-list.c (message_list_foreach): Use - e_tree_selected_path_foreach instead of - e_tree_selected_row_foreach here. - -2001-09-27 Michael Meeks - - * mail-config.c (mail_config_init): report the - exception on failure and abort quickly instead of hitting - a strange assert later. - -2001-09-25 Jeffrey Stedfast - - * mail-format.c (decode_pgp): Update to not send the - remember-passphrase option to the context, it doesn't need it - anymore. - (try_inline_pgp_sig): Same. - - * mail-accounts.c (construct): The remember-passphrase option is - no longer there. This can now be set on the passphrase prompt - dialog. - (construct): Add confirm expunge options. - - * mail-config.c (config_read): We no longer read-in the - remember-passphrase state because we no longer need it. - (mail_config_write_on_exit): We no longer save it either. - (mail_config_get_remember_pgp_passphrase): Removed. - (mail_config_set_remember_pgp_passphrase): Removed. - - * mail-crypto.c (mail_crypto_pgp_mime_part_sign): No longer do we - need to send the remember passphrase state to the pgp context. - (mail_crypto_pgp_mime_part_verify): Same. - (mail_crypto_pgp_mime_part_encrypt): Here too. - (mail_crypto_pgp_mime_part_decrypt): And here. - -2001-09-25 Ettore Perazzoli - - [Patch for Automake 1.5 compatibility pointed out by Richard - Boulton , as per #9258.] - - * Makefile.am (CLEANFILES): Assign directly, not with `+='. - -2001-09-25 Jeffrey Stedfast - - * mail-folder-cache.c (update_1folder): The folder-info needs to - take priority over the folder because of the way IMAP works (which - is that it doesn't actually update the folders until you SELECT - them and so when you do get_folder_info(), it doesn't actually - SELECT the folders, it just STATUS's them). - -2001-09-25 - - * folder-browser.c (folder_browser_destroy): Deal with destroy vs - finalise semantics. Only destroy widgets here. - (folder_browser_finalise): object finalise function, actually - unref/free all other objects here. - (folder_browser_class_init): Init the finalise hook. - (got_folder): Check if message_list == NULL -> we've been - destroyed before the thread got a chance to finish loading the - folder. - (folder_browser_is_drafts): Dont use a g_return_if_fail to return - in what could be a valid state of the object. - (folder_browser_is_sent): Likewise. - (folder_browser_copy): Do nothing if message_list == NULL. - - * main.c (main): call mail_msg_cleanup() before leaving threads. - - * component-factory.c (owner_unset_cb): Wait for all outstanding - operations to finish before setting up to quit. - (idle_quit): Wait for all outstanding ops to finish before - cleanup. - (unref_standard_folders): NULL out the standard folder before - unreffing it. - - * mail-mt.c (mail_msg_wait_all): New function to wait for all - outstanding thread operations. - (mail_msg_cleanup): Destroy the io channels before we're - finished. Also wait for all outstanding threads first. Made - public. - (mail_msg_init): Dont call mail_msg_cleanup atexit automatically. - - -2001-09-25 Jeffrey Stedfast - - * mail-format.c (get_data_wrapper_text): If the data wrapper - contains raw text, treat the contents as if they were in the - user's default charset and convert them to UTF-8. - - * component-factory.c (owner_set_cb): Throw up a warning dialog if - we suspect the config database is corrupt. - - * mail-config.c (config_read): If the account name is NULL, then - we have a corrupt config database most likely - so generate a fake - account name and set the corrupt but to TRUE. - (mail_config_is_corrupt): New function to find out if the config - is suspected of being corrupted. - -2001-09-25 Iain Holmes - - * mail-config.c (impl_GNOME_Evolution_MailConfig_addAccount): - Check if the transport is NULL. - -2001-09-25 Iain Holmes - - * mail-display.c (link_menu): Remove the Save Link as (FIXME) - item. - -2001-09-25 Jeffrey Stedfast - - * mail-mt.c (pass_got): Only cache the password for the service if - it has an entry in the account database. Fixes bug #10875. - -2001-09-24 Christopher James Lahey - - * message-list.c (filter_date): Use e_strftime_fix_am_pm instead - of strftime. - -2001-09-24 - - * mail-local.c (mls_get_folder): Removed unused variables. - - * component-factory.c (storage_create_folder): Remove unused - variable. - - * mail-format.c (write_default_header): Used to write a header - that we know about/normally print. Use a static header table to - index these. - (write_header): removed. - (default_header_index): Return the index of the default header. - (write_headers): Changed the way it writes headers a bit. Use - write_default_header or write_text_header directly. Also try and - use the header charset as a fallback if the header can't be - decoded using the locale charset. - -2001-09-23 Jeffrey Stedfast - - * mail-mt.c (pass_got): Always cache POP and IMAP passwords, even - if the user didn't tell us to. Fixes bug #10569. - -2001-09-21 - - * mail-mt.c (mail_msg_check_error): If we have an operation that - failed before, dont show the dialogue for the the new error. Also - use gtk_widget_show rather than invoking another main loop. Fix - for lazy people who like to leave their mailers running and go - home. - -2001-09-21 Jeffrey Stedfast - - * mail-ops.c (mail_send_message): Use the mail-tools convenience - functions to remove and restore the X-Evolution headers. - (mail_update_subfolders): Removed. - -2001-09-21 - - * mail-callbacks.c (mail_storage_create_folder, folder_created, - create_folders): All made redundant by new mail-folder-cache - code. - (delete_folders, folder_deleted): Uh, code that isn't used - anywhere. Removed. - - * component-factory.c (storage_create_folder): Dont call - folder_created, let the folder_created event handle the update. - - * mail-local.c (mail_local_store_add_folder): Use url path as - full_name, not shell path. - (mail_local_folder_construct): Remove path argument, and use the - full_name instead. - (mls_get_folder): Dont lookup folderinfo in cache. Like duh the - shell hasn't told me its there yet, smaaaart. - - * mail-folder-cache.c (mail_note_store): Take a new argument - 'done' that can callback when complete. Fixed callers - appropriately. - - * mail-ops.c (mail_update_subfolders): Removed. Isn't used - anymore. - (mail_scan_subfolders): Remove, no longer used. - - * mail-send-recv.c (receive_update_got_store): Remove call to - mail_update_subfolders. - -2001-09-20 - - * mail-vfolder.c (check_source): Dont let drafts/outbox/sent be - added via a generic 'all local folders' rule. - - * component-factory.c (got_folder): trigger a folder changed - event, so the folderinfocache stuff has a chance to see if this is - the outbox_folder or not. - - * mail-folder-cache.c (update_1folder): If we have -1 unread - count, pass that as 0 to the shell so it doesn't go bolding. - (setup_folder): Same. - -2001-09-20 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_save): Only add the account - if it doesn't already exist in the config db. - - * mail-config.c (mail_config_find_account): New convenience - function. - - * mail-config-druid.c (wizard_finish_cb): Do not add the account - here as this is taken care of in mail_account_gui_save() since it - has to be able to set the default account. - - * mail-config.c (mail_config_set_default_account): Don't allow the - index to become invalid. - - * mail-account-gui.c (mail_account_gui_save): Add the account - before setting it as the default. - -2001-09-20 - - * folder-browser.c (folder_browser_set_shell_view): Update the - status bar here, assuming we've just been activated. - - * mail-ops.c (add_vtrash_info): Scan whole list, rather than - missing the last one. Also dont assume its always the last, - otherwise we could lose following folders. - -2001-09-20 Jeffrey Stedfast - - * mail-tools.c (mail_tool_uri_to_folder): Don't "note" the folder - if we failed to get it. - -2001-09-20 Iain Holmes - - * mail-account-gui.c (mail_account_gui_new): Set the sensitivity - of the edit buttons correctly. - -2001-09-20 - - * mail-vfolder.c (vfolder_register_source): Lock around - hashtable/list manipulation. Also dont try scan vfolder_hash if - it hasn't been setup yet. - (source_finalise): Lock around list access. - (rule_changed): Lock around hash access. - (context_rule_added): Lock around hash access. - (context_rule_removed): " - (rule_changed): Lock around list access. - (all): d(x) out debug printfs - - * mail-local.c (storage_listener_startup): Fix for api change. - (local_storage_new_folder_cb): Dont skip over leading / in path. - (local_storage_removed_folder_cb): ditto. - - * mail-folder-cache.c (create_folders): No longer pass prefix - between recursive calls - we have the path in the folderinfo. - (setup_folder): No longer take path arg, we get it from - folderinfo. - (mail_note_folder): No longer take path arg, we use - folder->full_name to key the folder table. - (mail_note_store): Consolidate note_store interface, pass storage - or corba_storage to it. - (mail_note_local_store): Removed. - (update_1folder): If its a vtrash folder, or the outbox_folder, - and we have a folder, then make the 'count' the total message - count, not unread messages count. - -2001-09-20 Jeffrey Stedfast - - * mail-local.c (mail_local_store_add_folder): Set the folder info - path. - -2001-09-20 - - * mail-tools.c (mail_tool_uri_to_folder): Register vfolder sources - here. - - * folder-browser.c (got_folder): Dont register vfolder sources - here. - - * mail-ops.c (mail_get_folder): Add thread parameter. Fix callers. - (add_unmatched_info): Scan for unmatched name and re-title. - - * mail-vfolder.c (vfolder_setup): Use the 'slow' queue for setting - up vfolders. - - * mail-mt.c (mail_msg_init): Limit the maximum number of threads - on the 'new' thread to 10. - (mail_msg_init): Create a new queue 'slow' for doing slow - operations. - -2001-09-20 Iain Holmes - - * mail-display.c (mail_error_write): Add a
to make - the error message look better. - -2001-09-20 - - * mail-tools.c (mail_tool_uri_to_folder): Dont special case file: - url's anymore. - - * mail-local.c: Add real_path to MailLocalFolder. - (mail_local_folder_construct): Added path argument, setup - full_name == path, and real_path == full_name. - (mls_get_folder): First lookup folderinfo to confirm this folder - exists, then use that to properly construct the folder paths. - (mail_local_folder_reconfigure): Use real_path not full_name to - create the store uri. - (mlf_set_folder): Use real_path not folder_name to get real uri - path. - -2001-09-19 - - * mail-folder-cache.c (setup_store): Use the wrong spelling of - finalised for the event hook. - (real_note_folder): Use the wrong spelling of finalised for the - event hook. - (free_folder_info): Free the full_name parameter. - (setup_folder): - (real_note_folder): Key the folderinfo table on full_name, not - path. - -2001-09-20 Jeffrey Stedfast - - * mail-ops.c (save_messages_save): Convert all textual parts to - 8bit before saving. Fixes bug #10388. - - * mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Oops, - don't free memory that we don't own. - -2001-09-20 Dan Winship - - * mail-config.c (evolution_mail_config_factory_init): No need to - have g_warnings here. If it's done properly, therapeutically, - there's no danger involved. - -2001-09-19 Jon Trowbridge - - * mail-callbacks.c (mail_generate_reply): Truncate extremely long - subjects. (inspired by bug #9158) - - * mail-tools.c (mail_tool_generate_forward_subject): Truncate - extremely long subjects. (bug #9158) - -2001-09-19 Jeffrey Stedfast - - * mail-send-recv.c (receive_update_got_store): Here too. - - * component-factory.c (create_view): Call mail_note_store() - instead of mail_scan_subfolders() here so that these folders get - hooked up with the unread count code. - -2001-09-12 Iain Holmes - - * importers/evolution-mbox-importer.c (load_file_fn): Fix memory - leak. - -2001-09-19 Jeffrey Stedfast - - * mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Convert - the names to the locale charset. - -2001-09-19 Dan Winship - - * mail-callbacks.c (create_folders): Pass the actual unread - message count, not just whether or not it's > 0. Fixes ximian - 9089. - -2001-09-19 - - * component-factory.c: Added missing header. - - * mail-local.c (mail_local_store_add_folder): Async load the - folder we just added, so it can update the folder counts in the - display. We just discard the folder afterwards? - - * mail-ops.c (mail_get_folder): Use the queued thread to get - folders. - - * General cleanup of mail debug printfs. - - * mail-folder-cache.[ch]: Completely rewritten. Removed all calls - to the old code everywhere they were used. Nuff said. - - * folder-browser.h: Add shell_view to folder_browser & api to set - it. - - * folder-browser-factory.c (control_activate): Set the shell-view - on the folder_browser. - (control_deactivate): And clear it here. - - * folder-browser.c (folder_browser_destroy): Unhook from changed - events on the folder before giving it away. - (got_folder): Hook onto the folder-changed events. - (folder_changed): Event hook proxy for folder_changed events - (main_folder_changed): And the main code version. - (update_status_bar): And the one that actually does the work. - (on_selection_changed): Also call update_status_bar() to update - the selection count. - (folder_browser_set_shell_view): Implement function to set the - shell_view on the folder_browser. - (folder_browser_destroy): Release the shell_view here too. - - * mail-tools.c (mail_tool_uri_to_folder): Dont 'note' the new - folder if its from a file: url, this is handled by hte local store - (yeeruughck). - - * mail-local.c (mls_init): - (free_info): - (mls_finalise): Setup init/finalise funcs for the folderinfo hash. - (local_storage_removed_folder_cb): re-enable. - -2001-09-18 - - * mail-local.c (MailLocalStore): Add a hash table to store - uri<>folderinfo data. - (mail_local_store_add_folder): Add a new folderinfo to our hash. - (mail_local_store_remove_folder): Remove a folder by uri. - (storage_listener_startup): Add this store to those monitored by - the folder tree. - -2001-09-18 Jeffrey Stedfast - - * mail-mt.c (do_get_pass): Make the title translatable, and also - use the account name when possible. Sorta fixes bug #6277. - -2001-09-17 - - * mail-send-recv.c (get_receive_type): Function to get the real - receive tpe for ag iven url. IMAP/SPOOL/MAILDIR types just update - their info, dont download. - (build_dialogue): - (mail_receive_uri): Use function above to get the right receive - type. - -2001-09-18 Jeffrey Stedfast - - * mail-tools.c (mail_tool_remove_xevolution_headers): Oops, forgot - about X-Evolution-Format. - (mail_tool_restore_xevolution_headers): Same. - -2001-09-18 Dan Winship - - * folder-browser.c (folder_browser_set_uri): Merged into - folder_browser_new: nothing ever changes the URI of an existing - folder browser any more. - (folder_browser_new): Make this take a uri argument and do the - work folder_browser_set_uri used to do, except that we set fb->uri - right away, so that if the folder browser's control is activated - before got_folder() gets called, then folder_browser_ui_add_list() - will have access to the correct uri for purposes of setting - ViewThreaded, etc. Fixes #4913. - (got_folder): Don't set fb->uri here since it will already have - been set. Don't call message_list_set_threaded, since it should be - a noop now (and if it's not, it would make the message list not - match the menu item). - - * folder-browser-ui.c (folder_browser_ui_add_list): Remove some - code that was failing to work around the problems above. - - * message-browser.c (message_browser_new): Pass uri to - folder_browser_new, remove call to set_uri. - - * folder-browser-factory.c (folder_browser_factory_new_control): - Likewise. Also fix a s/destroy/unref/ in an error cleanup. - -2001-09-18 Jeffrey Stedfast - - * mail-session.c (get_password): Pass a 'cache-me' argument to - mail_get_password. - - * mail-mt.c (pass_got): Make less confusing... - (mail_get_password): Now takes an argument 'cache' that allows our - caller to determine if the user wanted to cache his/her password - or not. - (pass_got): Set the cache option. - -2001-09-18 Dan Winship - - * mail-format.c (mail_format_raw_message): Call - mail_content_loaded here rather than blocking if the message data - isn't available. - -2001-09-17 - - * mail-ops.c (mail_get_folderinfo): Get folderinfo 1 at a time - rather than all at once. - -2001-09-17 Jeffrey Stedfast - - * component-factory.c (storage_remove_folder): Unsubscribe from - the folder before deleting it. Also, use the url's path instead of - the shell's path since IMAP doesn't necessarily have to use "/" as - the dir sep. - - * mail-ops.c (remove_folder_get): If the store supports - subscriptions, make sure to unsubscribe from the folder before - deleting it. - -2001-09-17 - - * mail-local.c (storage_listener_startup): Setup global - corba_storage variable. - (mls_get_folder): Set 'update lstorage' on the newly opened - folder. - -2001-09-17 Jeffrey Stedfast - - * mail-display.c (invisible_selection_get_callback): Do nothing if - the selection is NULL? Maybe this is the cause of bug #6817. - - * mail-config.c (mail_config_folder_to_cachename): Go back to - generating the cachename ourselves, but continue doing it the way - the dfault implementation of camel_folder_get_uri worked. - -2001-09-16 Christopher James Lahey - - * message-list.c (ml_get_node_by_id): Made save_id const here. - -2001-09-16 Jeffrey Stedfast - - * mail-display.c (pixbuf_gen_idle): Don;t destroy the pixbuf - loader, unref it instead. - - * mail-config.c (mail_config_folder_to_cachename): Use - camel_folder_get_uri(). - -2001-09-15 - - * mail-vfolder.c: Major rewrite of most of the guts, handle - changes based on signals and events, etc. Use the main storage - handling code that imap uses, etc. - - * mail-tools.c (mail_tool_uri_to_folder): Dont special case - vfolder: anymore. - - * component-factory.c (owner_set_cb): use vfolder_load_storage(), - new function to setup vfolder storage, after interaction has been - enabled only. This might need some tweaking ... - (storage_remove_folder): Removed all the folder lookup stuff. - Just delete the folder based on the path passed in. There should - be no reason this wouldn't work, right? - -2001-09-14 - - * mail-ops.c (get_folderinfo_get): Only add vtrash folder info, if - store supports vtrash. - - * component-factory.c (mail_load_storage_by_uri): Let 'vfolder' - stores show up too. - -2001-09-13 - - * mail-vfolder.c (vfolder_uri_to_folder): Open a vfolder then set - its expression, since name?query open method is removed. - -2001-09-14 Jeffrey Stedfast - - * subscribe-dialog.c (fe_root_value_at): Return the cached value - of camel_service_get_name so that we don't leak memory. - (fe_real_value_at): Don't strdup the node's name. - (folder_etree_construct): Set the service_name. - (fe_destroy): Free the service_name. - - * mail-ops.c (add_vtrash_info): Free the temporary path variable - here. - - * subscribe-dialog.c (store_data_new): Added a refcount variable - so set the refcount to 1. - (sd_got_store): Unref the store-data. - (store_data_async_get_store): Ref the store-data. - (store_data_ref): New function. - (store_data_unref): New function. - (subscribe_dialog_destroy): Instead of freeing the store-data - here, unref it instead. We may just have an async function - running. Set the callback function to NULL so that when the - (remaining) async functions finish, they become no-ops. - - * mail-send-recv.c (build_dialogue): Revert my bar_destroy code - and replace it with dialog_destroy instead. - - * mail-ops.c (mail_send_message): Append a message to any - exception we get appending to any folders after having sent the - message successfully saying that the message was sent successfully - so the user doesn't misinterpret the error. - -2001-09-13 Jon Trowbridge - - * mail-callbacks.c (composer_get_message): Fixed double-freeing of - EDestination vector when sending html mail to people who don't - necessarily want it. Fixes bug #9848. - -2001-09-13 Jeffrey Stedfast - - * subscribe-dialog.c (get_short_folderinfo_desc): - (get_short_folderinfo_get): - (get_short_folderinfo_got): - (get_short_folderinfo_free): - (subscribe_get_short_folderinfo): Modified to take a FolderETree - instead of a CamelStore (since the CamelStore is inside the - FolderETree anyway) so that we could ref the ETree to prevent a - race condition. Should fix bug #9827. - - * mail-format.c (try_inline_pgp_sig): Make sure that the - charset_filter is non-NULL before using it since iconv may fail. - -2001-09-13 Larry Ewing - - * mail-tools.c (mail_tool_quote_message): free the credits string. - -2001-09-12 - - * mail-vfolder.c (vfolder_remove_cb): Fixed the remove callback - prototype, and return the result properly using the listener. - (vfolder_uri_to_folder): Always use the same store uri, so we dont - create a new store for each folder. - -2001-09-12 Jeffrey Stedfast - - * mail-config.c (mail_config_write_on_exit): Save transport - passwords too. This fixes bug #3020. - -2001-09-11 Dan Winship - - * mail-folder-cache.c (mail_folder_cache_note_folderinfo): Don't - set the folderinfo's unread count to 0 when camel reports -1, - since that may overwrite a valid unread count from before. - (get_folder_info): Do it here instead when first creating a new - folderinfo structure. - Should fix bug #1756. - -2001-09-11 Larry Ewing - - * mail-account-gui.c (menu_file_save_cb): call menu_file_save_error - when there is an exception while saving. - (menu_file_save_error): pop up a dialog telling the user the file - has not been saved. - -2001-09-10 - - * mail-local.c (mail_local_reconfigure_folder): Dynamically create - the folder type list from camel. - (reconfigure_clicked): And change code to handle changes. - -2001-09-10 - - * merged mail_local patch from peterw. Many changes. - -2001-09-10 Iain Holmes - - * mail-config.c (impl_GNOME_Evolution_MailConfig_addAccount): Add a - none account if the url is empty. - -2001-09-10 Jeffrey Stedfast - - * mail-callbacks.c (mail_generate_reply): Don't use - new_with_sig_file, that function no longer exists. - (forward_get_composer): Same here. - -2001-09-10 Zbigniew Chyla - - * mail-config.c - (add_shortcut_entry): Marked string for translation. - (new_source_created): Ditto. - - * mail-send-recv.c - (format_url): Marked strings for translation. - (build_dialogue): Ditto. - -2001-09-10 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_new): Hide the S/MIME frame - if we don't support S/MIME. - - * mail-send-recv.c (build_dialogue): Attach to the destroy event - for each progressbar using bar_destroyed as the callback. - (bar_destroyed): New callback to unregister the timeout and set - the send-info's bar member to NULL so we don't try to update a - destroyed progressbar. - - * mail-callbacks.c (mail_generate_reply): Pass along the right - string, this fixes bug #9518. - - * mail-account-gui.c (save_service): Don't save the authmech if - the username doesn't exist. Fixes bug #9474. - - * mail-callbacks.c (do_edit_messages): Remove some mailer-set - headers. Fixes bug #9462. - -2001-09-10 Dan Winship - - * mail-callbacks.c (composer_get_message): Fix obvious dumb - mistake in previous commit that made it *always* complain you had - invalid recipients. - -2001-09-09 Jon Trowbridge - - * mail-callbacks.c (composer_get_message): Complain if we are - trying to send to invalid recipients. (Bug #8875) - -2001-09-09 Jeffrey Stedfast - - * mail-config-druid.c (evolution_mail_config_wizard_factory_fn): - We need to initialize all of the struct fields or else god knows - what will happen later when we try to use 'em. Also set a destroy - function for the MailConfigWizard so we don't leak it. - -2001-09-08 Jon Trowbridge - - * mail-callbacks.c (ask_confirm_for_unwanted_html_mail): Added. - Shows a (hopefully) informative dialog warning you that some - recipients might not want HTML mail (who are listed), and gives - the option to cancel sending. (FIXME: The wording of this dialog - could use some work.) - (composer_get_message): Check if we are sending HTML to someone - who might not want it, and raise the dialog if we are. Use our - new destination-vector based api when talking to the composer. - Touch our destinations here, boosting their use scores. This is - the right place for this to happen --- closer to the end of the - sending process, where incorrect/artificial use score inflation is - less likely to occur. - - * mail-config.c (config_read): Added - /Mail/Format/confirm_unwanted_html key. This flag determines - whether or not we want to see the warning dialog when we send HTML - mail to contacts who don't want it. Default is TRUE. - (mail_config_write_on_exit): Write out the confirm_unwanted_html - key. - (mail_config_get_confirm_unwanted_html): Added. - (mail_config_set_confirm_unwanted_html): Added. - -2001-09-08 Dan Winship - - * mail-display.c (mail_display_destroy): Unref the invisible, - don't just destroy it. - -2001-09-07 Jeffrey Stedfast - - * mail-format.c (mail_write_authenticity): Give the full path of - the wax-seal icons. - (try_inline_pgp_sig): Convert the charset from UTF-8 to whatever - charset it should be. Now takes a CamelMimePart argument as well. - (try_uudecoding): Now takes a part argument as well. - (try_inline_pgp): Here too. - (try_binhex): And finally here. - (handle_text_plain): Pass along the mime part to the try_* - functions. - -2001-09-06 Chris Toshok - - * component-factory.c (notify_listener): new function, to notify - the bonobo listener in remove_folder/create_folder. - (storage_create_folder): match EvolutionStorage create_folder - signal's signature. - (storage_remove_folder): match EvolutionStorage remove_folder - signal's signature. - -2001-09-06 Dan Winship - - Fix a bunch of replying/forwarding-related formatting bugs. - - 2749 - Message text not included in reply, but html attachment is - 4294 - "forward inline" should quote the same headers as the - normal mail display - 6100 - Reply to a forwarded email displays email headers - 7255 - Replying to HTML message - 7527 - replying to forwarded message w/ attachments does the wrong - thing - - * mail-format.c (mail_get_message_rfc822): New function to get - message headers and body together, for inline forwards, or replies - containing attached messages. - (mail_get_message_body): Redo this to always return HTML, but keep - the "want_plain" flag, to decide whether to return HTML that looks - like HTML or HTML that looks like plain text. Use - mail_get_message_rfc822 to handle attached message/rfc822 parts. - Don't include the text of vcard or icalendar attachments. Don't - fail to include text parts just because we found an HTML part. - (Since we're always returning HTML now, this doesn't cause - problems any more.) - - * mail-tools.c (mail_tool_quote_message): Simplify greatly. - mail_get_message_body always returns HTML now, and we let it take - care of prepending "> "s too. We then let GtkHTML deal with - converting the HTML to plain text if the user wants to reply in - plain text. - (mail_tool_forward_message): Simplify this a ton too: parts of it - are moved into mail_get_message_rfc822 and parts are now - unnecessary. - - * mail-callbacks.c (do_forward_non_attached): Call - mail_tool_forward_message here always, and let it do the "> " - quoting in the "quoted" case, so that we get the headers too when - forwarding quoted. Related to bug #4294. - -2001-09-05 Dan Winship - - * mail-display.c (launch_cb): the "command" of a - GnomeVFSMimeApplication can include arguments as well. Deal with - that. Fixes support for CodeWeavers' CrossOver Plugin. - -2001-09-05 Jeffrey Stedfast - - * mail-config.c (mail_config_remove_account): Adjust the - default_account index correctly. - -2001-09-05 Jeffrey Stedfast - - * mail-config.c (mail_config_get_accounts): Added a g_assert to - make sure that config wasn't NULL. This is meant to help debug bug - #4911 and friends. - - * component-factory.c (owner_set_cb): Do not mail_config_init() - here as we've already called this in main() in main.c. - -2001-09-05 Ettore Perazzoli - - [Fix #958, ShellComponents should not be created by factories, for - the mailer case.] - - * GNOME_Evolution_Mail.oaf.in: Remove the - GNOME_Evolution_Mail_ShellComponentFactory. - - * component-factory.c: Changed to not use a factory. - (COMPONENT_FACTORY_ID): Removed. - (COMPONENT_ID): New. - (idle_quit): Don't unref the component_factory. - (create_component): Renamed from `component_fn'. Take no args. - (component_factory_init): Create the component with - `create_component' and register it on OAF. - -2001-09-06 Radek Doulik - - * everywhere updated for new mail_content_loaded definition - (prototype) - -2001-09-05 Radek Doulik - - * mail-display.c (mail_display_redisplay): increase - redisplay_counter - (try_part_urls): new helper function - (try_data_urls): ditto - (load_content_loaded): if it has stream handle available and if - it's still valid, it writes to this stream instead of - redisplaying, uses try_part_urls and try_data_urls - - * mail-display.h: added redisplay_counter to MailDisplay, I use - it in load_content_loaded to be sure that there wasn't any - redisplay and that remembered handle is still valid - - * mail-display.c (on_url_requested): don't end stream with error - if part is not loaded yet - (on_url_requested): don't end stream in cases when we are going to - load image using http - (stream_write_or_redisplay_when_loaded): new helper function, - which is extracted from mail_display_redisplay_when_loaded. it's - extended to handle gtkhtml stream writting - (mail_display_redisplay_when_loaded): use - stream_write_or_redisplay_when_loaded - (mail_display_stream_write_when_loaded): new function, uses - stream_write_or_redisplay_when_loaded - struct _load_content_msg: added handle, url and redisplay_counter - fields - - * mail-format.c (mail_content_loaded): added redisplay, url and - handle parameter for case when we are loading image content and - want it write to stream instead of redisplaying - -2001-09-05 Ettore Perazzoli - - * message-browser.c (message_browser_new): s/Evolution/Ximian - Evolution/. - -2001-09-04 Ettore Perazzoli - - [Fix #7542, "Crash Afer Closing".] - - * component-factory.c (owner_unset_cb): NULL the - global_shell_client as the first thing here. Otherwise we might - get into a slight race that causes the shell to crash. [Still, of - course the shell shouldn't crash, but I haven't been able to track - that down yet.] - -2001-09-04 Zbigniew Chyla - - Fixes #7251 - - * mail-ops.c (add_vtrash_info): Mark "Trash" with U_(), not _(). - -2001-09-04 Jeffrey Stedfast - - * mail-ops.c (fetch_mail_fetch): Unref the source folder here - because it might be a POP folder. We do this because on store - finalize, we now try to disconnect cleanly which means that we may - block. - - * mail-send-recv.c (build_dialogue): Fix capitalization. Fixes bug - #7486. - -2001-09-04 Peter Williams - - * mail-local.c (mlf_init): Remove accidentally left-in "choke on - this" preprocessor thingie. - (mail_local_folder_reconfigure): Instead of creating our own local - exception, just assert that ex != NULL. - (*): Staticize everything that can be and remove some obnoxious - prototypes. - -2001-08-31 Peter Williams - - * mail-local.c (mail_local_reconfigure_folder): Use (NULL, NULL) - as the arguments to g_hash_table_new instead of g_direct_foo. - Instead of checking the URI, check MAIL_IS_LOCAL_FOLDER (fb->folder) - to check whether we can reconfigure the folder. Instead of - gnome_dialog_run_and_close, use gnome_dialog_run... - (reconfigure_clicked): And deal with removing the hash table - elements here. - (local_storage_new_folder_cb): Set the folder's name to the - displayName to i18nize correctly (after shell patch is applied). - -2001-08-30 Peter Williams - - * mail-local.c: Rewrite as a more complete CamelStore. - - * component-factory.c (create_folder): We can now chuck out most - of this function and just call mail_get_folder. - (xfer_folder_done): If we succeeded in moving the messages, now - delete the source folder as we should be. - (xfer_folder): In order to do so, create a new xfer_folder_data - struct that records the value of 'remove_source' Fix a leak by - unreffing the source folder. - - * mail-ops.[ch]: We no longer need the mail_new_folder operation. - - * folder-browser.[ch]: Don't need the 'reconfigure' member - anymore, because the loaded folder's URL doesn't change. - (do_message_selected): Don't check it - (on_right_click): Same. - (folder_browser_set_uri): Same. - (got_folder): Same. - -2001-08-31 Zbigniew Chyla - - * mail-vfolder.c (vfolder_create_storage): Marked string for - translation (with U_). - -2001-08-28 Zbigniew Chyla - - * message-list.c (e_mail_address_compare): Use g_utf8_collate - instead of g_strcasecmp for comparing names. - (subject_compare): Replaced g_strcasecmp, isspace, var++ with - UTF-8 counterparts. - -2001-08-30 Iain Holmes - - * importer/evolution-mbox-importer.c (load_file_fn): Check if it's - a folder, if so, create a folder. - (process_item_fn): If it was a folder created, just finish up - importing - -2001-08-29 Iain Holmes - - * importers/evolution-mbox-importer.c: Turn off debugging, remove - spewage. - (process_item_fn): Notify the importer if the folder isn't opened - or created yet. - (load_file_fn): Allow the function to continue if the folder is - being created. - -2001-08-30 Peter Williams - - Due to the introduction of mail_folder_cache_remove(), we can no - longer assume that mail_folder_info's always exist, so we need to - robustify a lot of this. - - * mail-folder-cache.c (folder_browser_destroyed): New - function. Called when the folder browser is destroyed -- analogous - to camel_folder_finalized. - (mail_folder_cache_note_fb): Hook it up here. - (struct _mail_folder_info): Add a member, mail_info_id, that - records the get_mail operation's id, so that we can cancel it if - we need to. - (get_folder_info): Initialize it here. - (get_mail_info_reply): Clear it here. - (mail_folder_cache_remove_folder): If necessary, cancel it here. - (mail_folder_cache_note_folder): Check it here before starting a - new operation, just in case. - (update_message_counts_main): Take a URI instead of a - mail_folder_info *, in case the MFI has gotten destroyed. - (update_message_counts): Take a quark of the URI instead of a - mail_folder_info *, for the same reason. We use a quark instead of - an allocated gchar * because figuring out when to free the string - gets tricky. Then go from quark -> URI string -> MFI. Return if - the folder is no longer valid, because this indicates that the MFI - was removed before this signal got called. Pass a string to - update_message_counts_main instead of an MFI. - (camel_folder_finalized): Don't bother unhooking the signals here. - Same change as above, but don't bother checking for a valid folder - because we're about to make it invalid anyway. - (message_list_built): Analogous to the above, except with the - FolderBrowser instead of the CamelFolder. - (selection_changed): As above. - (folder_browser_destroyed): As above. - (struct get_mail_info_msg): Instead of taking a mail_folder_info - *, take a URI, for reasons explained above. - (get_mail_info_receive): Go from URI -> MFI before doing anything. - (get_mail_info_reply): Same. - (get_mail_info_destroy): Free the URI. - (get_mail_info): Take a URI and return the message id so that it - can be cancelled if necessary. - (mail_folder_cache_remove_folder): Disconnect from signals and - events before removing. - (mail_folder_cache_note_folder): Use a GQuark instead of the - mail_folder_info * as the user_data. - (mail_folder_cache_note_fb): Same. - (mail_folder_cache_note_folderinfo): Little formatting change. - -2001-08-30 Jeffrey Stedfast - - * message-browser.c (message_browser_message_loaded): Fixed a - memory leak. - (message_browser_new): Added a comment as to why , after - reparenting, we do not unref the mail_display. - (message_browser_destroy): Don't call gtk_widget_destroy() on the - message_list here. - -2001-08-30 Peter Williams - - * mail-ops.c (remove_folder_get): Instead of removing the folder - from the folder cache here... - (remove_folder_got): ... do it here, in the main thread. - -2001-08-29 Jon Trowbridge - - * mail-callbacks.c (composer_get_message): When calling - e_msg_composer_get_message, pass in TRUE for the 'sending' arg. - (Part of the fix for bug #8332) - -2001-08-29 Peter Williams - - * folder-browser-ui.c: Fix the pixmap for /commands/MessageUndelete. - - * component-factory.c (owner_set_cb): Toss in a call to - mail_config_init () cause it might contribute to solving - bug 4911, and it won't hurt. - -2001-08-28 Peter Williams - - * component-factory.c (owner_unset_cb): Disable interaction once - the shell has quit. - (create_view): Instead of - folder_browser_factory_new_control ("", corba_shell) when looking - at a mailstorage folder, use create_noselect_control(). - -2001-08-27 Ettore Perazzoli - - * mail-local.c: Match the studlyCapsification of - shell/Evolution*.idl. - - * mail-config-druid.h: Change type of `event_source' from - `Bonobo_EventSource *' to `Bonobo_EventSource'. - - * mail-accounts.c (mail_delete): Remove unused local variable - `label'. - - * folder-info.c (do_get_info): `#if 0' unused variables. - -2001-08-27 Jon Trowbridge - - * mail-callbacks.c (mail_generate_reply): Check if we are trying - to reply to a message with no From: field, and try to do something - graceful in that case. (Bug #7028) - - * mail-display.c (ebook_callback): Add paranoid checks for the - case of a message with a From: field. (Also maybe bug #7028) - -2001-08-27 Iain Holmes - - * mail-config-druid.c (druid_finish): Free the list and hash table. - (druid_cancel): Free the list and hash table. - -2001-08-27 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_new): Set the source and - transport description labels. - (transport_type_changed): Set the transport description label. - (source_type_changed): Set the source description label. - - * mail-tools.c (mail_tool_make_message_attachment): Remove - X-Evolution* headers. - (mail_tool_remove_xevolution_headers): New function to convenience - removing the X-Evolution headers. - (mail_tool_restore_xevolution_headers): New convenience function - to restore the X-Evolution headers. - (mail_tool_destroy_xevolution): New function to cleanup the - structure. - (mail_tool_forward_message): Remove and restore the X-Evolution - headers here too. - -2001-08-26 Jeffrey Stedfast - - * mail-send-recv.c (receive_update_got_store): If the store is not - connected, scan it's subfolders first. - - * mail-ops.c (report_status): Call va_end() so LinuxPPC doesn't - have a caniption. - -2001-08-24 Jeffrey Stedfast - - * mail-display.c (launch_cb): Use the new e_mkdtemp function. - - * folder-browser.c (message_list_drag_data_get): Use the new - e_mkdtemp function. - -2001-08-24 Ettore Perazzoli - - [Fix #8024, Empty strings marked for translation.] - - * component-factory.c: Don't mark empty strings for translation. - Rather, give descriptions and display names to types "mailstorage" - and "vtrash". - -2001-08-24 Peter Williams - - * mail-ops.c (remove_folder_get): Save the folder's full_name, - unref it, and *then* unref the store, so that the folder has been - closed before it gets deleted. - -2001-08-24 Peter Williams - - * mail-config.c (add_shortcut_entry): Instead of using the length - of the shortcuts list as the index for the shortcut, use -1, which - means "last". - - * mail-config-druid.c (druid_finish): Remove the account adding - stuff since that happens in wizard_finish now. - - * mail-config.c (add_new_storage): New function. Add a - MailConfigAccount to the shell as a storage. - (maybe_add_shortcut): Renamed to new_source_created. - (new_source_created): Call add_new_storage here. - - * component-factory.c (mail_remove_storage_by_uri): Don't warn if - the storage isn't remote... no point in making the caller do extra - work. - -2001-08-24 Jeffrey Stedfast - - * mail-config.c (mail_config_set_thread_list): Don't let the uri - be an empty string (how the fuck is this even happening in the - first place??). - (mail_config_get_thread_list): Same. - (mail_config_set_show_preview): And here. - (mail_config_get_show_preview): And finally here. - -2001-08-23 Larry Ewing - - * mail-search.c (mail_search_construct): attach to the destroy - handler to reset the tokenizer. - (dialog_destroy_cb): reset the tokenizer here so that destroying - the dialog with the window manager still clears the hilighted - items. - -2001-08-23 Peter Williams - - * mail-account-gui.c (mail_account_gui_save): Eek, let the user create - new accounts if old_account == NULL. - -2001-08-23 Jeffrey Stedfast - - * component-factory.c (destination_folder_handle_drop): Check to - make sure we actually have drag data. - - * folder-browser.c (message_list_drag_data_received): Check to - make sure we have valid data. - -2001-08-21 Christopher James Lahey - - * Revert fix for Ximian bug #6995. - -2001-08-23 Peter Williams - - * mail-folder-cache.c (maybe_update): Record the timeout_id so we - can cancel it if the mail_folder_info is later freed. Also obviates - the use of the _UPDATE_QUEUED flag. - (mail_folder_cache_remove_folder): Cancel the timeout if we need to. - Lock around the hash table operations. Free mfi itself. Add debugging - spew. - (get_folder_info): Initialiae the timeout_id to 0. - -2001-08-22 Jon Trowbridge - - * mail-callbacks.c (ask_confirm_for_only_bcc): Provide alternative - text for this dialog for the case when a message has only Bcc - recipients because of a hidden contact list's addresses being - moved from To/Cc to Bcc. - (composer_get_message): Try to detect when our message has only - Bcc recipients because of moving addresses around due to a hidden - contact list, and show the dialog with the revised wording in this - case. - -2001-08-22 Jeffrey Stedfast - - * component-factory.c (create_view): Don't blindly make all vtrash - folder types have a uri of vtrash:file:/, instead only make it use - vtrash:file:/ if it's a file: uri, else use physical_uri. - -2001-08-22 jacob berkman - - * mail-display.c: rework how the e-card-popup thing has its life - managed. we now hide the window on the Hide event and destroy it - on the Destroy event emitted from its event source - -2001-08-22 Peter Williams - - * mail-send-recv.c (set_send_status): We don't need to escape this - for printf'ing. - -2001-08-22 Peter Williams - - Prevent the user from creating two accounts with the same name. - - * mail-config.c (impl_GNOME_Evolution_MailConfig_addAccount): - Abort if the account has the same name as another account. - - * mail-account-gui.c (mail_account_gui_save): Don't let the user - save if the account has the same name as another account. - - * mail-config-druid.c (management_check): Disable the next button - if the account name is the same as a preexisting account. - (construct): The only part of 'pages' that was being used was the - name. 'wizard_pages' now has the callbacks, while 'pages' is just - an array of char *'s. - (wizard_finish_cb): Save the account first because that's the - right way, and try to honor mail_account_gui_save's return value. - - * mail-config.glade: Add a label noting that you're not allowed to - create two accounts with the same name. - -2001-08-22 Peter Williams - - * folder-browser-ui.c (fbui_sensitize_timeout): Check for NULL uic - here as well. - (fbui_sensitize_items): Up the timeout interval to 110 ms. - -2001-08-21 Peter Williams - - * mail-account-editor.c (apply_changes): Honor the return value of - mail_account_gui_save. - - * mail-ops.c (sync_folder_desc): Say which folder is getting - saved. - -2001-08-21 Dan Winship - - * mail-identify.c (mail_identify_mime_part): Don't trust gnome-vfs - when it says "text/plain" if gnome_vfs_mime_type_from_name says - something different. Fixes a problem with recognizing icalendar - attachments labeled "application/octet-stream". Also, don't bother - asking gnome-vfs about winmail.dat attachments, since it will - often claim that they're MPEGs due to some mis-magic. - -2001-08-21 Jeffrey Stedfast - - * mail-session.c (mail_session_forget_password): zero-ize the - password before freeing. - (forget_password): Same. - -2001-08-21 Peter Williams - - * message-list.c (message_list_set_folder): Don't sink the extras - since _set_folder can get called more than once (on reconfigure.) - (message_list_destroy): So just unref the extras here. - - * mail-send-recv.c (build_dialogue): Treat the spool provider like - IMAP: update instead of performing an explicit receive. - -2001-08-21 Peter Williams - - * folder-browser-ui.c (fbui_sensitize_items): Rename to - fbui_real_sensitize_items. Now we queue a change and set up a - timeout, making sure weed out redundant changes, fixing flicker. - (fbui_sensitize_timeout): New function. The timeout. - (fbui_real_sensitize_items): Semi-new function. Rename of old - fbui_sensitize_items. - (folder_browser_ui_set_selection_state): Pass the FB instead of - only the UIC to sensitize_items. - (folder_browser_ui_message_loaded): Same. - - * folder-browser.c (folder_browser_destroy): Kill the new timeout - if it is registered. - - * folder-browser.h: Add some members to FolderBrowser for keeping - track of the queue of changes. - -2001-08-20 Iain Holmes - - * mail-config.druid: Fix the jumping around. - -2001-08-20 Peter Williams - - * mail-ops.c (remove_folder_get): Fix double-unref of the store. - -2001-08-20 Jeffrey Stedfast - - * component-factory.c (create_folder): Modify the url and set the - protocol to mbox rather than hacking it and prepending mbox: to - the uri. - - * mail-local.c (get_folder): Don't prepend the folder_name with - the store's path because the hash key is folder_name, not - /folder_name. - -2001-08-20 Iain Holmes - - * mail-config-druid.c: Change some of the text labels. - (create_label): Make a label instead of a GtkHTML widget. - -2001-08-18 Iain Holmes - - * mail-account-gui.c (mail_account_gui_setup): Stop hiding the source - and transport frames. - -2001-08-20 Ettore Perazzoli - - * folder-browser-ui.c (folder_browser_setup_property_menu): - Updated as ChangeFolderProperties is now in the - ComponentPlaceholder. - -2001-08-20 Peter Williams - - * mail-accounts.c (mail_able): Whoops, make sure that the account - has a source before removing it or what-have-you. - - * subscribe-dialog.c: Add a few comments. - -2001-08-20 Damon Chaplin - - * folder-browser-ui.c: use new small trash icon for Delete command. - -2001-08-20 Ettore Perazzoli - - * mail-ops.c (sync_folder_desc): s/Synchronising/Synchronizing/. - -2001-08-20 Jeffrey Stedfast - - * component-factory.c (storage_create_folder): - camel_folder_create_folder can now return a heirachial tree so - subscribe to down the tree. - -2001-08-20 Damon Chaplin - - * folder-browser-ui.c: use new Cut/Copy/Paste icons. - -2001-08-19 Ettore Perazzoli - - * component-factory.c: Update the folder list to include a display - name and a description. - -2001-08-19 Jeffrey Stedfast - - * mail-mt.c (do_op_status): Allow the activity to be NULL if there - isn't a global_shell_client so that we don't try and report status - updates when the shell is destroyed. - - * mail-config.c (add_shortcut_entry): Return if there isn't a - global_shell_client. - - * component-factory.c (owner_set_cb): set the global_shell_client - here and connect to the destroy signal. - - * mail-vfolder.c (vfolder_create_storage): Use an extern - global_shell_client. - -2001-08-19 Christopher James Lahey - - * mail-callbacks.c (delete_msg): Made delete make the cursor go - backwards if the user is sorting by descending date. Fixes Ximian - bug #6995. (Reverted.) - -2001-08-19 Jeffrey Stedfast - - Note: The following changes were based on Zbigniew Chyla's fixes. - - * mail-callbacks.c (mail_generate_reply): Convert the date string - to UTF-8. - (do_forward_non_attached): Same here. - -2001-08-05 Zbigniew Chyla - - * folder-info.c: Added missing #include . (applied by Damon) - -2001-08-18 Jeffrey Stedfast - - * mail-config.c (config_read): Change the default values for - "always-sign" to false. - - * mail-callbacks.c (open_msg): if the folder is Outbox, let the - user edit the message(s) too I guess. - -2001-08-18 Ettore Perazzoli - - * folder-browser-ui.c: Hook the new `delete-message.png' up. - -2001-08-17 Damon Chaplin - - * mail-display.c (pixmap_press): stop signal emission so the GtkButton - class method doesn't mess up the popup menu. Hopefully fixes bug #1828. - -2001-08-17 Zbigniew Chyla - - * mail-search.c (mail_search_construct): Put _() instead of N_() - around of the "Search" string, gnome_dialog_constructv doesn't - translate button names. - -2001-08-17 Jeffrey Stedfast - - * mail-format.c (mail_write_authenticity): We want wax-seal.png - instead, since I added the png files to cvs and renamed it to - wax-seal.png. - -2001-08-17 Iain Holmes - - * importers/evolution-mbox-importer.c (load_file_fn): Fix - warnings. - -2001-08-17 JP Rosevear - - * component-factory.c (owner_set_cb): don't init the config here - - * main.c (main): init the config here - -2001-08-17 JP Rosevear - - * mail-config-druid.c: remove dead structure - -2001-08-17 Jeffrey Stedfast - - * mail-config.c (mail_config_write): Save the always-sign options - for pgp and smime. - (config_read): Read in the always-save options for pgp and smime. - -2001-08-17 Christopher James Lahey - - * message-list.etspec: Made the default values for column - expansions here more reasonable. - -2001-08-16 Iain Holmes - - * GNOME_Evolution_Mail.oaf.in: Add the Wizard stuff. - - * component-factory.c (component_fn): Init the Wizard factory. - (mail_load_storages): Check service isn't NULL before it's been - dereferenced. - - * mail-account-gui.c (mail_account_gui_setup): Only show the top level - widget is it's not NULL. - Change the gtk_widget_set_usizes to gtk_widget_hides. - - * mail-config-druid.c: Rewrite to use the EvolutionWizard stuff. - - * mail-config-druid.h: Add stuff to the MailConfigDruid struct. - - * mail-config.c (mail_config_get_default_account): Init the config if - it's not been inited. - -2001-08-16 Jason Leach - - * mail-tools.c (mail_tool_quote_message): Only starting cutting - the signature out when we match "-- \n", so "--\n" in the middle - of a mail won't omit the rest for a quoted reply. Bug #7454. - -2001-08-16 Jeffrey Stedfast - - * mail-callbacks.c (confirm_expunge): Respect the user's desire to - be prompted to confirm that he wants to expunge the blasted - folder. Also, don't set the usize - that's just an evil hack and - you may find it will cut off text once the label has been - translated. - (create_msg_composer): In order for the security options to be - checked when composing a new message, we must set the from account - explicitly even though the composer hdrs sets the default from - account and emits the signal because at that stage the composer - hasn't yet connected to the signals and thus the bonobo menu items - don't get set. - - * mail-config.c (mail_config_set_confirm_expunge): New. - (mail_config_get_confirm_expunge): New. - -2001-08-16 Peter Williams - - * subscribe-dialog.c (fe_got_children): Sort the nodes here... - (fe_sort_folder): ... using this function. - - * folder-browser-ui.c (folder_browser_ui_message_loaded): Check - for uic == NULL. I'm not sure how this could happen, but... - -2001-08-16 Peter Williams - - * folder-browser-ui.c (folder_browser_ui_set_selection_state): - Disable "Search Message" when more or less than exactly one - message is selected. - - * subscribe-dialog.c (fe_done_subscribing): Instead of hackfully - getting the path, use a CamelURL so that escaping is - handled. Silly me. -- See below -- - (fe_node_to_shell_path): Use node->name and node->full_name to - generate the the shell path of this item. Don't need to escape the - URL, and handle cases when dir_sep != '/' - (fe_done_subscribing): Use fe_node_to_shell_path instead of the - CamelURL. Third time's the charm... * folder-browser-ui.c - (folder_browser_ui_set_selection_state): Disable "Search Message" - when more or less than exactly one message is selected. - - * subscribe-dialog.c (fe_done_subscribing): Instead of hackfully - getting the path, use a CamelURL so that escaping is - handled. Silly me. -- See below -- - (fe_node_to_shell_path): Use node->name and node->full_name to - generate the the shell path of this item. Don't need to escape the - URL, and handle cases when dir_sep != '/' - (fe_done_subscribing): Use fe_node_to_shell_path instead of the - CamelURL. Third time's the charm... - -2001-08-15 Jeffrey Stedfast - - * mail-display.c (save_part): Remember the filename is in utf8, so - use the e_utf8 functions to set the filename in the file selection - dialog. - -2001-08-15 Peter Williams - - * message-list.c (on_cursor_activated_idle): Always remove the - idle and return FALSE, instead of returning TRUE if more than one - message is selected. - -2001-08-15 Jason Leach - - * mail-tools.c (mail_tool_quote_message): Stop building the quote - after a sigdash, hence, omitting the signature from a - reply/forward. Bug #5529. - -2001-08-15 Anna Marie Dirks - - * mail-callbacks.c (expunge-folders): Re-added, at Ettore's - request, the confirm-expunge dialog. - -2001-08-15 Jason Leach - - * message-list.c (message_list_init): Use ALWAYS for scroll frame - policy because ETable acts lame with AUTOMATIC. Bug #6925. - -2001-08-16 Not Zed - - * mail-callbacks.c (expunge_folder): Don't confirm expunge. - -2001-08-15 Not Zed - - * mail-local.c (register_folder_register): Remove operation - registration/etc. Handled by mail-mt.c - - * message-list.c (regen_list_regen): Remove camel operation - registration/etc. - -2001-08-14 Jeffrey Stedfast - - * mail-accounts.c (load_accounts): Convert the UTF-8 account name - string into a gtk-string before using it in the GtkCList. - -2001-08-14 Peter Williams - - * mail-callbacks.c (previous_unread_msg): Make previous unread - wrap around too. - - * mail-accounts.c (load_accounts): If the account is enabled, - set a checkmark pixmap instead of a strange plus sign. - (mail_accounts_dialog_init): Load the pixmap here. - (mail_accounts_dialog_finalise): Free it here. - - * mail-accounts.h: Prototype it here. - -2001-08-14 Dan Winship - - * folder-browser.c (message_list_drag_data_get): Fix the fix for - #6722. - - * mail-ops.c (save_messages_save): Likewise. - (save_part_save): Deal with the possibility that - camel_mime_filter_charset_new_convert will return NULL (bad - charset name). Fixes #6611. - -2001-08-13 Jon Trowbridge - - * mail-search.c (mail_search_construct): Disable the "search - forward/backward" option in the search dialog. Why? Well, it - doesn't work properly (bug #4869), and the reason it doesn't work - is because of some scary stuff deep inside of gtkhtml that I don't - understand at all. So since I'm paranoid, and since the GUI - freeze is tomorrow, and since it isn't really an important feature - at all, I'm #if 0-ing it out. If the gtkhtml stuff gets sorted - out, we can slip it back in for 1.1. - -2001-08-13 Peter Williams - - * component-factory.c (user_create_new_item_cb): New function, - handle "user creatable items". - (component_fn): Tell the shell that we're capable of creating - mail messages. - -2001-08-13 Jason Leach - - * mail-local.c (get_folder): Fix this so it can actually get - folders from the hash of folders on the local store (it was - looking up plain @folder_name, which is typically "mbox", instead - of the full URI, /home/jleach/evolution/local/Foo/mbox). - - * component-factory.c (do_remove_folder): Rename to - remove_folder_done, more fitting for it's purpose. - (do_xfer_folder): Similar name change. - (do_create_folder): Similar name change. - (remove_folder): Don't notifyResult for the component here, we - will notify with our result in remove_folder_done. - (xfer_folder): Ditto. - - * mail-vfolder.c (vfolder_refresh): Create new folders with unread - counts of "0" instead of #FALSE (which just happens to be #defined - as zero). - -2001-08-13 Peter Williams - - * mail-send-recv.c (mail_autoreceive_setup): Break most of the - functionality into a separate function. - (autoreceive_setup_list): Rename of mail_autoreceive_setup that is - passed a list of accounts. - (mail_autoreceive_setup_account): New function. Set up a single - account using autoreceive_setup_account. - - * mail-send-receive.h: Prototype mail_autoreceive_setup_account. - - * mail-account-gui.c (mail_account_gui_save): Instead of setting - up all accounts, set up only this source with the new - mail_autoreceive_setup_account. - - * mail-config-druid.c (druid_finish): ... which means we can call - mail_config_add_account() after the MailConfigAccount has been - created by mail_account_gui_save() because we no longer need the - account to be in the list for mail_autoreceive_setup() - - * mail-config.c (mail_config_add_account): ... which means we can - possibly add a shortcut to the account's sources's Inbox here. - (maybe_add_shortcut): New function. If the store is a storage, add - a shortcut to its inbox. Hope that /INBOX exists. - (add_shortcut_entry): New function. Creates a shortcut if it doesn't - yet exist. - -2001-08-13 Peter Williams - - * mail-account-gui.c (service_complete): Take account of the fact that - service->path may be NULL (if service is a transport.) - - * mail-config-druid.c (druid_finish): Bleah, bugfix in case the - account has no source. - -2001-08-13 Anna Marie Dirks - - * mail-config.glade: Changed all instances of "Wizard" and "Druid" - to "Assistant". - - * mail-config-druid.c: Ditto. - -2001-08-13 Anna Marie Dirks - - * mail-accounts.c: Changed the title of the Mail Settings - dialog from "Evolution Account Manager" to "Mail Settings" . - -2001-08-13 Jeffrey Stedfast - - * message-list.c (get_message_uid): Do some g_assert() - action. Make sure that the node passed in is non-NULL and also - make sure that the CamelMessageInfo gotten from the ETree is - non-NULL. - (get_message_info): Same here. - - * mail-callbacks.c (expunge_folder): Confirm that the user really - wants to expunge. - (save_msg_ok): Set the parent window here. - -2001-08-13 Peter Williams - - * mail-config.c (remove_account_shortcuts): Remove the shortcuts - corresponding to an account (they all point to - evolution:/accountname/..) - (mail_config_remove_account): When deleting the account, remove - its shortcuts. - -2001-08-10 Peter Williams - - * mail-config-druid.c (druid_finish): Whoa, fatal typo. Sorry. - -2001-08-13 Jason Leach - - * mail-local.c (init_trash): Tell folder cache the path for our - Trash is /Trash, because that's what Shell needs to hear for - updating folders. - -2001-08-11 Jason Leach - - * mail-offline-handler.c (impl_goOnline): Set the session as - online so auto mail checking (and the composer) will be doing the - right things when you go online. Bug #6343 and #4601. - - * folder-browser.c: Make the right click "Resend..." into "Edit as - New Message...", bug #6838. - - * mail-accounts.h: Remove unecessary #include - - * mail.h: Removed a prototype for a non-existant - mail_view_create(). - -2001-08-10 Jeffrey Stedfast - - * mail-account-gui.c (build_auth_menu): Fix bug #4523 for good. - (save_service): If service->authitem is NULL, then the user tried - to enable authentication but the provider doesn't actually support - it. - -2001-08-10 Jon Trowbridge - - * folder-browser.c: Set our ESearchBarItems subitems to NULL. - -2001-08-10 Jeffrey Stedfast - - * mail-callbacks.c (transfer_msg): Prepend the uri with evolution: - to fix bug #6916. - -2001-08-10 Jason Leach - - * folder-browser.c: Make the context menu for the Sent folder have - "Resend..." instead of "Resend", to clarify that it will bring up - a dialog needing your input rather than just blindly sending the - message again. Also give it the 'e' accelerator. Bug #6838. - - * mail-callbacks.c (next_unread_msg): Since 'N' keypresses go - through here now, use wrap-around selecting. - (previous_unread_msg): Same for 'P' here. - - * message-list.c (on_cursor_activated_idle): Stop this idle timer - when we have multiple items selected, this keeps it from loading - and then marking the last item in your selection list as read. - Bug #4693. - -2001-08-10 Peter Williams - - * mail-accounts.c (mail_delete): Don't remove the account from the - tree if it's not enabled. - -2001-08-10 Jason Leach - - * mail-ops.c (remove_folder_get): Remove all the messages from a - folder that's being deleted before actually doing the - camel_store_delete_folder, so it won't leave behind an mbox file - that's going to prevent the actual directory from being deleted, - and strange effects like new folders with the same name being made - in it's place. Bug #5618. - - * mail-folder-cache.c (mail_folder_cache_remove_folder): New - function, a way to get something out of the folder cache, like - folders being deleted. Bug #6878. - -2001-08-10 Peter Williams - - * mail-accounts.c (news_add_destroyed): Whoops, compile fix. - -2001-08-10 Jason Leach - - * mail-callbacks.c (mark_as_unseen): If marking messages as - unread, remove the automatic mark-as-read timer. Bug #4153. - -2001-08-08 Peter Williams - - * component-factory.c (mail_load_storages): Don't load the storage - if it isn't enabled. - (mail_remove_storage_by_uri): New function. Goes through the - gymnastics of getting a CamelStore from the URI and calling - mail_remove_storage. Copied from mail_delete(). - (mail_load_storage_by_uri): Break out the storage-loading part of - mail_load_storages into a single function. - (mail_load_storages): Just call mail_load_storage_by_uri several - times. - - * mail.h: Prototype our new _by_uri functions. - - * mail-accounts.c (news_add_destroyed): Instead of hacking around - mail_load_storages, call mail_load_storage_by_uri. - (mail_delete): Move this chunk of code into - mail_remove_storage_by_uri. - (mail_able): Add or remove the storage as necessary, with our - new _by_uri functions. - - * mail-config-druid.c (druid_finish): See news_add_destroyed above. - -2001-08-10 Jeffrey Stedfast - - * mail-config.c (mail_config_get_show_preview): Free dbkey if we - don't use it. - - * folder-browser.c (on_right_click): Added a comment about leaking - memory here, but we seem to not even use the 2 strings we - strdup...is this code still under construction? - - * mail-ops.c (mail_send_message): Free the sent_folder_uri at the - bottom of the function (ironically enough we were freeing it if we - encountered an error but never free'd it on success :-) - (get_folderinfo_got): Fixed a memory leak...this one would have - gone away once we got rid of the debug g_warning though. - -2001-08-10 Not Zed - - * mail-ops.c (mail_transfer_messages): Dont want it to keep on - running if it got bad arguments, want it to bloody well crash. - (mail_append_mail): Same here. - -2001-08-09 Jeffrey Stedfast - - * message-list.c (mlfe_callback): Added a g_assert_not_reached() - - I'm hoping this will help us track down the "can't delete message - sometimes" (ie bug #6637 and friends) bugs that users have been - reporting. If herein lies the problem, then we can expect some - crashes and some good backtraces, hopefully. - -2001-08-09 Peter Williams - - * folder-browser.c (on_key_press): The bonobo menu items now - handle 'n' and 'p'. - (on_key_press): 'q' as well. - - * message-list.c (message_list_select): Fix inline documentation. - -2001-08-09 Anna Marie Dirks - - Fixes bug #6918 - - * folder-browser.c: Changed the "Store search as vFolder" menu - item to "Create vFolder from Search". - -2001-08-09 Jeffrey Stedfast - - Fixes bug #6722 - - * mail-ops.c (save_messages_save): Don't set the default perms - here, let the user's umask deal with permissions. - - * folder-browser.c (message_list_drag_data_get): Don't set any - default perms. - -2001-08-09 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_save): Save the pgp and - smime always-sign options. - - * mail-config.c (account_copy): Copy the always-sign options over - too. - -2001-08-08 Not Zed - - * mail-ops.c (send_mail_send): Dont double-register this - operation, mail-mt will do it for us. - (get_folderinfo_get): " - (get_folder_get): " - (get_store_get): " - (create_folder_get): " - (remove_folder_get): " - (sync_folder_sync): " - (get_message_get): " - - * message-list.c (message_list_setup_etree): Free the etstate - object after we're done using it. - -2001-08-08 Peter Williams - - * subscribe-dialog.c (sc_selection_changed): New function. Set the - sensitivity of the subscribe buttons based on whether any folders - are selected. - (menu_item_selected): If getting the widget for the first time, - hook up sc_selection_changed. - -2001-08-08 Peter Williams - - * mail-ops.c (mail_update_subfolders): Change this gtk_object_ref - on the storage to a bonobo_object_ref. - - * component-factory.c (mail_lookup_storage): And here. - - * mail-vfolder.c (mail_vfolder_get_vfolder_storage): And here. - -2001-08-07 Ettore Perazzoli - - * message-browser.c (set_bonobo_ui): Remove the "Customize - Toolbar" thing. - -2001-08-07 Not Zed - - * mail-config.c (mail_config_get_thread_list): Free the dbkey if - we found the config option. - - * mail-send-recv.c (build_dialogue): Free the pretty_url after - we've used it. - (free_send_info): Free the 'what' string. - (receive_done): Use free_send_info to make sure we free - everything. - - * mail-ops.c (send_queue_free): Unref the filter driver when done. - (send_queue_send): Unref the driver here too, force any long - taking operations to run in our thread. - -2001-08-07 Peter Williams - - * Revert Jeff's changes to subscribe-dialog.[ch]. It's not a widget, - it's an object from which you can obtain a widget. - -2001-08-07 Jeffrey Stedfast - - * mail-callbacks.c (manage_subscriptions): Hide the app->window. - (do_mail_print): Set the parent of the gnome-dialog to be the - folder-browser so that when evolution is closed, the print dialog - gets destroyed. Should fix bug #4781. - - * subscribe-dialog.c (subscribe_dialog_new): This should return a - GtkWidget not a GtkObject. - - * mail-session.c (get_filter_driver): Update to use user's logging - preferences. - - * mail-accounts.c (filter_log_toggled): New. - (filter_log_path_changed): New. - (construct): Get and attach signals to the filter logging option - widgets. - - * mail-config.c (config_read): Read in filter logging options. - (mail_config_write_on_exit): Save filter logging options. - (mail_config_set_filter_log_path): Implemented. - (mail_config_get_filter_log_path): Implemented. - (mail_config_set_filter_log): Implemented. - (mail_config_get_filter_log): Implemented. - -2001-08-07 Peter Williams - - * subscribe-dialog.c (folder_etree_construct): Move - fe_create_root_node farther down, so we can check for its children - without problems. - - * mail-callbacks.c (folder_created): Use bonobo_object_unref on - the storage since it's a bonobo object. - (mail_storage_create_folder): Same. - (folder_deleted): Same. - - * mail-send-recv.c (receive_update_got_store): Same. - - * mail-ops.c (do_update_subfolders): Same. - - * subscribe-dialog.c (fe_destroy): Unref the e_storage since - lookup_store gives us a ref. - -2001-08-07 Peter Williams - - * subscribe-dialog.c (folder_etree_construct): Move - fe_create_root_node farther down, so we can check for its children - without problems. - (storage_tree_path): Removed, this was broken. - (subscribe_get_short_folderinfo): Use the queued thread instead of - the new thread. - (subscribe_do_subscribe_folder): Same. - (ftree_node_new_root): Don't create the path anymore; it was - broken and there's a better way to get it now. - (fe_got_children): Remove some debugging output. - (fe_check_for_children): Here too. - (fe_done_subscribing): Get the path from the URI instead of the - ftree_node. - (_SubscribeDialogPrivate): Add all of our useful widgets as - members. - (sc_refresh_pressed): Don't clear the search... that makes no - sense now. - (sc_search_activated): Don't set the filter radio button as active - now; we use sensitivity instead. - (sc_all_toggled): Make the search entry insensitive. - (sc_filter_toggled): Make the search entry sensitive. - (kill_default_view): New function. Gets rid of the default view - stuff and makes all the widgetry sensitive. - (menu_item_selected): Check if we moved off of the default view - and, if so, call kill_default_view(). - (subscribe_dialog_construct): Initialize our new private widget - members, and by default insensitize most of the buttons because - they make no sense in the default view. - -2001-08-06 Jeffrey Stedfast - - * mail-config.glade: Added key accelerators to a bunch of the - config options and moved the Bcc and empty-subject checkboxes to - the composer tab where they belong. - - * mail-callbacks.c (providers_config): Raise the dialog if it - exists already. - (manage_subscriptions): Raise the dialog if it already exists. - (main_select_first_unread): Removed (we haven't needed this code - in ages). - (select_first_unread): Same. - (save_msg_ok): If the path is empty, just return. - - * mail-local.c (mail_local_reconfigure_folder): Raise the dialog - if it already exists. - -2001-08-06 Jeffrey Stedfast - - * mail-callbacks.c (expunge_folder): Set the message-display - message to NULL if we can't get an info too. - -2001-08-06 Jason Leach - - * mail-callbacks.c (create_folders): Make vtrash folders on other - storages with a "vtrash" type, so they get the little trashcan - icon. - -2001-08-06 Peter Williams - - * subscribe-dialog.[ch]: Reimplement to be asynchronous and pretty, - with progressive folder loading and all sorts of wonderful - improvements. - - * mail-callbacks.c (manage_subscriptions): Change to reflect API - update. - - * Makefile.am (etspec_DATA): Add subscribe-dialog.etspec. - (glade_DATA): And the glade file. - - * subscribe-dialog.etspec: New file, break out the specification - from inside the subscribe-dialog.c - - * subscribe-dialog.glade: Update this, actually use it now. - -2001-08-06 Jeffrey Stedfast - - * mail-callbacks.c (empty_trash): Yuck. Special case whether or - not we want to expunge all the trash folders syncronously or - asyncronously based on whether or not we are doing Empty-On-Exit - or emptying trash by user request respectively. - -2001-08-06 Jason Leach - - * mail-folder-cache.c (make_folder_name): Removed this function, - it's not needed anymore. - (mail_folder_cache_note_folderinfo): Initialize mfi->unread to 0 - always, so the shell won't get sent a random int for vtrash or - potentially other folders. - - * message-list.c (message_list_select): Fix a minor glitch with - how it started a backwards wraparound at the 2nd to last message, - skipping the very last message. - -2001-08-06 Jeffrey Stedfast - - * mail-config.glade: s/character set/character encoding - -2001-08-05 Ettore Perazzoli - - * message-browser.c (message_browser_message_loaded): Make the - title of the window "subject - Message" instead of just "subject". - Also, display "(No subject)" if the subject is NULL. - - [Fix #6399, 8-bit characters are not displayed in window title.] - - * message-browser.c (message_browser_message_loaded): Convert the - subject from UTF-8 to GTK. - -2001-08-05 Ettore Perazzoli - - [Revert the previous changes, there seems to be something wrong - with it.] - - * component-factory.c (component_factory_init): Back to using - `bonobo_generic_factory_new()'. - (component_fn): Updated accordingly. - -2001-08-04 Ettore Perazzoli - - * component-factory.c (component_factory_init): Use - `e_bonobo_generic_factory_multi_display_new()' instead of just - `bonobo_generic_factory_new()'. - (component_fn): Added @component_id arg. - -2001-08-04 Jeffrey Stedfast - - * mail-format.c (mail_part_is_inline): Add yet another - special-case hack for application/pgp. - -2001-08-04 Jason Leach - - * message-list.c (message_list_select): Add a @wraparound - argument, so the 'n' and 'p' keypresses (or anything else that - wants to) can wrap around to find the next unread. - - * folder-browser.c (on_key_press): Tell it to wrap around here. - - * mail-callbacks.c (delete_msg): Don't wrap around here (or the - other callbacks in this file). - -2001-08-03 Jason Leach - - * mail-folder-cache.c (update_idle): Updates for EvolutionStorage - API changes. - - * mail-importer.c (mail_importer_create_folder): Ditto. - - * mail-local.c: Same here. - -2001-08-03 Jeffrey Stedfast - - * mail-account-gui.c (build_auth_menu): Try to restore the choice - the user had chosen before hitting the "Check Supported Types" - button. - - * mail-format.c (write_headers): Removed a no-longer-needed - g_warning. - -2001-08-03 Not Zed - - * mail-session.c (get_password): return the source url for - popb4smtp auth request. - -2001-08-02 Jon Trowbridge - - * mail-ops.c (filter_folder_describe): Added. Provide - description for filter_folder_op. - (fetch_mail_describe): Added. Provide description for - fetch_mail_op. - - * message-list.c (regen_list_describe): Added. Provide - description for regen_list_op. - - * mail-config.c (check_service_describe): Added. Provide - description for check_service_op. - - * folder-info.c (do_describe_info): Added. Provide description - for get_info_op. - -2001-08-02 Larry Ewing - - * mail-send-recv.c (format_url): handle null paths in the dialog - so that we avoid printing NULL strings - -2001-08-02 Jeffrey Stedfast - - * mail-callbacks.c (filter_edit): Raise the filter-editor window - if it's already created. - - * folder-browser.c (message_list_drag_data_received): I obviously - can't spell recieved, er, received...uh, yea. - -2001-08-02 Jason Leach - - * mail-config.glade: Set history_id's for the sig and html sig - gnome file entry boxes so it can persist history, also add titles - to the dialogs that popup when you click the "Browse..." button. - Bug #5595. - -2001-08-02 Jeffrey Stedfast - - * mail-vfolder.c (vfolder_create_storage): Connect to the - folder_remove signal on the storage. - (vfolder_remove): New function to remove a vfolder. - (vfolder_edit): Raise the window if it already exists. - -2001-08-02 Not Zed - - * Makefile.am (INCLUDES): Add EVOLUTION_BUTTONSDIR to get to some - different icons. - - * mail-ops.c (mail_sync_folder): Queue the folder sync operation, - rather than running it in parallel. - - * mail-send-recv.c: applies anna's patch for prettier send-recv - dialogue. - (parse_url): Renamed to format_url, fixed callers. - (format_url): Use camel_url_free instead of g_free, also handle - case where we have no host (use path instead). - (build_dialogue): Cleaned up some whitespace. - (build_dialogue): Create the label directly with the right text, - dont set any text in the progress bar, and save the label into the - info struct for later updating. - (struct _send_info): Added 'status' the label with the status - string. - (operation_status_timeout): - (receive_done): - (receive_cancel): Set the status label, not the progress format - text. - (hide_send_info): NULL out status too. - (mail_receive_uri): Init status. - (free_folder_info): Initiate a folder sync here, so we can ... - (free_send_data): ... Remove the awful hack of iterating through - bonobo controls to sync all open folders. - (free_send_data): Initiate a sync of the inbox too. - (build_dialogue): Remove set_alignment on the icon, its not a - gtkmisc object. - -2001-08-01 Jeffrey Stedfast - - * folder-browser.c (folder_browser_copy): Do the Right Thing (tm) - if the message list is not the widget in focus (which is to copy - the text selected in the html viewer instead). Fixes bug #5868. - -2001-08-01 Jason Leach - - * folder-browser-ui.c: Use the new Save As and Message Search - icons from Jakub. - - * mail-callbacks.c (delete_msg): Don't move cursors around when - deleting last message and Hide Deleted Messages isn't enabled. - Bug #5928. - -2001-07-31 Anna Marie Dirks - - * mail-mt.c (do_get_pass): Changed the title of this dialog - to "Enter Password". - -2001-07-30 Jeffrey Stedfast - - * mail-mt.c (do_get_pass): We are not guarenteed to have a - non-NULL service (ie. PGP) thus check for it. - (pass_got): And again here. - (mail_get_password): And of course here too. - - * mail-format.c (decode_pgp): When writing out a CamelException to - the HTML stream, be sure to translate it first. - (handle_message_external_body): Convert to UTF8 here too - I know - this function is basically a dead end right now but eventually we - will want to do something. I mostly did this because param values - are UTF8 encoded so we should avoid mixing and matching UTF with - non UTF8. - (format_mime_part): Avoid writing non-UTF8 to the HTML stream. - - * mail-tools.c (mail_tool_make_message_attachment): Convert - translated strings to UTF8 here too. - (mail_tool_forward_message): Here too. - -2001-07-23 Zbigniew Chyla - - * mail-format.c (attachment_header, write_address, decode_pgp, - mail_write_authenticity): - Convert translated strings to UTF8 before calling mail_html_write. - - I modified the patch slightly and cleaned up bits of code around - it as well. For example, we probably want to avoid having HTML - tags in the strings to be translated. -- fejj - -2001-07-30 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_new): Restore old security - settings from the saved configuration. Fixes bug #5710. - -2001-07-30 Not Zed - - * mail-session.c (do_register_timeout): Actually add the timeout, - this time in the gtk thread. - (do_remove_timeout): And same for remove. - (register_timeout): - (remove_timeout): Proxy the gtk calls to the main thread, and - wait for them to execute synchronously. - (register_timeout): Instead of return with fail for a too small - timeout, just increase the timeout. - -2001-07-27 Zbigniew Chyla - - * component-factory.c (populate_folder_context_menu): Added (unused) - table with strings intended to be translated (i18n tools can't extract - strings from XML data inside .c file). - -2001-07-27 Jeffrey Stedfast - - * mail-mt.c (focus_on_entry): Don't need this anymore. - (do_get_pass): Since we already have the entry widget, no need to - do the nasty focus_on_entry hack. - -2001-07-26 Peter Williams - - * mail-mt.c (do_get_pass): Figure out whether we're getting the - password for the source or the transport, and get the toggle - button accordingly. - (pass_got): Same. - - * mail-config.c (mail_config_get_account_by_transport_url): New - function. Cut + paste + search + replace of _by_source_url. - - * mail-config.h: Prototype here. - -2001-07-26 Jeffrey Stedfast - - * folder-browser.c (message_list_drag_data_get): If we don't have - any messages selected, break out. This fixes bug #5612. - - * component-factory.c (xfer_folder): Fixed a strstr (url, - "noselect=yes") brokenness. - (destination_folder_handle_motion): Same. - (destination_folder_handle_drop): And again here. - - * mail-format.c (handle_application_pgp): Implemented. - (setup_mime_tables): Setup the application/pgp handler to use - handle_application_pgp instead of handle_text_plain. - (handle_text_plain): Remove special-case hacks for application/pgp - types. - - * mail-config.glade: beautification. - -2001-07-26 Peter Williams - - * mail-mt.c (do_get_pass): Use magic to make the password - remembering checkbutton come after the entry, visually. - -2001-07-26 Jeffrey Stedfast - - * mail-format.c (write_headers): Respect Gtk theme colors for the - fonts and calculate a new table gbcolor based on gtk theme - preferences. - - * mail-config.glade: Label the enabled field. - -2001-07-26 Peter Williams - - * message-list.etspec: Make the date column smaller and the - subject column larger, relatively. - - * mail-folder-cache.c (make_folder_status): Don't display "0 - hidden". - - * folder-browser.c (on_key_press): Make 'q' a toggle, not one-way. - - * message-list.etspec: Rename "Date" column to "Sent". - -2001-07-25 Anna Marie Dirks - - * mail-config.glade: fixed a mis-spelling of "Fashion" in the mail - accounts window. (See bug 5433) - -2001-07-25 Jeffrey Stedfast - - * mail-session.c (make_key): Don't make the key url:item if we - have the url, just make it url. This fixes bug #5339. - (mail_session_set_password): Removed. - -2001-07-25 Peter Williams - - * folder-browser.c (etree_key): Make it so Enter always opens the - message in another window. - -2001-07-25 Peter Williams - - * mail-mt.c (mail_get_password): Now take a CamelService parameter - (as passed by Camel). Allows us to have a "remember password" - checkbox that is set correctly and whose settings can be - propagated back to the proper MailConfigService. - (do_get_pass): Add a checkbutton allowing the user to change - whether the password is remembered or not. - (pass_got): Apply the setting of the "remember password" - checkbutton (if not cancelled.) - - * mail-mt.h: Update the prototype here. - - * mail-config.c (mail_config_service_set_save_passwd): New - function, pretty bland. - - * mail-config.h: Prototype our bland new function. (Get it? It's a - pun!) - - * mail-session.c (get_password): Pass the service as well. - -2001-07-25 Jeffrey Stedfast - - * mail-account-gui.c (build_auth_menu): Now takes a - check_supported gboolean argument saying whether or not to disable - non-supported authtypes. - (source_type_changed): Update for build_auth_menu. - (transport_type_changed): Same. - (service_check_supported): Pass in TRUE for the disable - non-supported authtypes to build_auth_menu and also disable - check-supported button and the authtype menu if we get a NULL - supported auth list. - - * mail-callbacks.c (mail_generate_reply): Initialize `me' to NULL. - (forward_attached): If we are only forwarding a single message, - pass the message along as the callback data, else pass NULL. - (do_forward_attach): Updated for changes to - forward_get_composer(). - (do_forward_non_attached): Same. - (forward_get_composer): Try to guess which account to forward the - message from if the message passed in is non-NULL. - -2001-07-24 Peter Williams - - * mail-config.c (mail_config_write): Um, write the HTML signature - settings in the right place. Whoops. - -2001-07-24 Jason Leach - - * mail-callbacks.c (delete_msg): If we're deleting the last - message, select the previous, not next, which actually selects - nothing. Fixes #5323. - -2001-07-24 Jeffrey Stedfast - - * mail-ops.c (save_part_save): Pass the O_TRUNC flag to open so - that we don't leave trailing garbage at the end of the file if the - new file content is shorter than the old file content. - - * component-factory.c (create_view): Fix for bug #5174. - -2001-07-24 Jason Leach - - * mail-config.c (config_read): Match the prefix for the - "remember_passphrase" setting with where it's being saved to - (/Mail/Prompts), so the setting gets loaded correctly. Fixes - #5351. - -2001-07-24 Jeffrey Stedfast - - * mail-format.c (handle_text_plain): check_specials if this is an - application/pgp type as well. - - * mail-ops.c (add_vtrash_info): When dumping the CamelURL to a - string, hide all the params. - -2001-07-24 Jeffrey Stedfast - - * mail-callbacks.c (guess_me): Do a case-insensitive comparison. - (mail_generate_reply): Only resort to the source account's - identity if we can't find out which identity to use based on the - recipients of the message first. - - * mail-config.c (mail_config_get_default_account): Make sure to - return the 0th account if we don't have a default. We don't want - to return NULL. - - * mail-callbacks.c (empty_trash): Use mail_tool_get_trash for the - remote store trash folders. - - * mail-tools.c (mail_tool_get_trash): New convenience function. - -2001-07-24 Jason Leach - - * mail-config.c (config_read): get_boolean_with_default for the - "Mark as read" timeout, not get_long_with_default. Fixes #5176. - -2001-07-24 Peter Williams - - * mail-folder-cache.c (make_folder_name): Don't display "(0 unsent)" if - the outbox is empty. - - * mail-local.c (init_trash): Set up the local trash in the folder - cache. - - * mail-folder-cache.c (update_idle): Make the error reporting a little - but more descriptive. - -2001-07-24 Peter Williams - - * mail-config.glade: Add new label widgets with a message that SSL - isn't supported. - - * mail-account-gui.h: Add a new member to the Transport GUI struct - for the 'SSL is not supported' message. - - * mail-account-gui.c (source_type_changed): Change logic to display - a message stating that SSL isn't supported if SSL isn't supported. - (transport_type_changed): Same. - (mail_account_gui_new): Also load the labels for the the no-SSL - message. - - * mail-accounts.c (construct): Fix typo. - -2001-07-24 Not Zed - - * component-factory.c (create_folder): Dont call notifyResult here - if we've just launched a thread to do the work, it calls it - itself. This apparently breaks the importers, but thats a - different issue. - -2001-07-23 Not Zed - - * mail-mt.c (mail_msgport_replied): Go back to calling - mail_msg_free here. - (mail_msg_destroy): Remove the operation unregistration stuff. - (mail_msg_received): And put it here, so we unregister as soon as - the async part of the operation is complete. I thought about this - and we should be doing this anyway so we register/unregister - always in the same thread, although the camel_operation api - doesn't enforce it, this *is* what it expects. - - * message-list.c (regen_list_regen): re-add reporting to - rebuilding the message list. Basically fixes #4931 - -2001-07-23 Jeffrey Stedfast - - * mail-search.c (toggled_fwd_cb): Oops. Uncomment this code since - Trow fixed GtkHTML to actually have this function now. - - * mail-config.glade: Fixed the "Read" to be Read in the glade file - per menesis' request. - - * mail-accounts.c (construct): Give the dialog a Close button - instead of an OK button. - (prompt_bcc_only_toggled): New. - (threaded_list_toggled): New. - (show_preview_toggled): New. - (construct): Add code for the bcc-only-prompt, threaded-list, and - show-preview checkboxes. - - * mail-ops.c (transfer_messages_transfer): If the source and - destination folders are the same, just mark the uids as undeleted - (in case they were marked as deleted before). - -2001-07-23 Jon Trowbridge - - * mail-search.c (begin_cb): Carefully check for NULL everywhere, - and do the right thing if the message we are currently looking at - gets expunged. (Bug #4870) - -2001-07-23 Jason Leach - - [Bug #5225: No UI way to mark as unimportant] - - * folder-browser.c (on_right_click): Do the necessary stuff to - show or hide the correct "Mark Important" or "Mark as Unimportant" - menu items depending on the status of messages that are selected. - - * folder-browser-ui.c: Add the MarkAsUnimportant verb here. - - * mail-callbacks.c (mark_as_unimportant): Simple function that's - the callback for these new menu items. - -2001-07-22 Ettore Perazzoli - - * component-factory.c (remove_folder): Updated to get a @type - argument. Return an error if the type isn't "mail". - (xfer_folder): Likewise. - -2001-07-21 Ettore Perazzoli - - * component-factory.c: Make types "mailstorage" and "vtrash" - non-user-creatable. - -2001-07-20 Jason Leach - - * mail-summary.c (generate_html_summary): Change this back to the - "evolution:/local/Inbox" URI. - -2001-07-20 Peter Williams - - * component-factory.c (storage_remove_folder): Don't let the user - remove vtrash folders. - -2001-07-20 Peter Williams - - * mail-mt.c (mail_msgport_replied): Fix DanW's fix. Pass the right - arguments to mail_msg_destroy. - - * component-factory.c (component_fn): Don't populate the context - menu; our only action didn't even work. - (populate_folder_context_menu): Removed. ChangeFolderProperties - needs a FolderBrowser which we don't have. It didn't even work - before. - - * mail-local.c (mail_local_reconfigure_folder): Bring the creation - of the hash table to the beginning to prevent warnings. Complain - if the mailbox is non-local. - -2001-07-20 Jeffrey Stedfast - - * mail-ops.c (filter_folder_filter): Don't expunge the source - folder if we have a cache. - -2001-07-20 Dan Winship - - * mail-mt.c (mail_msgport_replied): Use mail_msg_destroy rather - than mail_msg_free, so the cancellation operation gets - unregistered and doesn't leak two file descriptors. - -2001-07-19 Jason Leach - - * mail-summary.c (generate_html_summary): Update this - evolution:/local/ URI to evolution:/Local Folders/ to go along - with today's shell changes. - -2001-07-19 Jason Leach - - * mail-display.c: Fix #4605: "Save Image as" should be "Save Image - as...". - -2001-07-19 Jason Leach - - * mail-display.c (mail_display_new): Set the vertical scrolling - policy for the mail display to AUTOMATIC, only get a scrollbar if - the e-mail is longer than one frame. - - * folder-browser.c (my_folder_browser_init): We were setting the - policy twice (and to two different things). Removed this one. - - * message-list.c (message_list_init): Set the policy for the - message list scroll frame to be horizontal=NEVER, - vertical=AUTOMATIC (scrollbar only if you have >1 page of - messages). - -2001-07-19 Peter Williams - - Track the NoSelect changes in Camel. - - * mail-callbacks.c (create_folders): We don't need to check if - the URL is NULL or not anymore. - - * component-factory.c (create_noselect_control): New - function. Create a dummy control for folders that can't contain - messages (ie \NoSelect) - (create_view): If the URI says the folder is noselect, make a - dummy control. FIXME: still should merge in the global UI - elements. - (xfer_folder): Don't allow the operation if the destination is - NoSelect. - (destination_folder_handle_motion): Ditto. - (destination_folder_handle_drop): Ditto. - -2001-07-19 Not Zed - - * mail-local.c (reconfigure_folder_reconfigure): remvoed - register/start/end etc code. - - * mail-ops.c (get_messages_desc): Add the count here. - (get_messages_get): Remove the register/start code, its handled - above us. - (save_messages_desc): Added count. - (save_messages_save): Removed register/start/end code. - - * mail-mt.c (mail_msg_received, mail_msg_destroy): Changed to use - camel_operation rather than mail_status. - (mail_msgport_received, mail_msgport_replied): Turn of the - mail_status stuff, we dont need to report on stuff running in the - gui thread right? - (retrieve_shell_view_interface_from_control, set_view_data, - mail_statusf, mail_status, mail_status_end, mail_status_start, - status_timeout, do_del_status, set_status_op): removed now - redundant stuff. - (mail_msg_free): Removed reference to timeout_id. - -2001-07-18 Not Zed - - * mail-local.c (reconfigure_folder_reconfigure): Changed to use - camel_operation rathre than mail_status. - (reconfigure_folder_describe): re-enabled this function. - - * mail-ops.c (get_messages_get): Changed to use camel-progress for - status reporting. - (save_messages_save): Likewise. - -2001-07-17 Not Zed - - * mail-mt.c (struct _mail_msg_priv, destroy_objects, mail_msg_new, - mail_msg_free, do_op_status): Changed to use an EvolutionActivityClient for - progress. - -2001-07-18 Jason Leach - - * mail-tools.h (mail_tool_get_local_inbox_url): Remove this - prototype for a function that was removed long ago. - (mail_tool_get_local_movemail_url): Ditto. - -2001-07-18 Jason Leach - - [Simplifying how default account is stored and used internally, - fixes possabilities of having multiple default accounts and things - like deleting the current default account] - - * mail-account-gui.c (mail_account_gui_new): Update for new way of - finding out the default account. - (mail_account_gui_save): Ditto. - - * mail-accounts.c (load_accounts): Ditto. - - * mail-config-druid.c (make_default_account): Ditto. - - * mail-config.c: Added an int MailConfig::default_account, to be - used instead of a 'default_account' boolean on each mail account. - (mail_config_set_default_account_num): New function, facilitates - things. - - * Mail.idl: removed the Account::default_account boolean. - -2001-07-18 Jeffrey Stedfast - - * mail-tools.c (mail_tool_generate_forward_subject): Do what was - suggested in #4596. - -2001-07-18 Peter Williams - - * mail-accounts.c (construct): Add GTK_WIDGET to the charset - picker. Reportedly prevent a craash for someone... ? - - * mail-config.glade: Typo fix. - Later: And actually fix the typo. - -2001-07-17 Jeffrey Stedfast - - * mail-accounts.c (mail_delete): Setup the auto-receive here - instead. - - * mail-config.c (mail_config_remove_account): Don't setup the - auto-recv here. - -2001-07-17 Iain Holmes - - * mail-accounts.c (mail_able): Reset the auto receive. - - * mail-config.h (mail_config_remove_account): Reset the autoreceive. - -2001-07-17 Jason Leach - - * mail-account-gui.c (source_type_changed): Fix for last change: - hide the entire widget, not just the entry. - -2001-07-17 Jeffrey Stedfast - - * folder-browser.c (message_list_drag_data_recieved): Fix to - correctly handle text/uri-lists that contain more than a single - url. - - * component-factory.c (destination_folder_handle_drop): Fix to - correctly handle text/uri-lists that contain more than a single - url. - -2001-07-17 Jason Leach - - * mail-config.glade: Make the Path: entry into a GnomeFileEntry so - you get a nice "Browse..." button that pops up a file selector to - locate your mbox files. Bug #3501. - -2001-07-17 Jeffrey Stedfast - - * mail-format.c (mail_part_toggle_displayed): Cleaned up a bit. - (handle_multipart_encrypted): Replace the encrypted part with the - decrypted part. - -2001-07-17 Iain Holmes - - * mail-accounts.c (mail_delete): Make a nicer dialog. - -2001-07-17 Jeffrey Stedfast - - * mail-local.c (init_trash): Use CAMEL_VTRASH_NAME. - - * mail-ops.c (add_vtrash_info): Use CAMEL_VTRASH_NAME. - - * folder-browser.c: turned off some debugging - -2001-07-16 Jeffrey Stedfast - - * mail-callbacks.c (transfer_msg): Disallow vtrash for now... - - * mail-ops.c (add_vtrash_info): Use g_strcasecmp() when looking - for a Trash folder - it may be lowercase or something funky. - (transfer_messages_transfer): Special-case vtrash folders. - - * mail-local.c (init_trash): No need to specify the vfolder - expression here. This code was moved into camel-vtrash-folder.c - ages ago. - - * component-factory.c: Let VTrash folders accept/export the same - dnd types as normal folders. - -2001-07-16 Peter Williams - - * mail-folder-cache.c (outbox_folder): prototype outbox_folder so - we can check if a folder is it. - (make_folder_name): If the folder is the outbox, display the count - of total messages as "unsent". - (make_folder_status): If the folder is the outbox, display - "unsent" instead of "total" - -2001-07-16 Peter Williams - - * mail-display.c (mail_display_redisplay): Use our own - display_style member instead of the global setting. - (mail_display_init): Initialize display_style. - - * mail-display.h: Include "mail-config.h" and add a display_style - member. - - * mail-format.c (write_headers): Look at the MailDisplay's - display_style instead of using the full_headers data. - - * folder-browser.c (folder_browser_set_message_display_style): Set - the MailDisplay's display style as well as the global display - style. - (my_folder_browser_init): Don't save preference changes by - default. (This is only observered wrt. the message display style - but should apply to other items.) - - * folder-browser-factory.c (folder_browser_factory_new_control): - Set this FB to save the preferences set in it. - - * folder-browser-ui.c (folder_browser_ui_add_message): Read our - display's state instead of the global setting. - -2001-07-16 Peter Williams - - * mail-folder-cache.c (mail_folder_cache_set_folder_browser): DUH. - No need to update every folder if we set the folder browser to - NULL. - -2001-07-15 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_save): Call - mail_autoreceive_setup() so that any changes to the list of - accounts will be respected the next time mail is checked. - -2001-07-13 Peter Williams - - * mail-callbacks.c (expunge_folder): Segfault prevention here if - no uid is currently loaded. - - * mail-vfolder.c (unlist_vfolder): New function. If a vfolder in - our list gets finalized, NULL out info->folder (Is it wrong if - this happens?) Also, locking issues? - (vfolder_uri_to_folder): Hook up to the finalize event here. - -2001-07-13 Jeffrey Stedfast - - * mail-ops.c (filter_folder_filter): Updated to reflect changes in - the filter API by passing in the provided uid cache to - camel_filter_driver_filter_folder. - (mail_filter_folder): Set the cache to NULL. - (mail_fetch_mail): Set the cache to NULL. - (fetch_mail_fetch): If a cache exists for this folder, set - it. When we are finished filtering the incoming messages, the - logic changes a bit. We now save the cache if keep_on_server is - set *or* if there was an exception this way if the user's download - gets interrupted, he won't have to download all the messages - again. - (fetch_mail_fetch): Oh yea, and just so if we get an exception - with `delete' turned on, the next time the user checks mail and an - exception *doesn't* occur, it will go back and mark all the - messages for deletion. - -2001-07-12 Iain Holmes - - * importers/evolution-mbox-importer.c (load_file_fn): Check that - the folder does exist before trying to import it. - -2001-07-12 Jeffrey Stedfast - - * mail-callbacks.c (expunge_folder): Force-hide all deleted - messages before expunging. - (expunged_folder): Restore the user's "hide deleted messages" - preference. - -2001-07-12 Jason Leach - - * mail-callbacks.c (expunge_folder): Only blank the mail display - if the message being viewed is one of those to be expunged. Bug - #4030. - -2001-07-12 Jason Leach - - * mail-config.c (config_read): Should be saving the - 'identity_html_signature' and 'identity_has_html_signature" keys - in the /Mail/Accounts prefix (with the rest of the per-account - stuff, not on it's own) - -2001-07-11 JP Rosevear - - * mail-display.c (get_embedded_for_component): no longer need to - set a my address property - -2001-07-10 Federico Mena Quintero - - * mail-display.c (link_copy_location): Set the CLIPBOARD selection - as well as the primary selection so that Edit/Paste will work in - other programs (e.g. Netscape). - (mail_display_new): Add the target for the CLIPBOARD selection. - -2001-07-10 Jason Leach - - [Bug #4305: Make the automatic mark-as-read timer optional] - - * mail-config.glade: Necessary changes to make the Mark as "Read" - label a toggle button instead. - - * mail-accounts.c (construct): Connect to the "toggled" on our new - toggle. - (timeout_toggled): New callback, called from above. - - * mail-config.c (mail_config_get_do_seen_timeout): New. - (mail_config_set_do_seen_timeout): New. - (mail_config_write_on_exit): Save the preference here. - (config_read): Load it here. - -2001-07-10 JP Rosevear - - * folder-browser.c: Cosmetic patch - replace our defines with the - e-popup ones - - * Makefile.am: Typo - -2001-07-10 Peter Williams - - * mail-format.c (attachment_header): Took the logic of whether or - not to make the attachment header out of the actual function. - (mail_part_is_displayed_inline): Return if the part is being - displayed inline (regardless of whether it is actually inline). - (mail_part_toggle_displayed): Toggle whether it's displayed inline - or not. - (get_inline_flags): Determine whether the part is displayed inline - and whether it is actually inline. - (mail_format_mime_message): Initialize the attachment_status hash - table. - - * mail-display.c (inline_cb): Instead of modifying the - CamelMimePart, use mail_part_toggle_displayed - (button_press): As above. - (pixmap_press): Use mail_part_is_displayed_inline instead of - mail_part_is_inline. Get the MailDisplay from the popup to do - this. - - * mail.h: Add prototypes. - -2001-07-10 JP Rosevear - - * Makefile.am: extra dist the news files - -2001-07-10 Jeffrey Stedfast - - * mail-config.c (mail_config_write_on_exit): Use - bonobo_config_set_string_wrapper. - (mail_config_write): Same. - (bonobo_config_set_string_wrapper): Macro wrapping - bonobo_config_set_string that passes "" as the val if the val is - NULL. - - * mail-callbacks.c (mail_generate_reply): Make sure that the - reply-to addr i non-NULL before trying to add it to the hash - table. - -2001-07-09 JP Rosevear - - * mail-account-gui.c (get_focused_widget): fix typo so it compiles - -2001-07-09 Jeffrey Stedfast - - * mail-format.c (setup_mime_tables): Handle application/pgp using - the text/plain handler. - - * mail-account-gui.c (get_focused_widget): New function to - determine which widget is focused. - - * mail-account-editor.c (apply_changes): Not only flip to the - notebook page that wasn't finished, but also grab the focus of the - incomplete widget. - - * mail-config-druid.c (source_changed): Grab the focus of the - incomplete widget. - (transport_prepare): And here. - (identity_changed): Here too. - - * mail-account-gui.c (mail_account_gui_identity_complete): Take an - incomplete argument so we can set which widget is incomplete and - then the caller can focus it or whatever. - (service_complete): Same. - (mail_account_gui_transport_complete): And again here. - (mail_account_gui_management_complete): And here too. - -2001-07-09 Jeffrey Stedfast - - * mail-format.c (decode_pgp): Update to pass in the `remember' - argument when creating a new pgp context. - (try_inline_pgp_sig): And here... - - * mail-crypto.c (mail_crypto_pgp_mime_part_sign): Update to pass - in the `remember' argument when creating a new pgp context. - (mail_crypto_pgp_mime_part_verify): Same. - (mail_crypto_pgp_mime_part_encrypt): And here... - (mail_crypto_pgp_mime_part_decrypt): And finally here. - - * mail-config.c (mail_config_get_remember_pgp_passphrase): New. - (mail_config_set_remember_pgp_passphrase): New. - (config_read): Read in the "remember passphrase" value. - (mail_config_write_on_exit): Save the remember-passphrase value. - - * mail-accounts.c (construct): Allow the user to set "Remember PGP - Passphrase". - (remember_pgp_passphrase_toggled): Set the toggle state. - -2001-07-09 Peter Williams - - * mail-ops.c (get_folderinfo_got): Check for an exception and - print it. Call done anyway. - (do_update_subfolders): Check for NULL info. - -2001-07-09 Peter Williams - - * mail-config.c (mail_config_write): Some NULL protection for our - strings: pgp_key, html_signature, smime_key. Probably we should do - this for all strings. Either that or change Bonobo Config. - - * message-list.c (message_list_init): Explicitly initialize search - to NULL. Bug 3951 might to be due to a problem wrt this, and it - can't hurt. - -2001-07-09 Dan Winship - - * mail-display.c (save_part): g_strdup the result of - g_get_home_dir since this variable will get free'd later. - - * mail-format.c (mail_lookup_handler): Use - gnome_vfs_mime_get_short_list_applications rather than - gnome_vfs_mime_get_default_application. - - * mail-display.c (pixmap_press): Construct the EPopupMenu array on - the fly, based on the number of applications available to open the - MIME type. - (launch_cb): Figure out which menu item was clicked, and invoke - the appropriate application. Ugh, messy, because of the EPopupMenu - interface. Probably should get rewritten some day. Also, make this - handle apps with expects_uris set too. - -2001-07-09 Peter Williams - - * mail-config.c (mail_config_write): Change html_signature stuff - over to bonobo-config -- someone forgot to do this. - - * mail-folder-cache.c (dm): Gave up and got rid of dm. Just - replaced it with d(g_message()) and set G_LOG_DOMAIN. - -2001-07-09 Peter Williams - - * mail-folder-cache.c (mail_folder_cache_set_update_shellview): - Deleted - (as opposed to #if 0) - (get_folder_info): Changed to assume it has the folder lock. - (make_folder_name): Same. - (make_folder_status): Same. - (update_idle): Don't unlock around the make_folder_ functions. - (*): Changed behavior wrt. get_folder_info. Lock before calling, - but also move preconditions before -- get_folder_info can only - return NULL if uri is NULL. Also add preconditions for other - arguments where necessary. - -2001-07-07 Christopher James Lahey - - * message-list.c (on_cursor_activated_cmd): Check for new_uid != - NULL here before strcmping. - -2001-07-07 Dan Winship - - * main.c (main): Only install the segv_redirect handler if SEGV's - handler is not currently SIG_DFL. Otherwise you get an infinite - SEGV loop if you run with GNOME_DISABLE_CRASH_DIALOG. - -2001-07-07 Christopher James Lahey - - * message-list.c (message_list_select): Made this handle being - given a row that's outside the range better. - -2001-07-06 Jason Leach - - [Fix bug #1100, default account is stored strangely] - - * mail-config.c (mail_config_get_default_account_num): New - function, returns the integer of the position of the default - account, used to save which account is the default to the config - db. - (mail_config_write): Save the default account number here in - "/Mail/Accounts/default_account". - (config_read): Load in which is the default here. - -2001-07-06 Larry Ewing - - * mail-callbacks.c (composer_send_cb): add a NULL check since that - is a valid return. - -2001-07-06 Peter Williams - - * mail-format.c (format_mime_part): Prevent infinite recursion when - viewing attachments that we can't / shouldn't display but are some - form of plaintext. Cf bug #2234 - -2001-07-06 Jeffrey Stedfast - - * folder-browser.c (folder_browser_copy): Freeze and Thaw the - folder. - -2001-07-06 Jeffrey Stedfast - - * folder-browser.c (folder_browser_copy): Mark the messages as - Seen also. - (folder_browser_class_init): Create an atom type for - X-Evolution-Message selection type. - (my_folder_browser_init): Add our multiple selection types, one of - which is the default string type. - - * component-factory.c (destination_folder_handle_drop): Update to - use the new X-Evolution-Message type format. - - * folder-browser.c (selection_get): Convert the - X-Evolution-Message clipboard type to whatever format the target - wants. - (message_list_drag_data_get): Update because the - X-Evolution-Message type changed. - (folder_browser_copy): Same. - (x_evolution_message_parse): And here too. - -2001-07-06 Peter Williams - - * mail-callbacks.c (composer_postpone_cb): Don't free the psd here -- - it will be freed on the "destroy" signal. - - * mail-folder-cache.c (maybe_update): Instead of an idle, use a very - short timeout in hopes of reducing the number of redundant updates. - - * mail-tools.c (mail_tool_uri_to_folder): Only note the folder in the - cache if we successfully got it. - -2001-07-06 Jason Leach - - * mail-callbacks.c (delete_msg): Select the very next message - after deleting, not the next undeleted (it can make things jump - around in annoying ways if you are deleting many messages), bug #4032. - - * folder-browser.c: Forgot to commit the "Mark as Important" right - click menu item. - - * message-list.c (message_list_set_folder): Setup the strikeout - column here (after we've gotten the folder) so we can disable - strikeouts for vtrash folders, part of bug #2224. - -2001-07-06 Dan Winship - - * mail-folder-cache.c (mail_folder_cache_set_folder_browser): Fix - obvious bug in previous bugfix: Pass "fb" to check_for_fb_match() - so only the selected folder gets updated, instead of "all folders - that haven't yet been selected". - -2001-07-06 Ettore Perazzoli - - * component-factory.c (populate_folder_context_menu): New function - to populate the right-click menu for mail folders. - (component_fn): Pass it to `evolution_shell_component_new()'. - -2001-07-05 Jeffrey Stedfast - - * mail-accounts.c (construct): Add a checkbox for prompting when - sending a message with an empty subject. - - * mail-ops.c (mail_send_message): If filtering fails, return right - away. - - * mail-config.c (mail_config_set_show_preview): Okay, apparently I - was wrong. Oh well. - (mail_config_set_thread_list): Fix this one too. - -2001-07-05 Peter Williams - - * mail-vfolder.c (vfolder_uri_to_folder): Add mail folder cache - hookups. - - * Makefile.am: Remove the ridiculuous relic known as - test-mail. Clean up a bit. - - * mail-vfolder.c (vfolder_uri_to_folder): Add mail folder cache - hookups. - -2001-07-05 Peter Williams - - * mail-folder-cache.c (mail_folder_cache_set_folder_browser): - Clear the shell view label if mailer loses focus. - - * mail-ops.c (do_update_subfolders_rec): Check for NULL url before - calling folder cache functions. - -2001-07-04 Gediminas Paulauskas - - * folder-browser-ui.c (message_pixcache): set icon for - ApplyFilters command. - -2001-07-04 Jeffrey Stedfast - - * mail-config.c (mail_config_set_show_preview): Revert Sam's - changes. - - Note: Uhm, g_hash_table_lookup_extended gives us a pointer to the - original value which we can just change to update the hash table - without the need to re-insert - it's already there!! Also, you - don't want to g_hash_table_insert the new value with the same key - without at least first removing the existing bucket. And, you - certainly don't want to g_free() the key after you insert it - - eek!! - -2001-07-03 Sam Creasey - - * mail-config.c (mail_config_set_show_preview): Replace value in - config->preview_hash when it already exists. Old code never - re-inserted into the hash, just assigned to val -- it's an int - here, not a real pointer. - -2001-07-03 Joe Shaw - - * mail-callbacks.c (expunge_folder): Unset the message being displayed - when expunging. This makes expunged messages not show in the preview - pane when they're not there anymore. Fixes #3591. - -2001-07-03 Joe Shaw - - * mail-callbacks.c (mail_reply): If msg is NULL, fetch the message - and requeue a mail_reply call. Fixes bug #3816. - (requeue_mail_reply): Callback from mail_get_message(). - -2001-07-03 Jeffrey Stedfast - - * mail-config.c (mail_config_get_show_preview): Use a better - GHashTable technique that will hopefully solve some bugs and also - use _with_default bonobo-config call. - (mail_config_set_show_preview): No sense in removing the entry - from the hash table and then re-inserting it. Just reset the - value. - (mail_config_get_thread_list): Use the same logic. - (mail_config_set_thread_list): And again here. - -2001-07-03 Peter Williams - - * mail-folder-cache.c (make_folder_name, make_folder_status): - Split make_string into these. - (update_idle): Use (name and status) instead of (wide and thin) - for the text. - -2001-07-03 Jason Leach - - * folder-browser-ui.c: "Mark as Important" menu thingy here. - -2001-07-03 Peter Williams - - * folder-browser.c (message_list_drag_data_get): Compile fixes. - #include errno.h and gnome-dialog-utils.h. s/dirname/tmpdir/ - -2001-07-03 Peter Williams - - Prevent folders from appearing to have -1 new messages. Prevent - nonactive folders from updating the title bar. Make the title bar - update when switching to an already-opened folder. - - * mail-folder-cache.c (update_message_counts): Ignore the value - for 'unread' if it is -1. - (get_mail_info_receive): Same - (mail_folder_cache_note_folderinfo): Same. - (get_folder_info): Initialize 'fb' to NULL. - (mail_folder_info): Add 'fb' member. - (mail_folder_cache_note_fb): Change note_message_list to this. - (update_idle): Only update the ShellView if the active folder - browser is the same as the one that the MFI references. - (mail_folder_cache_set_folder_browser): New function. Use it to - set the active folder browser. NULL is okay. - (check_for_fb_match): Called from the above. If the MFI has the - new folder browser as its view, queue an update. - - * mail-folder-cache.h: Fix prototypes. - - * mail-callbacks.c (create_folders): Check if fi->url is nonnull. - - * folder-browser.c (got_folder): Change to use note_fb instead of - note_messge_list. - - * folder-browser-factory.c (control_activate): Set the folder - browser - (control_deactivate): Clear it here. - (fb_get_svi): Kill some inappropriately cut-n-pasted code. - -2001-07-03 Dan Winship - - * mail-config.glade: Rename some of the widgets in the news config - to not conflict with the mail config stuff, so the mail config - druid will work again. - -2001-07-03 Jeffrey Stedfast - - * folder-browser.c (message_list_drag_data_get): Use mkdtemp if we - have it, else use mktemp but make the code safer than it was - previously. - - * mail-display.c (launch_cb): Free the template string if the - tempdir failed to be created. - - * folder-browser.c (message_list_drag_data_get): Hide the URL - passwd, auth, and params. - (folder_browser_copy): Same. - -2001-07-03 Dan Winship - - * mail-ops.c (filter_folder_filter): Don't pass a dirty exception - to camel_folder_sync. Fixes an IMAP filtering crash. - -2001-07-02 Sam Creasey - - * mail-account-editor-news.c: Added an MailAccountEditorNews, for - NNTP configuratuion. Based on MailAccountEditor, but stripped. - - * Makefile.am: added mail-account-editor-news.c and - mail-account-editor-news.h to SOURCES if ENABLE_NNTP is defined. - - * mail-accounts.c (load_news): Moved this function, and fixed some - slight brokenness. - (news_edit): Added functional code using MailAccountEditorNews - (news_add): Added functional code using news_edit after - allocation. - - * mail-config.glade: news_editor_window widget added. Used by - MailAccountEditorNews. - - * mail-display.c (save_data_cb): Store the pathname used when - saving messages so that the next save box will default to the - previous path. - - * message-browser.c (message_browser_new): add signal handler for - size_allocate on the message browser. Thus new windows are size - as they were last allocated. - (message_browser_size_allocate_cb): handler to store allocations. - - * message-list.c (message_list_setup_etree): connect to the - info_changed signals for the state of the message_list->tree. - Save the folder state to disk, so that when additional - message_lists are created, they are consistant. e.g. the next - buttons do the same thing in the browser, and in the message - viewer after changing sorting options. - - * subscribe-dialog.c (build_tree): freeze sc->folder model while - building the tree. Not doing so takes a very long time over 40000 - newsgroups. - -2001-07-02 Jeffrey Stedfast - - * mail-accounts.c (construct): Setup the Empty Trash On Exit - widgets. - - * mail-config.c (config_read): Option to emtpy trash on exit. - (mail_config_write_on_exit): Same. - (mail_config_set_empty_trash_on_exit): Set the option. - (mail_config_get_empty_trash_on_exit): Get the option. - - * component-factory.c (owner_unset_cb): Empty the trash folders if - the user set the "empty trash on exit" option. - -2001-07-02 Jeffrey Stedfast - - * mail-callbacks.c (transfer_msg): Updated for the - mail_transfer_messages API. - - * folder-browser.c (message_list_drag_data_recieved): Update for - the mail_transfer_messages API. - (selection_received): Same. - - * mail-ops.c (mail_transfer_messages): Renamed from - mail_do_transfer_messages and also added a callback/data arguments - since we need it component_factory::xfer_folder. - - * component-factory.c (xfer_folder): Use mail_transfer_messages - instead. - (destination_folder_handle_drop): Update to pass in a NULL - callback arg and a NULL data argument to mail_transfer_messages. - -2001-07-02 Larry Ewing - - * mail-display.c (save_part): move the saving logic out of save_cb - so that we can reuse it for the image saving code. - (save_cb): call save_part. - (save_url): new function to resolve an save an html url. - (image_save_as): save function for images and. Add it to the - link_menu, and add MASK_URL and MASK_SRC to the structure so that - we cans show the proper menus. - (html_button_press_event): call get_src as well to find external - urls references. Add popup masking. - -2001-07-02 Peter Williams - - * README.async: Add a warning about how wrong this document is. - -2001-07-02 Peter Williams - - * mail-folder-cache.h: New file. Protoypes for the Mail Folder - Cache, which provides a place for all the disparate pieces of the - mailer to save bits of information about a folder. Centralizes the - information display code. - - * mail-folder-cache.c: New file. Implements the Mail Folder Cache. - - * Makefile.am (evolution_mail_SOURCES): Add the - mail-folder-cache.{c,h} - - * folder-browser-factory.c (fb_get_svi): Copy of that absurdly - long-named function in mail-display.c that gets the - GNOME_Evolution_ShellView. - (control_activate): Set the ShellView for the folder cache. - - * folder-browser.c (got_folder): Tell the folder browser about - this folder. - - * mail-callbacks.c (create_folders): Tell the folder cache about - the new folders. - - * mail-local.c (reconfigure_folder_reconfigure): Don't unhook our - events as we no longer hook them up. - (register_folder_registered): Tell the folder cache about this - folder's place in the local storage. - (register_folder_register): No longer hook events; the Folder - Cache will do this. - (local_folder_changed, local_folder_changed_proxy): Move to - mail-folder-cache.c - (free_local_folder): No longer unhook events. - - * mail-ops.c (do_update_subfolders_rec): Instead of setting the - folder status ourselves, inform the Folder Cache about the - changes. - - * mail-tools.c (mail_tool_uri_to_folder): Replace danw's cache - with the new Mail Folder Cache. - (cache_folder, etc): removed. - -2001-07-02 Jeffrey Stedfast - - * mail-accounts.c: #include widgets/misc/e-charset-picker.h since - it was moved there from libgal. - -2001-07-02 Peter Williams - - * importers/evolution-mbox-importer.c (mbox_factory_fn): Kill - irritating "Returning" g_warning. - -2001-07-02 Dan Winship - - * mail-session.c (get_filter_driver): Implement this, based on - code that used to be in mail-ops.c - - * mail-ops.c (mail_load_filter_context, setup_filter_driver): - Moved into MailSession::get_filter_driver. - (filter_get_folder): Moved to mail-session.c - (mail_filter_folder, mail_filter_on_demand, mail_fetch_mail, - mail_send_mail, mail_send_queue): Remove FilterContext args, use - camel_session_get_filter_driver. - - * mail-send-recv.c (mail_send_receive, mail_receive_uri): - Remove FilterContexts - -2001-07-01 Chris Toshok - - * subscribe-dialog.c (subscribe_dialog_gui_init): the FolderSearch - control is in a different dockitem now. - -2001-07-01 Dan Winship - - * mail-tools.c (update_unread_count): Ref the folder before - proxying the event, in case there's only one reference to it and - it gets unreffed before the other end of the event handler runs. - (update_unread_count_main): And unref it when we're done. - (mail_tool_uri_to_folder): Only hold the lock around the hash - table operations, not the entire function. Holding the lock the - whole time can cause deadlock when resolving vfolders, and the - CamelSession and CamelStore locks ensure that multiple threads - calling this function will end up with the same CamelFolder object - at the end anyway, so we just need to lock and re-check the cache - at the end before adding the folder to the cache. - -2001-06-30 Ettore Perazzoli - - * folder-browser-ui.c: Get MailNext/MailPrevious to use - next-message.png and previous-message.png, respectively. Also - change Print to use print.png. - -2001-06-30 Jon Trowbridge - - * mail-display.c (make_popup_window): Changed to return the - created window. - (find_socket): Added. Copied from e-shell-view.c. The fact - that I'm copying this bit of code all over isn't cool. - (html_button_press_event): Properly destroy the popup window when - the widget inside the control is destroyed. - - * mail-callbacks.c (addrbook_sender): Added. Implements - the "Add sender to addressbook" right-click. (Bug #3645) - (find_socket): Added. Copied from e-shell-view.c. - - * folder-browser.c: Added "Add sender to addressbook" to - context_menu[]. - - * mail-display.c: (handle_embedded_address_object): Removed. - (on_object_requested): Removed handling for embedded address - objects. (Which was obsolete crap.) - -2001-06-29 Larry Ewing - - * mail-display.c (html_button_press_event): remove redundant - logic. - - * mail-callbacks.c (create_msg_composer): make sure we show the - sig file. - -2001-06-29 Jeffrey Stedfast - - * folder-browser-factory.c (control_deactivate): Turn folder - syncing back on here so that IMAP folders will sync without - needing to hit Send & Receive. - - * mail-callbacks.c (ask_confirm_for_only_bcc): Throw up the - confirmation dialog. - (composer_get_message): If the user only specified Bcc recipients, - prompt him/her to make sure we should continue and risk the server - adding an Apparently-To header. - - * mail-config.c (config_read): Read in config option for prompting - when only Bcc recipients are specified. - (mail_config_write_on_exit): Save the option. - (mail_config_get_prompt_only_bcc): New. - (mail_config_set_prompt_only_bcc): New. - -2001-06-29 Dan Winship - - * mail-account-gui.c (build_auth_menu): Take two authtypes lists, - "all", and "supported", and make the unsupported authtypes grayed - out in the menu rather than missing. - (source_type_changed, transport_type_changed, - service_check_supported): Update build_auth_menu calls. - -2001-06-29 Radek Doulik - - * mail-account-gui.c (menu_file_save_cb): implemented plain saving - -2001-06-28 Radek Doulik - - * mail-account-gui.c (load_signature): implemented plain load - (load_signature): use e_msg_composer_get_signature_html - -2001-06-28 Peter Williams - - * mail-ops.c (mail_send_message): Revert fejj's Bcc header removal; - this unsets the BCC recipients and so doesn't send to the Bcc'd - people at all. - -2001-06-28 Jeffrey Stedfast - - * mail-send-recv.c (free_send_data): The e_iterator_get() returns - a gconstpointer and we need a non-const BonoboControl so cast it. - - * mail-account-gui.c (mail_account_gui_new): - gui->check_html_signature is GtkToggleButton not a GtkCheckButton. - - * folder-info.c: Added some #include's to supress warnings. - -2001-06-28 Ettore Perazzoli - - * mail-display.c: Fix case of labels in the `link_menu' so that it - is consistent with that of the other menus in Evolution - [i.e. "Copy Link Location" instead of "Copy Location" etc.]. - -2001-06-28 Ettore Perazzoli - - * mail-display.c (invisible_selection_get_callback): New, signal - handler for "selection_get" on the GtkInvisible widget we use for - selections. - (invisible_selection_clear_event_callback): New, signal handler - for "selection_clear_event" on the same invisible widget. - (mail_display_init): Initialize the `selection' and `invisible' - members. Also, explicitly initialize all the other fields as - well. - (mail_display_destroy): Free `selection'. Destroy `invisible'. - (link_copy_location): Re-implemented to just make the mail display - become the owner of the primary selection. - (on_selection_get): Remove `#if 0'ed code. - (mail_display_new): Remove the `#if 0'ed code that would connect - selection stuff to the HTML widget. - (mail_display_new): Connect the signals and add the targets to the - invisible widget. - - * mail-display.h: New members `selection' and `GtkInvisible' in - `MailDisplay'. - -2001-06-28 Jeffrey Stedfast - - * mail-config.c (mail_config_write_on_exit): Don't bother trying - to save the passwd if the url is NULL. - - * folder-browser.c (vfolder_mlist): Strip the mlist name to fix - bug #3732. - - * component-factory.c (destination_folder_handle_drop): Since we - have an exception variable, we might as well use it when getting - folders too. - - * folder-browser.c (message_list_drag_data_recieved): Call - gtk_drag_finish. - -2001-06-28 Dan Winship - - * mail-tools.c (mail_tool_uri_to_folder): After finding a folder, - attach to its "folder_changed" and "message_changed" signals. - (update_unread_count, update_unread_count_main): Moved here from - folder-browser but basically unchanged. Doing this here lets us - get folder tree updates for folders that have had messages - moved/copied/filtered into them, but which don't yet have a view - associated with them. - - * folder-browser.c (update_unread_count, update_unread_count_main, - etc): Moved to mail-tools.c - -2001-06-28 Radek Doulik - - * mail-config.c: use new fields everywhere - - * mail-config.h: as below - - * Mail.idl: added html_signature and has_html_signature - -2001-06-28 Ettore Perazzoli - - * component-factory.c (component_fn): Register for the "mailto" - schema. - (handle_external_uri_cb): Callback for the "handle_external_uri" - signal. - (component_fn): Connect it. - -2001-06-27 Ettore Perazzoli - - * component-factory.c (component_fn): Pass NULL as the - @external_uri_schemas argument to - `evolution_shell_component_new()'. - -2001-06-27 Peter Williams - - * folder-browser-ui.c: Uncomment EditSelectThread. Yaay! - - * mail-callbacks.c (select_thread): New function. Self-explanatory - name. Implementation is a little hairy. - - * mail-callbacks.h: Prototype it here. - - * mail-callbacks.c (invert_selection): Here too. - (select_all): Here too. - - * subscribe-dialog.c (subscribe_select_all): Update to use new - ETree accessors. - (subscribe_invert_selection): Here too. - -2001-06-27 jacob berkman - - * folder-browser.c (save_cursor_pos): work around an e-tree bug - -2001-06-27 Jeffrey Stedfast - - * folder-browser.c: Fixed Cut/Copy/Paste to work - it turns out I - couldn't share a single GtkInvisible between all the - FolderBrowser's after all. - -2001-06-27 Peter Williams - - * folder-browser-factory.c (control_deactivate): Change to use - more reality-based API below. - Include folder-browser-ui.h too. - (control_activate): Remove now-unused 'int state'. - - * folder-browser-ui.h: Changed prototypes to match changes below. - - * folder-browser-ui.c (folder_browser_ui_rm_message): Commented out - to reflect reality of how this stuff works (you can't actually remove - the pieces). - (folder_browser_ui_rm_global): Same. - (folder_browser_ui_rm_list): Left because here we add the view menus. - (folder_browser_ui_add_list): ... which were moved here. - (folder_browser_ui_rm_all): New function, does the job of old ui_rm() - -2001-06-26 Peter Williams - - * folder-browser-ui.c: New file derived from - folder-browser-factory.c. Contains the Bonobo UI code, split into - three groups as described in ui/ChangeLog. Also contains the - GalView stuff and the hookups into the Bonobo UI stuff. - - * folder-browser-factory.c: Move most of the UI stuff to - folder-browser-ui.c. - (control_activate): Add all three kinds of UI element to this - folderbrowser. - (control_deactivate): Remove all three kinds. - - * folder-browser-ui.h: New file. Prototypes functions to add UI - elements to a FolderBrowser. - - * Makefile.am: Add folder-browser-ui.{c,h} - - * message-browser.c (PARENT_TYPE): Change to BONOBO_TYPE_WINDOW - (message_browser_destroy): Chain to parent destroy function. - (set_bonobo_ui): New function. Add the 'message' functions from - the folder browser to our UI. - (message_browser_close): BonoboVerbify this. - - * message-browser.h: Convert to BonoboWindow. - -2001-06-26 Jeffrey Stedfast - - * folder-browser.c (my_folder_browser_init): Helps if I spell - "received" correctly. - - * mail-config.c (mail_config_set_thread_list): If the value is - already in the hash table, first remove it before setting the new - value so we don't leak. - (mail_config_set_show_preview): Same. - -2001-06-26 Dan Winship - - * mail-mt.c (op_status_timeout): Don't pop up a progress dialog to - say "I already finished this a while ago". - - * component-factory.c (storage_create_folder): Pass the path - prefix to folder_created so it can add it to the folder tree in - the right place. - - * mail-callbacks.c (folder_created): Take a path prefix. - -2001-06-26 jacob berkman - - * mail-config.c (mail_config_get_show_preview): make ettore stop - complaining so i can get back to work - -2001-06-26 Jeffrey Stedfast - - * component-factory.c (message_rfc822_dnd): No longer returns a - gboolean and also takes a CamelException. - (destination_folder_handle_drop): Do better error checking. - - * folder-browser.c (my_folder_browser_init): Connect to the - tree-drag-data-recieved signal. - (message_list_drag_data_recieved): New function that handles the - recieving end of the DnD event. - (x_evolution_message_parse): New convenience function to parse the - x-evolution-message type so that the cut/paste and DnD code can - share it. - (selection_received): Use x_evolution_message_parse(). - - * mail-config.c (config_read): Read in the default show_preview - value. - (mail_config_write_on_exit): Save the default show_preview value - as well as saving the individual settings for each URI that has - been changed. - -2001-06-25 Joe Shaw - - * folder-browser.c (invisible_destroyed): Check to make sure that - clipboard_selection is non-NULL before we g_byte_array_free() it. - -2001-06-25 jacob berkman - - * mail-send-recv.c (free_send_data): sync folders after we've - gotten mail - - * folder-browser-factory.c (control_activate): set the ui - component on the folder browser - (control_activate): update the view preview item - (control_deactivate): don't sync the folder here - (control_deactivate): unset the ui component of the folder browser - - * mail-callbacks.c (toggle_flags): stuff from jleach to add an - importance keybinding - (mark_as_important): ditto - (toggle_as_important): again - - * mail-config.c (mail_config_get_show_preview): - (mail_config_set_show_preview): basically a copy of - get_thread_list() but for the preview pane - - * folder-browser.c (folder_browser_destroy): unref the our ui - component - (folder_browser_set_ui_component): new function for setting the ui - component - (save_cursor_pos): - (set_cursor_pos): try to show the selected row when the preview - pane is shown - (folder_browser_set_message_preview): implement - (folder_browser_toggle_preview): toggle the preview (duh) - (on_key_press): add keybindings for marking as important (!), and - hiding the preview pane (q) - (etree_key): clean up a little bit, and make enter either show the - preview pane or open the message - (fb_resize_cb): only save the paned size if the preview is alread - shown - (folder_browser_gui_init): pass ourselves to fb_resize_cb - (on_message_selected): only add the timeout if the preview is - shown - -2001-06-25 Jeffrey Stedfast - - * folder-browser.c (folder_browser_destroy): Unref the invisible - window that we use for slections. - (folder_browser_class_init): Init the clipboard_atam type. - (selection_get): New - (selection_clear_event): New - (selection_received): New - (folder_browser_copy): New function to copy the message-list - selection. - (folder_browser_cut): New function to cut the message-list - selection. - (folder_browser_paste): New function to paste the message-list - selection. - (my_folder_browser_init): Initialize `invisible` if it's NULL else - ref it - also set some signals on it. - - * folder-browser-factory.c: Added verbs for cut/copy/paste. - -2001-06-23 Jason Leach - - * mail-local.c (local_storage_removed_folder_cb): Fixes here for - removing folders. - - * mail-ops.c (remove_folder_get): Some fixes in here too. - -2001-06-22 Jeffrey Stedfast - - * mail-config.c (config_read): Duh, we saved the charset as - "default_charset", not "charset" - no wonder the correct charset - menu item was never being set. - -2001-06-21 Jeffrey Stedfast - - * mail-ops.c (mail_send_message): Temporarily remove the Bcc - header before sending the message. - -2001-06-21 Jon Trowbridge - - * mail-display.c (html_button_press_event): Remove empty "name" - property setting from the popup control. - -2001-06-21 Jeffrey Stedfast - - * mail-callbacks.c (composer_get_message): Allow the message to be - sent even if there are no To recipients but only as long as there - are other recipients defined. - -2001-06-21 Jason Leach - - * component-factory.c (mail_remove_storage): Deregister the - storage from the shell so it will get removed from the folder - tree. - -2001-06-20 Kjartan Maraas - - * folder-browser.c: More than one accel key is a tad - confusing. - -2001-06-19 Jeffrey Stedfast - - * mail-display.c: #include "folder-browser-factory.h" - - * component-factory.c (mail_remove_storage): New function to - remove an EvolutionStorage. - - * mail-accounts.c (mail_delete): Remove the storage from the - folder-tree. - (news_delete): Same. - -2001-06-19 Jeffrey Stedfast - - * component-factory.c (destination_folder_handle_drop): Accept - text/uri-list mime types - this allows us to drag messages from - Nautilus into an Evolution folder. - - * folder-browser.c (message_list_drag_data_get): Do cleanup and - better error handling. - -2001-06-19 Jon Trowbridge - - * mail-tools.c (mail_tool_do_movemail): Properly clean up the - movemail files when no mail was received. - -2001-06-19 Radek Doulik - - * mail-format.c (write_field_row_begin): add column with   - between header name and value - (write_field_row_begin): hmm, use just bold   as it looks - better - -2001-06-18 Jeffrey Stedfast - - * component-factory.c (destination_folder_handle_drop): Use a nice - switch statement and use the new enum values. - - * mail-callbacks.c (list_add_addresses): Now takes a hash table of - already-used-recipients so that we don't get duplicates. - (mail_generate_reply): Pass in a rcpt_hash argument to - list_add_addresses(). These changes fix bug #1639. - -2001-06-18 Dan Winship - - * Makefile.am (evolution_mail_LDADD): Remove DB3_LDADD - -2001-06-18 Jeffrey Stedfast - - * component-factory.c: Change the drop-type "x-evolution-dnd" to - "x-evolution-message" since we want to be able to DnD more than - one data type ;-) - - * folder-browser.c: Change supported DnD drop types to disclude - URI_LIST as that seems to crash Nautilus and seems overly - complicated. Since I am going to be supporting message/rfc822, - hopefully Nautilus can handle that or else maybe something like - text/plain. - (message_list_drag_data_get): Remove the code for URI_LIST. - -2001-06-14 Not Zed - - * mail-tools.c (mail_tool_uri_to_folder): If we have a fragment in - the url, use that as the folder name, and not the path component. - -2001-06-13 Not Zed - - * component-factory.c (mail_load_storages): Added temp hack to let - spool providers show up in the list. - -2001-06-16 Jeffrey Stedfast - - * folder-browser.c (my_folder_browser_init): Allow user's to - "copy" drag & drop rather than just "move". - -2001-06-15 Jeffrey Stedfast - - * component-factory.c (destination_folder_handle_drop): Implemented. - - * message-list.c (message_list_construct): Don't connect to the - DnD signals here. - (message_list_drag_data_get): Removed. - (add_uid): Removed. - - * folder-browser.c (my_folder_browser_init): Connect to DnD signals. - (message_list_drag_data_get): Implemented. - -2001-06-15 Jeffrey Stedfast - - * mail-ops.c (mail_send_message): Fixed misuse of an uninitialized - variable. - - * component-factory.c (destination_folder_handle_drop): Implemented. - - * mail.h: Added prototype for evolution_folder_info_factory_init. - - * mail-ops.c (mail_do_transfer_messages): Now takes a const char* - as the dest_uri. This works better all around since we strdup'd - the string anyway. - -2001-06-15 Dan Winship - - * mail-format.c (mail_format_mime_message): We can't output - "" and "" here because it gets called recursively to - display message/rfc822 subparts. - (mail_format_raw_message): Add padding to match the formatted - display. - - * mail-display.c (mail_display_redisplay): Move rodo's html header - changes from mail_format_mime_message to here. - -2001-06-14 Jeffrey Stedfast - - * folder-browser.c (got_folder): Updated to reflect changes to - mail_config_[g,s]et_thread_list(). - (folder_browser_toggle_threads): Same. - - * folder-browser-factory.c (control_activate): Updated to reflect - changes to mail_config_[g,s]et_thread_list(). - - * mail-config.c (mail_config_write_on_exit): Do cleanup when we're - done. - (mail_config_set_thread_list): Send in a URI so we can save the - state on a per-folder basis. - (mail_config_get_thread_list): Send in a URI so we can retrieve - the state on a per-folder basis. - - * component-factory.c: Setup the accepted_dnd_types. Also added - skeleton code for DnD. - -2001-06-14 Jeffrey Stedfast - - * folder-browser-factory.c: Add Reply-to-List bonobo verbs. - - * folder-browser.c: Add Reply-to-List menu items. - - * mail-callbacks.c (mail_reply): Use an enum for specifying the - reply mode, becaus enow we can reply-to-list. - (reply_to_list): Implement. - (reply_to_sender): Use REPLY_SENDER. - (reply_to_all): Use REPLY_ALL. - (mail_generate_reply): Handle the different modes. - -2001-06-12 JP Rosevear - - * Makefile.am: Remove folder-info.h until iain checks it in - -2001-06-12 Not Zed - - * mail-account-gui.c (source_type_changed): Setup default spool - location same as for mbox mail retrieval. - -2001-06-08 Dan Winship - - * folder-browser-factory.c: fix some commands to match the ui file - again. - -2001-06-07 Iain Holmes - - * GNOME_Evolution_Mail.oaf.in: Add server info for FolderInfo - Remove server info for the Summary server - - * Mail.idl: Add a FolderInfo interface to retreive information about - a mail folder. - - * Makefile.am: Remove the executive summary stuff. Add the folder-info - files. - - * component-factory.c: Remove the mail-summary.h include. - Remove summary_factory. - (summary_fn): Remove. - (component_factory_init): Remove the summary_factory creation. - Initialise the info_factory. - -2001-06-08 Jon Trowbridge - - * mail-ops.c (mail_send_message): Reattach X-Evolution-Account - information to the message after sending it. This way it can - be used to set the identity properly if we later Resend the - message. - - * mail-tools.c (mail_tool_get_local_movemail_path): If you had - multiple accounts that used mboxes, and if you received mail in N - of those accounts, you would get N copies of each of your e-mail - messages. This is because everything was being dumped into one - big file by movemail, and the filters would run on that file N - times. To work around this, each mbox account now gets its own - distinct temporary movemail file. - -2001-06-07 Jon Trowbridge - - * mail-ops.c (fetch_mail_fetch): Pass the original source URI - to camel_filter_driver_filter_mbox. - (mail_send_message): Pass NULL as the orginal source URI - to camel_filter_driver_filter_message. - -2001-06-06 Jon Trowbridge - - * mail-account-gui.c (source_type_changed): Check that the chain - of deferences in gui->account->source->url is safe. This was - causing a segfault when adding a new account if any of the - existing accounts had their sources set to "None". - (i.e. gui->account->source == NULL) - - * mail-accounts.c (load_accounts): Check that account->source != - NULL before dereferencing it. - (load_accounts): The selection is cleared when the account clist - is rebuilt (say after a call to add), but no unselect event is - emitted. Yes, the clist is evil. We work around this by - explictly calling mail_unselect, our unselect signal handler. - (Otherwise, the edit and delete buttons remain sensitive and - accounts_row != 0, but the user can't see which row the dialog - thinks is selected.) - (load_news): Check the account->source != NULL before - dereferencing it. - (mail_unselect): If an insensitive button in a button box has the - focus, and if you hit tab, there is a segfault deep inside of gtk. - This is probably a gtk bug. We work around it by having the add - button (which is always sensitive) grab the focus on an unselect. - -2001-06-05 Jason Leach - - (Fix bug #3211: Should undelete when flagging a delete message as - important) - - * message-list.c (on_click): When flagging a message as important, - check to see if it's flagged as deleted, if so, undelete it. - - (Fix bug #314: Display URLs in statusbar on mouseover) - - * mail-display.c (html_on_url): New function, callback for - GtkHTML's "on_url" signal. - -2001-06-05 Radek Doulik - - * mail-format.c: make HTML and plain mails to have the same - boundary - -2001-06-03 Ettore Perazzoli - - * Makefile.am (evolution_mail_LDADD): Move `$(DB3_LDADD)' before - libeutil. - -2001-06-01 Federico Mena Quintero - - * folder-browser.h (FolderBrowser): Added fields for the - GalViewMenus and GalViewCollection, since we need to keep them - around while the component is active. - - * folder-browser-factory.c (folder_browser_setup_view_menus): Plug - leaks; unref the spec and factory. Set the view collection and - the view menus on the FolderBrowser object. - (folder_browser_discard_view_menus): New function. - (control_deactivate): Discard the menus. - - * folder-browser.c (folder_browser_destroy): Destroy the view - collection and the view menus. - -2001-06-01 Ettore Perazzoli - - * Makefile.am (evolution_mail_LDADD): Add `$(DB3_LDADD)'. - -2001-06-01 Jeffrey Stedfast - - * mail-account-gui.c (mail_account_gui_save): Save the pgp and - smime settings. - (mail_account_gui_new): Setup the pgp and s/mime page (but disable - the s/mime frame if we are not compiled with s/mime support). - - * mail-config.c (account_copy): Updated to save extra pgp and - smime options. - (account_destroy): Free draft/sent folder info and also the new - pgp/smime keys. - (config_read): Read in the pgp and s/mime config options. - (mail_config_write): Save the account pgp and smime options. - -2001-06-01 Jeffrey Stedfast - - * mail-account-gui.c (source_type_changed): Call - build_extra_conf() here too. This is when we REALLY want to call - it anyway, not on switch-page because then we'd lose any data on - the Receive Options page if we never switch to that page before - applying the changes. - - * mail-account-editor.c (construct): Don't connect to the - switch-page event, instead just call build_extra_conf() here with - the source->url. - -2001-06-01 Dan Winship - - * mail-config.c (config_read): Fix dumb misuse of g_get_charset. - -2001-05-31 Jeffrey Stedfast - - * mail-format.c (handle_multipart_signed): Removed the code to - check for the validity of an S/MIME part. Stuff works differently - now. - - * mail-crypto.c: Rewrote how the S/MIME stuff is going to work. - -2001-05-30 Dan Winship - - * mail-config.glade: Rename the "PGP" page back to "Other" and add - a "default charset" option menu. - - * mail-config.c (config_read, mail_config_write_on_exit, - mail_config_get_default_charset, mail_config_set_default_charset): - Handle "default charset". - - * mail-accounts.c (construct): Fill in the "default_charset" menu - with an e_charset_picker menu. - (charset_menu_deactivate): Update the default charset. - -2001-05-29 Jeffrey Stedfast - - * mail-callbacks.c (list_add_addresses): Take another argument to - ignore a certain address. - (mail_generate_reply): Ignore references to the reply-to address - when constructing the Cc list. - -2001-05-29 Jason Leach - - * message-browser.c (message_browser_new): one-line fix for bug - #2536: File->Close in message viewer doesn't work. - (message_browser_new): Also replaced like 4 lines of code with a - one-liner featuring gnome_app_create_toolbar_with_data(). - -2001-05-28 Jason Leach - - * mail-local.c (load_metainfo): Don't need to check if (foo!=NULL) - before doing an xmlFreeDoc(). - -2001-05-28 Dan Winship - - * mail-format.c (write_text_header): Fix a bug that could cause a - crash on messages with an empty subject. Oops. - -2001-05-27 Jeffrey Stedfast - - * message-list.c: Removed the etable spec string. - (message_list_construct): Load the etable spec from a file. - - * folder-browser-factory.c: Load the etable spec from the file, - not a string. - - * Makefile.am: Add message-list.etspec to be installed. - - * message-list.etspec: New file containing the ETable file - specification. - - * mail-config.h: Prototype evolution_mail_config_get_type. - -2001-05-27 Dan Winship - - * folder-browser-factory.c: #include - "evolution-shell-component-utils.h" rather than "e-gui-utils.h" - for e_pixmaps_update. - - * subscribe-dialog.c: Likewise. - -2001-05-26 Jeffrey Stedfast - - * mail-format.c (try_inline_pgp_sig): Fix to work properly. - (handle_multipart_signed): Fixed a bug that caused some - multipart/signed messages to be handled by the multipart_mixed - handler. - -2001-05-25 Jeffrey Stedfast - - * folder-browser-factory.c: Added callbacks for Next/Previous - Unread and Next/Previous Flagged message. - - * mail-callbacks.c (previous_flagged_msg): Implemented. - (next_flagged_msg): Implemented. - -2001-05-26 Dan Winship - - * mail-ops.c (mail_send_message, transfer_messages_transfer, - set_offline_do): When unreffing a folder we got ourselves (as - opposed to one passed in by the caller), sync before unreffing, - since we might be holding the only reference to it. - (mail_refresh_folder): New op, like mail_sync_folder, but does a - camel_folder_refresh_info instead. - - * folder-browser-factory.c (control_activate): Call - mail_refresh_folder, not mail_sync_folder. (The goal is to see new - messages: sync used to work with imap because imap_sync was - broken, but it doesn't work for that any more.) - -2001-05-25 Peter Williams - - * Makefile.am: Reference libeshell.la instead of libeshell.a. - -2001-05-25 Jeffrey Stedfast - - * folder-browser-factory.c (control_activate): Disable Resend on - non-Sent folder FolderBrowsers. Thanks to Wayne Davis for this - patch. - - * component-factory.c (xfer_folder): This code should be correct - now. Still waiting on the shell to do it's job of creating the - metadata xml file in the destination folder though. - -2001-05-24 Jeffrey Stedfast - - * message-list.c (message_list_select_uid): g_strdup the uid into - the ml->cursor_uid. - - * message-browser.c (message_browser_forward_msg): Use the default - forward style. - -2001-05-24 Dan Winship - - * mail-identify.c (mail_identify_mime_part): If the message data - is online, sniff the data for a MIME type first, and use the - filename second. Makes it more reliable, and deals with the - specific case of "application/octet-stream; name=foo.vcf" which - gnome-vfs will identify as vcalendar, but which can also be a - vcard. - -2001-05-24 Jeffrey Stedfast - - * mail-format.c (try_inline_pgp_sig): Only write the message up to - (but not including) the attached signature block. - -2001-05-23 Jeffrey Stedfast - - * mail-callbacks.c (composer_postpone_cb): Don't free the - folder-info here, instead have mail_append_mail() call our new - function, append_mail_cleanup() which'll free the - folder-info. This fixes the problem of send-later segfaulting. - - * message-list.c (message_list_set_folder): Make the message-list - respect the "hide deleted messages" setting. Fixes bug #2248. - - * component-factory.c (xfer_folder): New function that the shell - component calls to copy/move a folder. - (component_fn): Set the xfer_folder_fn argument. - - * mail-ops.c (mail_remove_folder): New async function to remove a - folder. God knows if it does what the ShellComponent needs or not - yet. - (mail_xfer_folder): Yet another yummy async function to move or - copy a folder to a new location. - - * component-factory.c (storage_remove_folder): New function for - removing folders. - (remove_folder): New function that the shell component calls to - delete a folder. - (component_fn): Set the remove_folder_fn argument. - -2001-05-22 Jeffrey Stedfast - - * mail-config.c (mail_config_write_on_exit): Save the - message-display style. - (config_read): Read the message-display style. - -2001-05-22 Dan Winship - - * mail-display.c (on_url_requested): If http mode is - HTTP_SOMETIMES, use e_book_query_address_locally to check the From - address and load images if it's found. - - * mail-config.c (config_read): Default http_mode to - MAIL_CONFIG_HTTP_SOMETIMES. Fix typo to make default forward style - actually work. - -2001-05-22 Jeffrey Stedfast - - * Makefile.am: Use MAILER_CFLAGS and MAILER_LIBS. - - * message-browser.c (message_browser_folder_loaded): Instead of - calling message_list_select_uid() here, instead connect to the - "message_list_loaded" signal since the message-list is not built - yet at this point. - (message_browser_message_list_built): Call - message_list_select_uid() here instead. - - * message-list.c: Lets have a new signal, MESSAGE_LIST_BUILT, that - gets emitted when the message-list has finished being built by one - of the built_*() functions. - (message_list_class_init): Setup the signal stuff. - (regen_list_regened): Emit the signal here (should this perhaps be - moved into each of the build_*() functions instead?). - -2001-05-21 Kjartan Maraas - - * mail-local.c: Mark a string for translation. - -2001-05-18 Jon Trowbridge - - * Makefile.am (evolution_mail_LDADD): Added libebook.la (which is - now required by the composer.) - -2001-05-17 Dan Winship - - * mail-callbacks.c (composer_postpone_cb): mark Outbox messages as - read. - -2001-05-17 Jeffrey Stedfast - - * mail-format.c (mail_write_authenticity): New convenience - function for all signature verification functions to use to - display whether or not the signed part was authentic. - (try_inline_pgp_sig): Use mail_write_authentic(). - (handle_multipart_signed): Add code to handle S/MIME - multipart/signed parts and also use mail_write_authenticity(). - -2001-05-17 Dan Winship - - * mail-config.glade: add new icons from jimmac. - -2001-05-16 Dan Winship - - * mail-format.c (mail_format_raw_message): add - E_TEXT_TO_HTML_ESCAPE_8BIT to the flags - -2001-05-16 Dan Winship - - * folder-browser.c (folder_browser_is_drafts, - folder_browser_is_sent, folder_browser_is_outbox): Functions to - determine if a folderbrowser is one of the drafts, sent, or outbox - folders. - (got_folder): Pass TRUE for the "outgoing" flag to - message_list_set_folder if this is a Sent, Drafts, or Outbox - folder. - - * message-list.c (message_list_set_folder): Take a flag saying - whether or not the folder is an "outgoing" folder. - (message_list_setup_etree): Ditto. Use that rather than a - hardcoded list of foldernames for deciding whether to swap From - and To in the default layout. - - * mail-config.c (mail_config_folder_to_cachename): Make IMAP - folders have unique cachenames rather than only one per store, so - that IMAP Sent and Drafts folders don't get forced into having the - same layout as the INBOX. - - * mail-callbacks.c: (is_sent_folder, is_drafts_folder): Gone. - Replaced with simpler folder_browser_is_* routines. - (edit_msg, resend_msg, open_msg): Use folder_browser_is_* - routines. - - * mail-local.c (reconfigure_clicked): Update call to - message_list_set_folder. - -2001-05-16 Jeffrey Stedfast - - * mail-crypto.c (mail_crypto_is_smime_v3_signed): Removed (this - now exists in camel/camel-smime.c). - (mail_crypto_is_pkcs7_mime): Same. - (mail_crypto_smime_part_sign): new - (mail_crypto_smime_part_verify): new - (mail_crypto_smime_part_encrypt): new - (mail_crypto_smime_part_decrypt): new - (mail_crypto_pgp_mime_part_sign): Added code to set an exception - if the context fails to be created. - (mail_crypto_pgp_mime_part_verify): And here... - (mail_crypto_pgp_mime_part_encrypt): Same. - (mail_crypto_pgp_mime_part_decrypt): And here too. - -2001-05-16 Dan Winship - - * mail-display.c (mail_display_redisplay): Deal with full-header - mode in addition to source mode - - * mail-format.c (write_field_row_begin): Add WRITE_NOCOLUMNS flag - to write the header in a single table cell rather than two. Output - the second columns's "" when not in NOCOLUMNS mode. Don't - include the ":" in the passed-in header name. - (write_date, write_address): Update for write_field_row_begin - changes. - (write_text_field): Genericified and updated from write_subject. - (write_headers): Deal with both normal and full-header mode. - -2001-05-15 Dan Winship - - * mail-display.c (on_url_requested): Load http images if the user - has force-loaded images too. - (mail_display_redisplay): Update for normal/headers/source changes. - (mail_display_load_images): New. Force HTTP image loading for the - current message. - - * mail-config.c (mail_config_get_message_display_style, - mail_config_set_message_display_style): Updated and renamed from - mail_config_{get,set}_view_source - - * mail-callbacks.c (load_images): New. - - * folder-browser.c (folder_browser_set_message_display_style): - Renamed and updated from folder_browser_toggle_view_source. - - * folder-browser-factory.c (verbs): Add ViewLoadImages. - (control_activate): Update for normal/headers/source change to - radio group. - -2001-05-15 Dan Winship - - * folder-browser-factory.c (verbs): Update for changes in - evolution-mail.xml (many commands were renamed to better match the - current menu layout). - (pixcache): Refer to commands via their paths in /commands/ - rather than hardcoding their menu paths. - -2001-05-14 Jon Trowbridge - - * mail-search.c (mail_search_construct): Put frame around dialog - vbox, put mail subject in that frame's label. (Patch by Duncan.) - (mail_search_set_subject): Break out subject-setting code. - Truncate long subjects with ellipses. - -2001-05-14 Duncan Mak - - * mail-search.c (mail_search_construct): set the dialog's - window_icon to jimmac's new find_message.xpm. - -2001-05-13 Iain Holmes - - * Makefile.am: Make the LDADD line longer so it actually compiles - everything correctly. - -2001-05-14 Dan Winship - - * mail-config.glade: Split "Other" page into three pages, Display, - Composer, and PGP. Add HTML image stuff on the Display page and - default forward style on the Composer page. - - * mail-config.c (mail_config_get_default_forward_style, - mail_config_set_default_forward_style): User-specified default - style for forwarding messages. - (config_read, mail_config_write_on_exit): Deal with forward style. - - * mail-accounts.c: Handle HTML image display options and default - forward style. - - * mail-callbacks.c (forward): New. Forward in the user-selected - default style. - (forward_inline, forward_quoted): Simplify these some. Remove the - fallback to forward attached when forwarding multiple messages: it - should just forward the multiple messages inline or quoted in - those cases. (Which it doesn't yet, but that's a bug.) - - * folder-browser.c (context_menu): Remove "Forward inline" and - make "Forward" call forward() rather than forward_attached(). - - * folder-browser-factory.c: Update command/menu/toolbar/pixmap - gunk for the "MessageForwardAttached" vs "MessageForward" split. - - * mail-session.c (mail_session_get_type): - * mail-format.c (format_mime_part): - * mail-account-gui.c (setup_service): Fix warnings. - - * mail-mlist-magic.c: Remove this... it's not used any more. - - * folder-browser.c: - * message-browser.c: Remove references to mail-mlist-magic.h - -2001-05-14 Jon Trowbridge - - * folder-browser.c (folder_browser_config_search): Use secondary - searches here, so that we control the interference between the two - bits of searching UI. - -2001-05-13 Jon Trowbridge - - * mail-search.c (mail_search_construct): Destroy the MailSearch - dialog if the underlying MailDisplay is destroyed. I don't like - the way that label in the dialog with the message subject in it - looks, so I've #ifdef-ed it out for now. Center the Matches - label --- it makes the dialog look more balanced, I think. - (dialog_clicked_cb): Changed to reflect adjusted - ESearchingTokenizer API, using primary searches. - (toggled_case_cb): Use the primary search API. - - * e-searching-tokenizer.c: Make searching routines utf8-friendly. - Rationalize how the match begin/end markup is handled; allow for - begin/end markup that varies by search. Add concept of primary and - secondary matching, to disentangle possible interactions between - search-bar searches and search-dialog searches. - -2001-05-13 Jeffrey Stedfast - - * mail-local.c (mail_local_storage_shutdown): Get rid of this - we - don't need it. - - * component-factory.c (owner_unset_cb): Don't unref the LocalStore - - we don't own a ref on it!! - -2001-05-12 Duncan Mak - - * mail-search.c (begin_cb): Updates the subject on refresh and - sets subject to "Untitled Message" if subject is NULL. - (mail_search_construct): Moved msg_subject to its own GtkLabel, - sets subject to "Untitled Message" if subject is NULL. Give focus - to entry by default. Made in entry run - dialog_clicked_cb by setting gnome_dialog_editable_enters. - -2001-05-12 Gediminas Paulauskas - - * folder-browser-factory.c: load pixmaps for MessageCopy and - MessageForwardAttached. Thanks Wayne Davis - for a patch. - -2001-05-11 Dan Winship - - * mail-display.c (load_http): callback to use GNOME-VFS to load - http data. - (on_url_requested): Handle http: URLs that refer to either MIME - parts or web data. - (mail_display_redisplay_when_loaded): Moved out of - mail_content_loaded and made more generic. - - * mail-format.c (add_url): Handle two different kinds of URLs - (URLs that point to CamelMimeParts and URLs that point to - GByteArrays). - (mail_content_loaded): Use mail_display_redisplay_when_loaded. - (format_mime_part): Renamed from "call_handler_function". Also, - record Content-Location if the part has one. (This is not yet 100% - correct: it doesn't deal with relative URLs at all.) - (handle_text_html): Use Content-Location URL rather than - Content-ID, when available (will help deal with relative URLs once - GtkHTML supports that better). - (etc): Update for changes. - - * mail-config.c (mail_config_get_http_mode, - mail_config_set_http_mode): get/set HTTP image downloading mode. - (config_read, mail_config_write_on_exit): save/load that data. - -2001-05-11 JP Rosevear - - * mail-importer.h: add proto - - * mail-importer.c (mail_importer_uninit): release and unref the - local storage - - * mail-local.c (mail_local_store_finalize): use - bonobo_object_release_unref rather than doing Bonobo_Unknow_unref - and a corba release - (register_folder_registered): "sink" the local_store ref to - prevent circular ref - (mail_local_storage_shutdown): unref the local store - - * mail-local.h: new proto - - * component-factory.c (owner_unset_cb): uninit the importer and - shutdown the local storage - -2001-05-11 Jeffrey Stedfast - - * mail-local.c (mail_local_reconfigure_folder): Set a title on the - window "Reconfigure %s" where %s is the folder name. Also, don't - allow more than one of these type windows to be opened per folder. - - * mail-tools.c (mail_tool_get_folder_name): Fix Danw's kludge to - actually work :-) - -2001-05-11 Martha Burke - - * gui/Makefile.am: sanitize LD_ADDS and CFLAGS so the libtool - lines are shorter (fixes problem on solaries due to sed) - -2001-05-11 Jeffrey Stedfast - - * mail-vfolder.c (vfolder_edit): Don't allow multiple copies of - this to be run at a time. - - * mail-callbacks.c (providers_config): Don't allow multiple copies - of this to be run at a time. - (manage_subscriptions): Same, but this was a tad more kludgy since - we don't gnome_dialog_run_and_close() this one. I had to make the - widget a semi-global variable. yuck :\ - (filter_edit): Same. - -2001-05-11 Jon Trowbridge - - * e-searching-tokenizer.c (e_searching_tokenizer_new): - Remove a snippet of debugging code I left in by mistake. - -2001-05-11 Jeffrey Stedfast - - * mail-callbacks.c (forward_inlined): If the cursor_uid is NULL, - then we can't forward anything so just return. - (forward_quoted): Same. - -2001-05-10 Jon Trowbridge - - * folder-browser.c (folder_browser_config_search): Use the - ESearchingTokenizer to highlight search matches for folder-level - searches. Still mildly broken, but it works for the simple cases. - - * mail-display.c (mail_display_new): Use our ESearchingTokenizer - for the mail display GtkHTML widget. - - * mail-search.c (dialog_clicked_cb): Use the ESearchingTokenizer to - highlight search matches. - (mail_search_construct): Add a match count to the search dialog. - - * e-searching-tokenizer.c - (e_searching_tokenizer_set_search_string): Added. A custom HTML - tokenizer that does highlighting of search strings. - - * mail-config.c: No, we don't want to include - bonobo-running-context.h... just bonobo-context.h. - -2001-05-10 Jeffrey Stedfast - - * mail-config.c: Fix some compiler warnings by including the - correct bonobo headers and by using the correct bonobo types. - (config_read): Some fixes so that we can never have an empty - string as a URL. - -2001-05-10 Dan Winship - - * folder-browser.c (on_key_press): Don't advance to the next - undeleted message after "Delete"... - - * mail-callbacks.c (delete_msg): ...instead, do it here, whether - the user used Delete, Alt+D, or the toolbar. (But only if they - only deleted a single message.) - - * message-list.c (message_list_select): Don't clear the display on - failure. - (build_tree): Clear the display when the currently-selected - message stops existing and we don't have an obvious message to - select instead of it. (Eg, when deleting the last message with - "hide deleted messages" set, or expunging while a deleted message - is selected.) - -2001-05-09 Dan Winship - - * mail-offline-handler.c: New file, started by Ettore, finished by - me, to implement the GNOME_Evolution_Offline interface. - - * Makefile.am (evolution_mail_SOURCES): Add - mail-offline-handler.[ch] - - * mail-ops.c (mail_store_set_offline): Set a store online or - offline. - - * mail-send-recv.c (auto_timeout): Don't run auto-check-for-mail - while the session is offline. - - * component-factory.c (component_fn): Set up offline handler. - -2001-05-09 Christopher James Lahey - - * importers/evolution-mbox-importer.c (load_file_fn): Made a const - char * here. - -2001-05-08 Iain Holmes - - * mail-config.[ch]: Moved all references to the Bonobo stuff into the .c file - -2001-05-08 Iain Holmes - - * mail-callbacks.c (filter_edit): Set the title of the dialog. - - * GNOME_Evolution_Mail.oaf.in: Add a reference for the MailConfig - interface stuff. - - * Mail.idl: Add the MailConfig interface, and a MailFilter interface. - - * component-factory.c (component_factory_init): Call - evolution_mail_config_factory_init. - - * mail-account-gui.c (setup_service): Just return if url == NULL, - don't crash. - - * mail-config.c: #include bonobo-object.h, #include Mail.h and define - the Config factory IID. - Implement the MailConfig interface with a BonoboObject. - (impl_GNOME_Evolution_MailConfig_addAccount): Convert the CORBA struct - into the correct MailConfig structures and add the account. - (evolution_mail_config_class_init): Initialise the class. - (evolution_mail_config_init): This function is intentionally left blank. - - (evolution_mail_config_factory_fn): Create an EvolutionMailConfig object - and return it. - (evolution_mail_config_factory_init): Set up the bonobo factory. - - * mail-config.h: #include bonobo-xobject.h and Mail.h - Declare the object structures. - - * importers/Makefile.am: Remove the intelligent importers. - - * importers/evolution-mbox-importer.c (folder_created_cb): Callback - from when the folder is created. Opens the folder and unrefs the - listener. - (load_file_fn): Create the folder if it doesn't exist. - -2001-05-08 Jeffrey Stedfast - - * mail-tools.c (mail_tool_forward_message): Convert the Subject - header to HTML and also make sure that the Subject, To, and From - header values are non-NULL before feeding them into - e_text_to_html(). - - * mail-callbacks.c (edit_msg_internal): Free the UIDs if the user - decides to not go through with editing all the messages he - selected. - (resend_msg): If the user attempts to resend more than 10 - messages, make sure he really means it. - (do_resend_messages): Richard Zach feels that "Resend" should open - the message(s) in a composer since he might want to edit at least - the recipients (maybe he needs to resend because the message - bounced the first time) and Ettore wants pretty much the same - thing. This makes "Resend" basically the same as "Edit" but for - previously sent messages, whereas "Edit" is only for Drafts. - -2001-05-08 Gediminas Paulauskas - - * mail-search.c: convert search entry to utf8. - - * mail-local.c: d() debugging message. - - * mail-send-recv.c: replace " ..." with "..." - - * Makefile.am: removed EVOLUTION_VERSION. - -2001-05-07 Jeffrey Stedfast - - * mail-account-gui.c: s/HAVE_NSS/HAVE_SSL for the SSL checkbox - stuff. - -2001-05-07 Dan Winship - - * folder-browser.c (my_folder_browser_init): Connect to - key_press_event on the GtkHTML widget. - (etree_key): Only handle space/backspace here, pass the rest off - to on_key_press. - (on_key_press): Handle Delete/N/P/Menu in either MessageList or - MailDisplay. - - * message-list.c (message_list_select): Grab focus if we don't - have it. - -2001-05-03 Dan Winship - - * message-list.c: #include - - * mail-ops.c (get_folderinfo_get): - * subscribe-dialog.c (build_tree): Update for - camel_store_get_folder_info prototype change. - - * mail-format.c (handle_text_plain_flowed): Improve more on the - fix from the other day: the first level of indentation adds blank - lines, but further levels don't... - -2001-04-30 Dan Winship - - * folder-browser.c (folder_browser_destroy): Unhook event handlers - before syncing the folder, since the folder browser will have been - destroyed by the time the sync thread completes and calls the - signal handlers. - -2001-04-29 Dan Winship - - * mail-format.c (handle_text_plain_flowed): Mojo this a bit so - that "\n\n>" gets translated to "
" rather than - "

", since the transition to blockquote mode - creates a blank line itself. Makes Mozilla-generated flowed - replies look better. - -2001-04-27 Dan Winship - - * mail-session.c: Renamed from session.c and made to be a subclass - of CamelSession. - - * mail-mt.c (mail_user_message): Renamed from mail_get_accept and - made more general-purpose, to implement the new - camel_session_alert_user. - -2001-04-26 Jeffrey Stedfast - - * main.c (main): No need to camel_shutdown() anymore... - - * mail-callbacks.c (next_msg): Don't filter on Seen status. - (previous_msg): Same. - (next_unread_msg): New function that does what the old callback - next_msg callback did (only better named). - (previous_unread_msg): Same. - - * message-list.c (hide_load_state): Updated to use camel-file-util - routines. - (hide_save_1): Same. - (hide_save_state): And here too. - -2001-04-26 Dan Winship - - * Makefile.am (INCLUDES): Remove UNICODE_CFLAGS - - * mail-format.c (handle_text_plain_flowed): Use - to mark citations rather than italicizing them, which has never - looked very nice. Now this is more consistent with the non-flowed - case. - -2001-04-26 Jon Trowbridge - - * folder-browser-factory.c: Added "MessageSearch" verb. - - * mail-callbacks.c (search_msg): Added search callback. - (are_you_sure): Added some casts to fix compiler warnings. - - * mail-search.c: Added. A simple search-in-message widget, - that uses GtkHTML's searching capabilities. - -2001-04-25 Dan Winship - - * mail-callbacks.c (are_you_sure): New foot-shooting-prevention - helper function. - (edit_msg_internal, view_msg): If the user has more than 10 - messages selected, ask before opening them all in separate - windows, to protect against misclicks/typos after "select all" - (which we've had at least two reports of now). - -2001-04-25 Radek Doulik - - * mail-tools.c (mail_tool_quote_message): set object data directly - in HTML source - - * mail-callbacks.c (mail_generate_reply): remove \n from citation - (mail_generate_reply): don't use e_msg_composer_mark_text_orig - -2001-04-24 Jeffrey Stedfast - - * folder-browser.c: Added a new signal, "message_loaded" that gets - emitted when the message has been loaded and set on the - mail_display. - (folder_browser_class_init): Define the "message_loaded" signal - stuff. - (done_message_selected): Emit the "message_loaded" signal here. - - * message-browser.c (message_browser_next_msg): Do our own - message-list manipulation. We want the next message, not the next - unread message. - (message_browser_prev_msg): Same here but for previous. - (message_browser_new): Connect to the folder browser's - "message_loaded" signal. - (message_browser_folder_loaded): Don't connect to the - message-list's "message_selected" signal. - (message_browser_message_loaded): Nw callback which replaces the - old message_browser_message_selected callback's functionality. - -2001-04-24 Dan Winship - - * folder-browser.c: Add accelerators to the context menu. - (on_right_click): Use e_tree_get_cell_geometry and a - GtkMenuPositionFunc when responding to a Menu-key press so we can - line the menu up with the selected row rather than the cursor. - - * message-browser.c: include for E_MAKE_TYPE. - -2001-04-23 Jon Trowbridge - - * mail-display.c (html_button_press_event): Check for mailto: - links, and pop up our mail address menu when we find one. - (make_popup_window): The main piece of code (ignoring a zillion - little callbacks) to pop up our windows with reasonable semantics - for having them close automatically. - (mail_text_write): Enable converting addresses to mailto links - in message bodies. - - * mail-format.c (write_address): Simplify code, removing Radek's - hacks. Write out addresses as mailto: links. - -2001-04-23 Jeffrey Stedfast - - * mail-callbacks.c (do_view_message): Use the message-browser - widget rather than the mail-view window. - - * mail-view.c: Removed. - - * folder-browser.c: Added a folder_loaded signal. - - * message-browser.[c,h]: New window to solve all our message - browsing needs. This replaces mail-view.c. - - * message-list.c (message_list_select_uid): New function needed by - the new message-browser window. - -2001-04-23 Dan Winship - - * mail-callbacks.c (save_msg): Append a "/" to the result of - g_get_home_dir so gets the default dir it was supposed to. - -2001-04-22 Jeffrey Stedfast - - * mail-ops.c (mail_send_message): Lets do proper refcounting on - the sent-folder. Also, g_strdup() the sent_folder_uri since we - later free it. If we don't, then we get lovely corrupt memory. - - * mail-crypto.c (mail_crypto_pgp_mime_part_sign): Make sure we - have a context before we try and use it. - -2001-04-22 Gediminas Paulauskas - - * folder-browser.c, mail-autofilter.c, mail-callbacks.c, - mail-ops.c, mail-summary.c, mail-vfolder.c: use system = - EVOLUTION_DATADIR "/file" instead of g_strdup_printf. Rename - userrules to user (and system) to be consistent. - - * mail-send-recv.c: set window icon to send-receive.xpm - -2001-04-21 Gediminas Paulauskas - - * mail-summary.c: translate "Mail summary". - -2001-04-20 Dan Winship - - * mail-config-druid.c (make_default_account): Convert the result - of g_get_real_name() from the locale charset to UTF8. Noted by - Petter Sundlöf (NOT "Petter Sundl_" :) - -2001-04-20 Jeffrey Stedfast - - * mail-config.c (mail_config_set_pgp_type): Use a CamelPgpType. - (mail_config_get_pgp_type): Return a CamelPgpType. - (auto_detect_pgp_variables): auto-detect the user's pgp settings. - -2001-04-20 Dan Winship - - * mail-format.c (handle_text_plain): Fix a dumb thinko in my 04-11 - patch. - -2001-04-20 Kjartan Maraas - - * mail-ops.c: (send_mail_desc): Convert subject from utf8 - before passing it on. - -2001-04-20 Gediminas Paulauskas - - * mail-display.c: #if 0'd out my not-working selection code - -2001-04-19 Dan Winship - - * mail-format.c (mail_format_raw_message): Make this more raw: - don't do URLs and citations. - -2001-04-18 Dan Winship - - * session.c (request_callback): Don't need to dup the string: the - relevant gnome-dialog routine already does. - - * message-list.c (message_list_destroy): Free the uid_nodemap. - (hide_save_state): Free the filename when we're done. - -2001-04-18 Jeffrey Stedfast - - * mail-callbacks.c (is_sent_folder): Implemented. - (resend_msg): Use is_sent_folder(). - -2001-04-17 Dan Winship - - * mail-mt.c (mail_msg_check_error): Fix a memory leak. - -2001-04-16 Ettore Perazzoli - - * importers/Makefile.am (INCLUDES): Add `$(EXTRA_GNOME_CFLAGS)' - here. - -2001-04-15 Jeffrey Stedfast - - * mail-callbacks.c (mark_all_as_seen): Mark the messages as seen, - not unseen. - (is_drafts_folder): New function to attempt to determine if a - folder is a drafts folder. - (open_msg): Use is_drafts_folder(). - (edit_msg): And here. - (edit_msg_internal): New function that doesn't do the drafts - checking and is only to be used internally. This should save us - from having to doubly-check a folder to see if it's a drafts - folder when doing an Open on the message. - (open_msg): Call edit_msg_internal once we've established that the - folder is a drafts folder. - -2001-04-14 Jeffrey Stedfast - - * mail-crypto.c (mail_crypto_pgp_mime_part_verify): Only use - non-NULL contexts. - (mail_crypto_pgp_mime_part_encrypt): Same. - (mail_crypto_pgp_mime_part_decrypt): And here too. - - * mail-format.c (try_inline_pgp_sig): Make sure to not use the - context if it is NULL. - (decode_pgp): Same. - - * folder-browser-factory.c: Added stuff for filtering/vfoldering - on mailinglists. - -2001-04-13 Dan Winship - - * Makefile.am (evolution_mail_LDADD): Remove some redundant LIBS - variables... purify complained that the command line was too - long. :-} - - * mail-account-gui.c: Plug leaks. - - * mail-display.c (on_url_requested): close the html stream on - error too. - - * mail-ops.c (fetch_mail_fetch): Move a line around that probably - doesn't affect anything, but it's correct. - - * session.c (auth_callback): Plug leak. - - * mail-send-recv.c (receive_status): Initialize "now". - -2001-04-13 Christopher James Lahey - - * message-list.c (on_cursor_activated_cmd): Only activate the - message if the cursor has moved. - -2001-04-12 Christopher James Lahey - - * message-list.c (e_mail_address_new): Updated this function to be - a correct full ordering. - (ml_has_get_node_by_id, ml_get_node_by_id): Implemented these - functions. - (find_next_undeleted): Changed this to find next sorted undeleted - message. Also, changed it so that if the current message is not - deleted, it returns NULL. - (build_tree, build_flat): Changed these to only set the cursor if - the cursor is changed. - - * subscribe-dialog.c: Changed this to pass NULL, NULL for - has_get_node_by_id and get_node_by_id. - -2001-04-12 Jeffrey Stedfast - - * session.c (auth_callback): If the service is NULL, just use the - item as the key. - - * mail-crypto.c (mail_crypto_pgp_mime_part_sign): Use the - CamelCipherHash enum. - (mail_crypto_pgp_mime_part_verify): Use a CamelCipherValidity. - - * mail-format.c (try_inline_pgp_sig): Updated to use - CamelCipherValidity instead of CamelPgpValidity. - (handle_multipart_signed): Same. - -2001-04-12 Dan Winship - - * folder-browser.c (do_message_selected, on_message_selected): - Don't printf NULL - - * mail-format.c (mail_part_is_inline): Don't leak memory. - -2001-04-12 Jeffrey Stedfast - - * mail-accounts.c (pgp_path_changed): Updated for changes to PGP - code. - - * component-factory.c (owner_set_cb): Don't init openpgp anymore - because we don't need it. - - * mail-crypto.c: Simply wrap the camel-pgp-mime functions (also - renamed the functions to be prefixed with mail_crypto). - - * mail-format.c (handle_multipart_signed): Update to use - camel_pgp_mime_is_rfc2015_signed() and other camel-pgp-mime - functions. - (handle_multipart_encrypted): Same but for rfc2015_encrypted. - (decode_pgp): Updated to use camel-pgp-context - (try_inline_pgp): Updated to use camel-pgp-context's. - (try_inline_pgp_sig): Same. - -2001-04-11 Dan Winship - - * mail-format.c (handle_text_plain): Only look for special - pseudo-multipart-isms (binhex, uucode, old pgp, etc) if the MIME - type is really text/plain. Otherwise, since there's no handler for - applciation/mac-binhex40, it gets sent to mail-identify.c, which - thinks it's text/plain because it starts with English words, and - so it gets sent back to the text/plain handler, which finds an - embedded binhex part... - - * mail-callbacks.c (do_view_message): mark messages as seen when - opening then in a separate window. - -2001-04-11 Jeffrey Stedfast - - * openpgp-utils.c (openpgp_encrypt): Don't g_free the recipient - array members here because we free them in the caller. - -2001-04-11 Jeffrey Stedfast - - * mail-crypto.c (pgp_mime_part_verify): Huh, somehow I forgot to - apply the from filter when verifying signed parts. Oh well, - probably not all that common. Fixed now though. - -2001-04-11 Jeffrey Stedfast - - * mail-callbacks.c (save_msg): Use the homedir as the default - filename. - -2001-04-11 Christopher James Lahey - - * message-list.c (save_tree_state, message_list_setup_etree): Save - the expanded state using the ETree built in expanded state code. - -2001-04-05 Not Zed - - * Merge from evolution-0-10 to evolution-0-10-merge-0 into head. - -2001-04-04 Kjartan Maraas - - * mail-account-gui.c: Add prototype for service_changed(). - * message-list.h: Remove #include - since it doesn't get installed. - -2001-04-04 Gediminas Paulauskas - - * mail-config-druid.c (create_html): set content type to utf8. - * mail-config.c (mail_config_check_service): fix warning. - * mail-display.c (link_open_in_browser): just call on_link_clicked(). - (link_menu): Open link works. - (link_copy_location): claim selection. - (on_selection_get): new function, selection handler. - (mail_display_new): connect to selection_get. FIXME: does not work. - -2001-04-04 Gediminas Paulauskas - - * component-factory.c: use big trash icon, stolen from mc. - -2001-04-03 Jeffrey Stedfast - - * openpgp-utils.c (openpgp_encrypt): Add --no-tty argument to gpg. - -2001-04-03 Dan Winship - - * folder-browser-factory.c (control_activate): Sync the folder on - activate. - - * session.c (mail_session_remember_password): Use the same - URL-transforming rules we use when hashing the password so this - actually works. - -2001-04-02 Iain Holmes - - * importers/elm-importer.c (elm_can_import): Call is_kmail to check for - KMail files. - (is_kmail): Checks if the given directory is a KMail directory. - -2001-04-02 Iain Holmes - - * importers/elm-importer.c (elm_can_import): Check for some MH files - to make sure that the dir really is an Elm dir. - -2001-04-02 Dan Winship - - * mail-account-gui.c: Add a "provider_type" arg to - MailAccountGuiService. - (transport_needs_auth_toggled): Call service_changed if enabling - the auth pane so the status of the "Check supported types" button - will be correct. - (service_check_supported): Use gsvc->provider_type, not - CAMEL_PROVIDER_STORE. - (mail_account_gui_new): Pass the transport as the user_data to the - "changed" signal on transport.hostname, not the store. - (mail_account_gui_setup): Set up provider_type fields - -2001-04-01 Gediminas Paulauskas - - * component-factory.c: changed vtrash icon to trash. doh - * folder-browser-factory.c: pixmap cache got moved from here to - e-util/e-gui-utils.c. Changed pixmap paths according to file renames. - Added icons for print, get mail, etc., changed get mail icon as Jacub - suggested. - * subscribe-dialog.c: also use new pixmap cache. - -2001-03-30 Dan Winship - - * mail-config.c (check_service_check): Register for cancellation. - (mail_config_check_service): Pop up a modal dialog with a message - and a "Cancel" button for the duration of the check. - -2001-03-30 Iain Holmes - - * importers/evolution-mbox-importer.c (load_file_fn): Check if - foldername is \0. - - * importers/evolution-outlook-importer.c (load_file_fn): Ditto. - -2001-03-30 Jon Trowbridge - - * mail-display.c (mail_text_write): Add (commented-out) - E_TEXT_TO_HTML_CONVERT_ADDRESSES. - - * mail-config.c (mail_config_get_account_by_source_url): - Call e_url_equal to compare URLs. - -2001-03-30 Dan Winship - - * component-factory.c (debug_cb): If the EvolutionShellComponent - emits a "debug" signal, turn on camel_verbose_debug. - -2001-03-30 Radek Doulik - - * mail-display.c (mail_display_redisplay): reset last_active - -2001-03-29 Jon Trowbridge - - * mail-callbacks.c: Added #include to get things - to compile. - - * mail-callbacks.c (mail_generate_reply): Look at the - X-Evolution-Source header, and try to find a corresponding - account. If this works, send the mail from this account. - If not, use the default account. - - * mail-ops.c (send_queue_send): Strip out the X-Evolution-Source - header before sending. - - * mail-config.c (mail_config_get_account_by_source_url): Added. - Look up accounts by source URL. - -2001-03-29 Dan Winship - - * mail-format.c (call_handler_function): if called with a - multipart that's really a 0-part, spew an error and display as - source. - - * message-list.c: #include - - * mail-callbacks.c: #include - for the gnome-print stuff. - - * mail-display.c (pixmap_press): Ignore "funky" button clicks - (like scroll wheel scrolls) - -2001-03-29 Kjartan Maraas - - * *.*: Cleaned up #includes. Remove unneccesary includes of - , , and replaced with more - fine grained headers where needed. Also marked a bunch of - strings for translations and added some missing prototypes. - -2001-03-29 Dan Winship - - * mail-account-editor.c (switch_page): Fix this so the "Receiving - Options" page gets filled in again. - - * mail-send-recv.c (receive_get_folder): Doh! This was storing - "struct _folder_info"s in the cache and then trying to read them - back as CamelFolders. Fixicate. Fixes the "crash with 2 POP - accounts" bug. - - * session.c (auth_callback): Update call to camel_url_to_string. - (Don't include the params in the password hash table key.) - - * mail-config.c (mail_config_folder_to_cachename): Call - camel_url_to_string with HIDE_PASSWORD and HIDE_PARAMS so that - changing URL params doesn't change the cachename. - - * mail-ops.c (add_vtrash_info): - * mail-local.c (reconfigure_folder_reconfigure): - * mail-account-gui.c (save_service): Update calls to - camel_url_to_string. - -2001-04-03 Dan Winship - - * folder-browser-factory.c (control_activate): Sync the folder on - activate. - - * session.c (mail_session_remember_password): Use the same - URL-transforming rules we use when hashing the password so this - actually works. - -2001-04-03 Not Zed - - * mail-ops.c (mail_send_message): Strip header content before using it. - -2001-04-02 Iain Holmes - - * importers/elm-importer.c (elm_can_import): Calls is_kmail to - check for kmail files. - (is_kmail): Checks if the given directory is a KMail directory. - -2001-04-02 Dan Winship - - * mail-account-gui.c: Add a "provider_type" arg to - MailAccountGuiService. - (transport_needs_auth_toggled): Call service_changed if enabling - the auth pane so the status of the "Check supported types" button - will be correct. - (service_check_supported): Use gsvc->provider_type, not - CAMEL_PROVIDER_STORE. - (mail_account_gui_new): Pass the transport as the user_data to the - "changed" signal on transport.hostname, not the store. - (mail_account_gui_setup): Set up provider_type fields - -2001-04-02 Iain Holmes - - * importers/elm-importer.c (elm_can_import): Check for some MH files - to make sure that the dir really is an Elm dir. - -2001-03-30 Not Zed - - * folder-browser.c (folder_browser_toggle_hide_deleted): New - function to listen for hide_deleted changes. - (folder_browser_toggle_hide_deleted): Only svae the hide-deleted - state if we are not setting a trash folder. - - * folder-browser-factory.c (control_activate): Set the - hide_deleted flag appropriately/setup the menu's appropriately. - (control_activate): Workaround to Force setting of options by - bypassing bonobo notification, since it doesn't properly handle - changed components. - - * mail-config.c (mail_config_get_hide_deleted): - (mail_config_set_hide_deleted): New functions for - accessing/setting the hide deleted state. - (mail_config_write_on_exit): - (config_read): Save/load the hide_deleted flag. - - * message-list.c (main_folder_changed): Oops, remember to copy - over all the rest of the changes too if we removed some. - (find_next_undeleted): Find the first undeleted message below us. - This of course does not follow sorting conventions, but thats - etree. Have to ask chris if there is a way to make it work like - that. - (message_list_set_hidedeleted): Check we dont set hide_delete on a - vtrash. - (build_tree): If the message has vanished, try and get the next - undeleted message set, etc, if it still exists. The set_cursor() - function seems very broken but i'm sure e-lahey will get to it - soon. - (build_flat): Similarly for above. - -2001-03-30 Dan Winship - - * mail-config.c (check_service_check): Register for cancellation. - (mail_config_check_service): Pop up a modal dialog with a message - and a "Cancel" button for the duration of the check. - - * component-factory.c (debug_cb): If the EvolutionShellComponent - emits a "debug" signal, turn on camel_verbose_debug. - -2001-03-30 Radek Doulik - - * mail-display.c (mail_display_redisplay): reset last_active - -2001-03-29 Dan Winship - - * mail-format.c (call_handler_function): if called with a - multipart that's really a 0-part, spew an error and display as - source. - - * mail-display.c (pixmap_press): Ignore "funky" button clicks - (like scroll wheel scrolls) - -2001-03-29 Dan Winship - - * mail-account-editor.c (switch_page): Fix this so the "Receiving - Options" page gets filled in again. - - * mail-send-recv.c (receive_get_folder): Doh! This was storing - "struct _folder_info"s in the cache and then trying to read them - back as CamelFolders. Fixicate. Fixes the "crash with 2 POP - accounts" bug. - - * session.c (auth_callback): Update call to camel_url_to_string. - (Don't include the params in the password hash table key.) - - * mail-config.c (mail_config_folder_to_cachename): Call - camel_url_to_string with HIDE_PASSWORD and HIDE_PARAMS so that - changing URL params doesn't change the cachename. - - * mail-ops.c (add_vtrash_info): - * mail-local.c (reconfigure_folder_reconfigure): - * mail-account-gui.c (save_service): Update calls to - camel_url_to_string. - -2001-03-29 Not Zed - - * mail-local.c (init_trash): Create a vtrash folder, not a vee folder. - - * folder-browser-factory.c (control_activate): Hook in the hide - deleted thingy. - Removed MessageHideDeleted menu stuff. - - * message-list.c (message_list_set_hidedeleted): New function, to - set if we should hide deleted messages automatically/always. - (regen_list_regen): If we have hide deleted messages turned on, - then hide them. - (main_message_changed): Promote to a folder_changed event with a - change list, folder_changed has the optimisations to handle this - appropriately. - (main_folder_changed): IF we get changes events for - deleted/undeleted stuff, change to added/removed events, rebuild - if necessary. - (message_list_set_folder): Setup the default hidedeleted state to - be to hide everything unless it is in a vtrash folder. - -2001-03-28 Jeffrey Stedfast - - * mail-account-gui.c (setup_service): Move the - gtk_toggle_button_set_active outside the if. - -2001-03-28 Dan Winship - - * mail-account-gui.c (mail_account_gui_new): Set up the - sent/drafts folder buttons. - (folder_picker_clicked): Pop up the folder selector when sent or - drafts is clicked. - (mail_account_gui_save): Save the sent/drafts folders. - - * mail-config.c (account_copy): copy sent/drafts info - (config_read): read sent/drafts info - (mail_config_write): write sent/drafts info - - * mail-callbacks.c (composer_send_cb, composer_postpone_cb): - split out some common code here (and fix inconsistencies). Always - set headers on the message giving the account name, transport, - and sent folder to use. - - * mail-ops.c (mail_send_message): If the message has an - X-Evolution-Account header, use the transport/sent folder info for - that account (assuming it still exists). Otherwise, if it has - X-Evolution-Transport and/or X-Evolution-Fcc, use those. If not, - use the default transport and sent folder. - FIXME: Falls back silently to the default sent folder if it can't - open the account-specific one... - (send_queue_send): remove the X-Evolution-Transport, etc - processing here, as it gets done by mail_send_message now. - FIXME: We only sync the default sent folder. - - * component-factory.c (owner_set_cb): While setting up the - standard folders, also record their URIs. - -2001-03-27 Jeffrey Stedfast - - * mail-account-editor.c (switch_page): Lets do some NULL checking - here. First, make sure the gsrc isn't NULL and also make sure that - account->source isn't NULL either. - - * mail-account-gui.c (mail_account_gui_setup): If there isn't a - source_proto, make sure we select "None" as the source type. - -2001-03-27 Dan Winship - - * mail-config-druid.c (construct): set the initial druid button - state after doing the mail_account_gui_setup, since that may - invoke signal handlers that will change it. - - * mail-account-gui.c (mail_account_gui_new): Fill in signature and - organization too. - (mail_account_gui_save): Preserve the "enabled" flag on the source. - (save_service): Don't look at authtype if the widget is - insensitive. (Fixes the "smtp://;auth=PLAINservername" bug.) - -2001-03-27 Not Zed - - * mail-send-recv.c (receive_done): Use gnome-dialog-close instead - of object_unref, for some reason it doesn't like being unref'd - with a refcount of 1, _who knows_. Gets rid of that refcount - warning on get mail. - -2001-03-27 Dan Winship - - * mail-config.glade: Probably the very last new config dialog - ever. (Ha ha). From Anna, based on a story by me. - - * mail-account-gui.c: New code for the new mail-config.glade. This - abstracts out all of the common code between the account editor - and the druid. It also handles the spiffy new provider-specific - config stuff. - - FIXME: The code to check if a service is ok or not is no longer - there... waiting until the online/offline stuff from the shell - appears. - - * mail-account-editor.c, mail-config-druid.c: These are much - smaller now, since most of the interesting bits moved to - mail-account-gui.c - - * mail-accounts.c: Add an enabled/disabled column/button to - replace the checkbox that used to be in the editor, because it - really makes more sense to have it out here. This looks ugly. - Probably ought to ETable it... - (load_accounts): Fill in the enabled column. - (mail_select, mail_unselect): toggle the sensitivity and name of - the Enable/Disable button appropriately - (mail_able): Handle the enable/disable button. - - * mail-config.c: Remove reply-to from MailConfigIdentity since it - didn't belong there (and wasn't being saved anyway). - (mail_config_check_service): Simplify this a bit. This really - needs to pop up a dialog with a "connecting..." message and a - cancel button. - - * mail-ops.c (uid_cachename_hack): Kludge, copied+modified from - mail_config_folder_to_cachename to deal with the different - behavior of the URL code now. Will go away when the keep-on-server - code moves. - (get_folderinfo_get): Only pass "subscribed_only" to - camel_store_get_folder_info if the store supports subscriptions... - - * mail-local.c (local_provider): Update this to reflect the - CamelProvider structure change - -2001-03-26 Jeffrey Stedfast - - * mail-callbacks.c (transfer_msg): Add "vtrash" as an allowed mail - folder type. - - * mail-ops.c (transfer_messages_transfer): Updated to reflect - changes made to the move/copy API in camel-folder.c - (add_vtrash_info): Use /Trash as the path instead of Trash. - - * mail-local.c (reconfigure_folder_reconfigure): Updated this too. - -2001-03-20 Not Zed - - * mail-local.c (init_trash): Fixed vfolder_new api. - -2001-03-26 Dan Winship - - * mail-format.c (get_cid): Make fake content-id URLs be guaranteed - unique: the old way (with %p on the CamelMimePart *) would - generate duplicates if memory was freed and re-allocated the right - way. - - * mail-display.c (pixbuf_gen_idle, etc): Make the thumbnail cache - global rather than per-MailDisplay, since content-ids ought to be - globally unique. Also, don't leak content-id strings when the - pixbuf generation fails, and remove pixbufs from the cache after 5 - minutes. - - * component-factory.c (mail_load_storages): Simplify a bit using - camel_session_get_provider. - - * mail-callbacks.c (empty_trash): Ditto, and fix up use of - CamelException. - -2001-03-26 Radek Doulik - - * mail-format.c (write_address): clear name and email data after - each address - -2001-03-25 Dan Winship - - * component-factory.c (unref_standard_folders): Fix a bug in this - that probably would have been noticed sooner if ETree hadn't always - made the mailer crash before you got here. :-) - -2001-03-25 Jeffrey Stedfast - - * mail-account-editor.c (transport_auth_type_changed): Allow the - authtype to be NULL. - (transport_auth_init): If the provider allows authtypes but - doesn't *need* one, create a "None" menu item that the user can - choose. This should fix the bug people have been seeing recently - since dan removed the no_authtype authmech from the smtp provider. - -2001-03-24 Jeffrey Stedfast - - * openpgp-utils.c (openpgp_verify): Default to iso-8859-1 as the - user's charset here if it is undefined. This is a better choice - than us-ascii. - -2001-03-23 Jon Trowbridge - - * mail-display.c (handle_embedded_address_object): #ifdef away - some code I don't quite want to delete yet. - (html_button_press_event): Remove some of Radek's placeholder - code, replace it with code to create my AddressPopup bonobo - control. - - * mail-format.c: Remove some obsolete code that if #ifdef-ed out - a while ago. - - * mail-ops.c (send_queue_send): Strip out the X-Evolution-Identity - header when sending. - -2001-03-23 Christopher James Lahey - - * message-list.c: Turned on BROKEN_ETREE. - -2001-03-22 Iain Holmes - - * importers/evolution-outlook-importer.c: Update for new IDL. - - * importers/evolution-mbox-importer.c: Update for new IDL. - - * importers/Makefile.am: Build the elm importer. - -2001-03-22 Jeffrey Stedfast - - * mail-accounts.c (mail_double_click): New callback to handle a - double-click event in the account clist. - (construct): Setup the double-click event for the account list. - -2001-03-22 Radek Doulik - - * mail-display.c (mail_display_new): connect to button_press_event - and iframe_created events of GtkHTML widget - (html_button_press_event): new signal handler, runs popup on - address fields and on links, later we should add popups for images - and maybe some more? any ideas? - (html_iframe_created): new signal handler, takes care of - connecting to button_press_event of all iframes : plus bunch of - empty methods for popup menu items - to be implemented - (html_motion_notify_event): new handler, highlights addresses by - underline - (html_enter_notify_event): take care of enter event - (update_active): helper function, extracted from - html_motion_notify_event - (update_active): move to absolute coordinates - (html_button_press_event): ditto - - * mail-format.c (write_address): revert back to raw HTML text, - store name and email to Text objects, workaround gtkhtml tables - bug (to be fixed soon ;-) - -2001-03-21 Ettore Perazzoli - - * folder-browser-factory.c (update_pixmaps): Don't return if - loading one image fails. - -2001-03-21 Dan Winship - - * mail-format.c (handle_multipart_related): Fix a bug in (illegal) - 0-part messages - - * mail-config-druid.c (incoming_check, incoming_type_changed, - transport_check, transport_type_changed): * mail-account-editor.c - (transport_type_changed, source_check): Use the new URL part - macros - - * mail-config.c (check_service_check): Use provider authtype list - if not connecting. - -2001-03-20 Miguel de Icaza - - * folder-browser-factory.c: Added new icons. - -2001-03-18 Miguel de Icaza - - * folder-browser-factory.c: Remove duplicated verb. - -2001-03-20 Iain Holmes - - * importers/evolution-mbox-importer.c (process_item_fn): Step the - parser so that it will import more than one message. - -2001-03-20 JP Rosevear - - * importers/Makefile.am: extra dist the oaf files - -2001-03-20 Radek Doulik - - * mail-tools.c (mail_tool_quote_message): set color in html - citation - - * mail-config.c: added citation highlighting configuration - - * mail-tools.c (mail_tool_quote_message): use citation - highlighting - - * mail-display.c (mail_text_write): use citation highlighting - -2001-03-20 Christopher James Lahey - - * folder-browser.c (etree_key): Made this check if the control - mask is set. - -2001-03-20 Christopher James Lahey - - * message-list.c (remove_node_diff, build_flat_diff): Remove the - node before freeing the data it points to. - -2001-03-19 Christopher James Lahey - - * Merged e-tree-rework-branch: - -2001-03-18 Christopher James Lahey - - * message-list.c: Added has_save_id and get_save_id methods. - - * subscribe-dialog.c: Added arguments for - e_tree_memory_callbacks_new of get_save_id and has_save_id to - NULL. - -2001-03-16 Christopher James Lahey - - * message-list.c: Added a call to - e_tree_memory_set_expanded_default to TRUE. Removed all calls to - set_expanded on nodes while the tree is frozen since this fails - miserably now. - -2001-03-13 Christopher James Lahey - - * message-list.c (message_list_get_layout): Turned off draw-grid. - -2001-03-09 Christopher James Lahey - - * folder-browser-factory.c, folder-browser.c, message-list.c, - message-list.h, subscribe-dialog.c, subscribe-dialog.h, - mail-callbacks.c: Converted these all to use ETree instead of - ETable. - -End of branch - -2001-03-19 Iain Holmes - - * importers/pine-importer.c: Pine intelligent mail importer. - - * importer/elm-importer.c: Elm imtelligent mail importer. - - * importer/GNOME_Evolution_Mail_(Pine|Elm)_Intelligent_Importer.oaf.in: - Pine and Elm oafinfo files. - - * importer/netscape-importer.c (maybe_replace_name): Replace some invalid - names with valid ones (Trash -> Netscape-Trash). Change some netscape names - to Evolution names (Unsent Messages -> Outbox). - (scan_dir): Use less variables. - (netscape_import_file): Simplify. - -2001-03-19 Jeffrey Stedfast - - * mail-ops.c: Removed gnome.h and ctype.h - (send_queue_send): Don't remove the X-Evolution header here. - (mail_send_message): Remove it here instead (so we only have to - remove it in one place - no matter if you send a single message or - send_queue. - -2001-03-19 Jeffrey Stedfast - - * mail-format.c (write_headers): Write the date header. - - * component-factory.c (owner_unset_cb): Call - unref_standard_folders() here instead. - - * folder-browser-factory.c: Add Resend Message menu item. - - * folder-browser.c (on_right_click): Add resend to the right-click - menu. - - * mail-callbacks.c (composer_sent_cb): Unref the message. - (composer_postpone_cb): Unref the message here too. - (resend_msg): New callback to allow resending of messages in the - Sent folder. - -2001-03-18 Jeffrey Stedfast - - * component-factory.c (unref_standard_folders): unref the standard - folders. - (owner_set_cb): Use g_atexit() to call unref_standard_folders() - when evolution-mail exits. This should solve the problem where - these folders are not synced when evolution-mail closes (because - they still had refs on them on close). - -2001-03-17 Not Zed - - * mail-mt.c (mail_msg_free): Move the proxy event outside the lock - (otherwise we always deadlock). - - * mail-local.c (reconfigure_clicked): Clear the message list - during update inside the folder thingy. This is a hell mess, need - to move the gui stuff to mail-callbacks and make this reconfigure - thing a more generic func. - - * message-list.c (ml_value_to_string): Cleanup the logic to use - lookup tables. - (sort_uid_to_rows): Removed due to rewrite below. - (build_flat_diff): Changes for node/summary/etc changes. Also do - changed nodes too. - (clear_tree): Free the info reference for nodes in our hashtable. - (build_subtree): Ref the info reference in our hash/tree node. - (on_click): Dont free message info, since we just got our ref to - it. - (remove_node_diff): Free messageinfo off node. - (build_flat): Ref messageinfo. - (message_list_set_folder): Allow a NULL folder to be set - - i.e. clear the view. - (message_list_set_folder): Emit a no message sleeted signal. - (build_tree): Change cursor keeping stuff to work with new info. - - Turned off BROKEN_ETREE - well maybe it'll work. Check for - duplicate messages displayed, etc. - -2001-03-16 Not Zed - - * message-list.h: Added uid_nodemap; mapping of uid's to e-tree - nodes. - - * message-list.c (build_flat): Changed to take a summary argument, - and to store node in node map, etc, and store info's in e-tree. - (build_subtree): Changed to store node in node map, and to store - info's in tree directly. - (ml_tree_value_at): Changed to get info directly from tree node, - removed allocated return value logic. - (ml_tree_value_at): Removed all "fake node" handling, no fake - nodes should ever exist. - (id_is_uid, id_is_subject, id_uid, id_subject): Removed macro's no - longer used. - (new_id_from_uid, new_id_from_subject): Removed no longer used. - (get_message_uid): - (get_message_info): Treat tree node data as messageinfo. - (message_list_select): Dont free the messageinfo, as its part of - our data, not retrieved from folder. - (message_list_drag_data_get): ditto. - (subtree_unread): Treat tree node data as messageinfo. - (subtree_size): ditto. - (subtree_earliest): ditto. - (clear_tree): Reset uid_nodemap on clear. - (save_node_state): tree nodes == messageinfo's. - (add_node_diff): ditto. - (remove_node_diff): ditto. - (main_folder_changed): use uid_nodemap to lookup changed nodes. - (main_message_changed): ditto. - -2001-03-16 Jeffrey Stedfast - - * mail-crypto.c (pgp_mime_part_sign_prepare_part): New function to - prepare the mime part and any subparts for pgp signing. - (pgp_mime_part_sign_restore_part): New convenience function to - undo the prepare_part. - (pgp_mime_part_sign): Don't assume the part passed in is a leaf - part, we could very easily get a multipart (and in fact were which - is why people have been having unexpected results when signing - messages with attachments) and set the encoding as if it were a - leaf part. Use our 2 new convenience functions to set the - encoding(s) instead. - -2001-03-15 Miguel de Icaza - - * folder-browser-factory.c (folder_browser_setup_view_menus): Fix - memory leak. - -2001-03-15 Jeffrey Stedfast - - * mail-account-editor.c (apply_changes): We don't care about SSL, - yea baby... - (apply_changes): Don't care about SSL, no baby... - (construct): Yea, I said we don't care 'bout SSL, baby - (construct): That's exactly what I said, uh huh... - (transport_auth_type_changed): Set the sensitivity of the - user/passwd entries. - (transport_type_changed): If the hostname hasn't been set yet, - just use "localhost" as it doesn't really matter, since all we - need is a valid URL object. - - * mail-config.c: We no longer need `use_ssl' for sources and - transports. - -2001-03-15 Dan Winship - - * mail-display.c (mail_display_redisplay): Remove a stray - camel_object_ref that was causing messages to never be finalized - if they got redisplayed (because of attachments, delayed-loading - IMAP parts, etc) - -2001-03-15 Not Zed - - * folder-browser.c: Added edit item to search-bar menu. - - * mail-callbacks.c (filter_edit): Changed for filter_editor_new() - api addition/change. - - * mail-vfolder.c (vfolder_edit): Use vfolder_editor_new intead. - -2001-03-14 Jeffrey Stedfast - - * session.c (mail_session_init): Tell camel to init NSS. - (mail_session_accept_dialog): Doh! NULL terminate the list of - buttons and show the label. - - * mail-mt.c (do_get_accept): Same. - -2001-03-14 Ettore Perazzoli - - * importers/Makefile.am (INCLUDES): Add `-I$(top_builddir)/shell' - and `-I$(top_srcdir)'. - -2001-03-13 Dan Winship - - * mail-display.c (on_url_requested): Call gtk_html_end() on the - stream so things happen. Fixes a problem with some inline images - (just very small ones maybe?) - - * importers/.cvsignore: create - -2001-03-13 Jeffrey Stedfast - - * session.c (mail_session_init): Call camel_init with the - evolution directory passed in. Also, abort if camel cannot be - initialized. - - * main.c (main): Shutdown camel. - -2001-03-04 Michael Meeks - - * folder-browser-factory.c (free_pixmaps): impl. - (update_pixmaps): accelerate with cache. - -2001-03-13 Iain Holmes - - * Makefile.am: Removed the importers and created a subdirectory - for them to live happily as plugins. - - * mail-importer.c (mail_importer_create_folder): Modified the - function to take a BonoboListener for the callback. - (get_importer_list): Get a list of importer plugins. - (free_importer_list): Free the list of plugins. - (mail_importer_init): Initalise the list of plugins. - (main_importer_uninit): Unload the modules. - - * GNOME_Evolution_Mail.oaf.in: Remove the oaf_server entries for - the importers. - - * importers/*: Copy the importers in here. - -2001-03-12 Jeffrey Stedfast - - * mail-config.c (mail_config_write): Make the transport save - whether or not it's supposed to use SSL as well. - (config_read): Read in whether or not we should remember the - transport password (for those that support SASL). - (mail_config_write): Save whether or not to save transport - passwords (needed for SASL enabled transports). - - * mail-ops.c (add_vtrash_info): Instead of always creating a new - vTrash folder, if the store already has a Trash folder, replace it - with the vTrash. Also, name the folder "Trash" instead of "vTrash" - and i18nify the name. - -2001-03-11 Jeffrey Stedfast - - * mail-ops.h: Added protection. - - * folder-browser-factory.c: Add ActionsEmptyTrash. By the way - - should we rename the bonobo verbs now that our menu structure has - changed? - - * mail-callbacks.c (empty_trash): New callback to empty ALL of the - trash folders. - -2001-03-10 Jeffrey Stedfast - - * mail-ops.c (send_queue_send): Remove our X-Evolution header - before we send. Also don't send messages that are marked for - deletion. - -2001-03-09 Jeffrey Stedfast - - * mail-mt.c (mail_get_accept): New async function that will be - used for SSL certs later. - - * session.c (auth_callback): Changed to return a gpointer value. - (mail_session_accept_dialog): New function to handle the new - _ACCEPT authenticator mode. - -2001-03-08 Jeffrey Stedfast - - * folder-browser-factory.c: Set the Forward->Quoted callback. - Also set the forward->Attachment callback. - - * mail-view.c (view_forward_msg): Specify FORWARD_ATTACHED. - - * mail-callbacks.c (forward_attached): Don't call - forward_messages() anymore...never really needed to. Just handle - it directly. - (forward_inlined): Specify FORWARD_INLINE as the flag argument. - (forward_quoted): New function sorta like forward_inlined except - this forwards the message quoted. - - * mail-tools.c (mail_tool_forward_message): New function to - prepare a message to be forwarded. - -2001-03-08 Jon Trowbridge - - * mail-format.c (write_field_row_begin): Added. Table row HTML - broken out into its own function. - (write_subject): Added. Emits the proper HTML for the subject - line. - (write_field_to_stream): #ifdef-ed out of existence. - (write_address): Take a CamelInternetAddress and spit out an - tag with the appropriate s. - - * mail-display.c (on_object_requested): Check for an "address" - object. If found, call... - (handle_embedded_address_object): ...this function, which creates - an AddressWidget bonobo control and passes in the necessary info. - I never really realized just quite how much GtkHTML kicks ass - until I figured out how to make this work. - -2001-03-08 Jeffrey Stedfast - - * mail-vtrash.[c,h]: Removed from cvs - - * Makefile.am: Removed mail-vtrash.[c,h] - - * main.c: Don't #include "mail-vtrash" anymore. - - * component-factory.c: Add "vtrash" as a folder type we support. - (create_view): Kludgy-kludge around the vtrash type. - (owner_set_cb): Don't create the vTrash folder here anymore... - - * folder-browser.c (on_double_click): Call open_msg here so that - it does the Right Thing (tm). - -2001-03-08 Jeffrey Stedfast - - * mail-local.c (mail_local_store_class_init): Override the default - init_trash() with the our custom one (since MailLocalStore doesn't - let the CamelStore keep a hash of opened folders and instead - keepts track of them itself). - (init_trash): custom implementation of the init_trash method for - MailLocalStores - (get_folder): i18nize. - (register_folder_registered): Don't add the folder to the vtrash - here. - -2001-03-08 Ettore Perazzoli - - * component-factory.c (component_fn): Specify a NULL - `EvolutionShellComponentGetDndSelectionFn'. - -2001-03-07 Jeffrey Stedfast - - * mail-autofilter.c (filter_rule_from_message): Add an action-part - widget. - (filter_rule_from_mlist): Same here. This should get rid of the - problem where people go to create a rule based on a message and - forget to fill-in the action part. - -2001-03-07 Jeffrey Stedfast - - * mail-crypto.c (mail_crypto_is_smime_v3_signed): New function to - decide if a mime part is an S/MIME v3 signed part. - (mail_crypto_is_pkcs7_mime): New function to decide if a mime part - is an application/pkcs7-mime part (or an application/octet-stream - part with application/pkcs7-mime data). - - * mail-account-editor.c (source_auth_init): Move the signal - emittion to after the set_menu call so that it actually works. - (transport_type_changed): Updated to manipulate the user/passwd - fields for the transport. - (construct): Updated to init the user/passwd fields for the - transport. - (transport_auth_init): Renamed. Also fill in the user/passwd - fields if available. - -2001-03-06 Jeffrey Stedfast - - * mail-accounts.c (construct): Disable the NNTP code if NNTP is - not enabled. This prevents some runtime warnings... - - * mail-config-druid.c: Updated to have a transport auth page. - -2001-03-01 Miguel de Icaza - - * folder-browser.c (on_right_click): Move the context menus to - the toplevel code; Use enumerations for the various bitfield - constants. - - Add support for hiding items that are not required (read/unread - and delete/undelete). - - This requires my previous patch, as it assumes "Open" does the - right thing instead of having two operations: Open and Edit. - -2001-02-28 Miguel de Icaza - - * folder-browser.c (on_right_click): Removed draft folders op - here, since open_msg now does the right thing (edit or view). - - * folder-browser-factory.c (update_pixmaps): Removed MessageEdit - from here. - - * mail-callbacks.c (open_msg): New function, does the "right - thing" to a message (either, edit or open). - - * folder-browser-factory.c: Register new command here. - (update_pixmaps): Rename keys that have been shuffled around. - (update_pixmaps): Rename to match new updates on xml file. - - Rename MessageOpenNewWindow to MessageOpen. Change action from - "view_message" to "open_message". - - * mail-callbacks.c (mark_all_as_seen): New command. Marks all - messages as seen. - -2001-03-06 Dan Winship - - * mail-ops.c (get_folderinfo_got): If the folderinfo has no URL - (ie, can't contain messages), don't add it as a vtrash source. - -2001-03-05 Jeffrey Stedfast - - * mail-config-druid.c: Don't access the `active` data member of a - GtkToggleButton directly - bad programming, shame on me. - - * mail-account-editor.c: Same here. - - * mail-accounts.c: And here too. - - * mail-callbacks.c (empty_subject_destroyed): And finally here. - - * mail-crypto.c (pgp_mime_part_sign): Correcty set the mime type - for the multipart. Hmmm, still doesn't wrap correctly. NotZed? - Ideas? - (pgp_mime_part_encrypt): Here too. - -2001-03-03 Not Zed - - * mail-tools.c: Remove very old camel lock stuff. - - * mail-local.c (register_folder_registered): Add the local folder - as a potential vfolder source. - - * folder-browser.c (got_folder): When we have a new folder, - register it as a potential vfolder source. - - * mail-vfolder.c: Added the source rule to the vfolder_info. - (vfolder_refresh): Store the rule in the vfolder info, etc. - (vfolder_register_source): Function to register a newly opened - folder with us. - (vfolder_uri_to_folder): Save the folder in the vfolder_info too. - (source_finalise): Handle clenaup when the folder dies. - -2001-03-02 Not Zed - - * mail-mt.c (set_stop): Check the container is not NIL before - trying to set thje prop. - -2001-03-01 Not Zed - - * folder-browser.c (folder_browser_search_menu_activated): Fixes - for changes to search bar. - (search_save): Removed. - (search_full): Removed. - (search_full_clicked): Removed. - (folder_browser_search_option_items[]): Removed. - (folder_browser_search_query_changed): Changed for search bar - changes. - (folder_browser_clear_search): Removed. - - * mail-vfolder.c (vfolder_clone_rule): New function to clone a - filter/search rule into a matching vfolder rule. - - * mail-send-recv.c (mail_receive_uri): Setup a timeout for status - updates. - (build_dialogue): Setup timeout id for status updates. - (operation_status_timeout): New function to set the status via a - timeout. - (receive_done): Remove the timeout handler if we need to. - (operation_status): - (receive_status): Just update the info, and let the timeout - handler update the gui. - (do_free_status): - (do_show_status): Removed gui thread status message processing. - -2001-02-28 Not Zed - - * folder-browser.c (folder_browser_config_search): New function to - configure the FilterRule for the search mechanism. - -2001-02-27 Not Zed - - * folder-browser.c (folder_browser_gui_init): Setup the search bar - as a filterbar. - (got_folder): Set the whole search bar sensitive or not based on - the search capability of the folder. - - * folder-browser.h: Changed to use efilterbar instead of esearchbar. - -2001-02-27 Jeffrey Stedfast - - * mail-callbacks.c (configure_mail): Return TRUE if the user - configured his/her settings, else return FALSE. - (check_send_configuration): If configure_mail() returns TRUE, then - continue otherwise quit. - (send_receive_mail): Same. - -2001-02-26 Jeffrey Stedfast - - * mail-callbacks.c (mail_generate_reply): Set a "References" - header no matter what if we are able to get a Message-Id. Fixes - bug #1583. - - * mail-accounts.c (mail_delete): Confirm that the user REALLY - wants to delete this account. - (news_delete): Same. - - * mail-ops.c (mail_send_message): Changed the product string - - will change it to use User-Agent once I get the RFC/DRUMS draft or - whatever. Until then I'll stick with X-Mailer. - -2001-02-26 Dan Winship - - * mail-callbacks.c (delete_msg): Mark deleted messages as "seen" - as well so they don't count towards the unread count. - - * mail-view.c (view_delete_msg): ditto - -2001-02-25 Jeffrey Stedfast - - * component-factory.c (owner_set_cb): Re-add the - mail_vtrash_create() hack back in for LocalStores since there's no - better way to register a vTrash folder on the Local Storage yet. - - * mail-local.c (register_folder_registered): Add folders to the - vTrash folder here since the LocalStore does not let the parent - CamelStore class keep it's own hash of the folders. - -2001-02-25 Jeffrey Stedfast - - * session.c (mail_session_forget_password): New function to force - the removal of a given password. - - * openpgp-utils.c (openpgp_decrypt): On failure, forget the - passphrase. - (openpgp_encrypt): Here too. (cleaned this up a bit too) - (openpgp_clearsign): And here. - (openpgp_sign): Again... - - * mail-callbacks.c (composer_postpone_cb): Abort if the message is - NULL (which is valid if an error occured). - (composer_send_cb): Same. - -2001-02-24 Jeffrey Stedfast - - * folder-browser.c: Toss the mail_tool_camel_lock* stuff. - * mail-ops.c: Same. - * mail-summary.c: Here too. - - * mail-tools.c (mail_tool_uri_to_folder_noex): Blown away! - (mail_tool_filter_get_folder_func): *kapoosh* - (mail_tool_camel_lock_up): Same. - (mail_tool_camel_lock_down): Same. - (mail_tool_set_uid_flags): Don't need this rubbish anymore either. - -2001-02-24 Jeffrey Stedfast - - * component-factory.c (mail_load_storages): No longer need to - construct the vTrash here. - (owner_set_cb): Don't make the vTrash for the local store here. - - * mail-ops.c (add_vtrash_info): New function to add a vTrash - folder info to a pre-constructed CamelFolderInfo for use in the - get_folder_info async function. - -2001-02-23 Jeffrey Stedfast - - * main.c (main): No longer need to do a vtrash_cleanup() (it also - doesn't exist anymore). - - * component-factory.c (mail_load_storages): Updated to use the new - vtrash code. - (owner_set_cb): Same. - - * mail-tools.c (mail_tool_uri_to_folder): Update to handle the - "vtrash:" url prefix so that we can extract the REAL uri and know - to get the trash folder. - - * mail-vtrash.c (mail_vtrash_add): Add the vTrash folder to the - EvolutionStorage. - (mail_vtrash_create): Get the store based on the uri (async) and - then call mail_trash_add. - (vtrash_cleanup): Removed. - (vtrash_uri_to_folder): Removed. - (vtrash_create): Replaced by mail_vtrash_create() - -2001-02-23 Iain Holmes - - * component-factory.c (owner_set_cb): Init the importer here. - - * mail-importer.[ch] (mail_importer_create_folder): Add a function - that creates new folders in the shell. - (mail_importer_init): Take in an EvolutionShellClient, and get the - local_storage corba_object from it. - -2001-02-22 Jeffrey Stedfast - - * mail-vtrash.c (create_trash_vfolder): Come up with a unique - store uri for each vtrash (using %p and the CamelStore we're gonna - place it on). - (get_trash_get): Pass in the store so we can use it for %p. - -2001-02-23 Not Zed - - * mail-vfolder.c (vfolder_gui_add_from_mlist): Rule to add mlist - vfolder. - - * mail-autofilter.c (filter_gui_add_for_mailing_list): Removed. - (rule_from_mlist): Build a generic match rule from an mlist. - (vfolder_rule_from_mlist): Setup the vfolder rule for an mlist. - (filter_rule_from_mlist): Setup a filter rule fro an mlist. - (filter_gui_add_from_mlist): GUI thingy to do the work. - - * folder-browser.c (on_right_click): Added vfolder on mailing list - to filter menu. - (on_right_click): Use header_raw_check_mailign_list instead of - mlist magic to get the mailing list name. - (filter_mlist): Changed to use new add_from_mlist() call. - (vfolder_mlist): New function for vfolder from mlist. - - * mail-send-recv.c (build_dialogue): Only allow downloading if the - source is enabled at this time. - (mail_autoreceive_setup): Check for enabled sources before setting - up autodownload. - -2001-02-22 Jeffrey Stedfast - - * mail-accounts.c (construct): Construct the PGP Path - GnomeFileEntry widget. - (pgp_path_changed): Try to auto-detect which PGP type the binary - file is based on the basename (yuck). - -2001-02-23 Not Zed - - * mail-ops.c (create_folder_get): Make op cancellable/report - internals. - (get_folder_get): - (sync_folder_sync): - (get_folderinfo_get): Make op cancellable/report internals. - - * mail-vtrash.c (get_trash_get): Setup the operation registration, - and create a pseudo "start/stop" operation. - (get_trash_free): Free store if we have it. - (get_trash_got): Move vtrash add into here, so we execute in the - right thread. - - * component-factory.c (owner_set_cb): Make trash creation async. - - * mail-local.c (register_folder_desc): A description of what we're - doing. - - * mail-mt.c (mail_msg_new): Set status callback to operation_new. - (mail_operation_status): Operation status function, proxy messages - to main thread, and attempt to present a meaningful ui experience - for operations. - -2001-02-22 Jeffrey Stedfast - - * openpgp-utils.c (openpgp_verify): Fixed memory corruption bug. - - * mail-format.c (try_inline_pgp_sig): Check to make sure the - validity isn't NULL. - (handle_multipart_signed): Check for NULL validities. - -2001-02-21 Jeffrey Stedfast - - * mail-tools.c (mail_tool_uri_to_folder): Protect against NULL - uri's. - - * mail-vtrash.c: Do mutex locking on the global hash table - this - should clear up some segfaults ;-) - - * mail-config-druid.c (druid_finish): Set the 'enabled' member of - the source to TRUE if the URL exists else set to FALSE. - (incoming_type_changed): If the provider chosen is "None" then - gray-out the auto-check widgets and the check-settings, otherwise - sensitize them. - - * mail-account-editor.c (construct): Added a few more settings. - (apply_changes): Save the new settings. - - * mail-config.c (service_copy): Updated. - (config_read): Read in whether or not the account is enabled. - (mail_config_write): Save if the account is enabled or not. - -2001-02-22 Jeffrey Stedfast - - * mail-ops.c (mail_send_message): Updated to reflect changes to - the filter-driver code. - -2001-02-22 Not Zed - - * Makefile.am (CAMEL_OBJS_EXTRA): Removed, no longer link with - libcamelvee. - (evolution_mail_LDADD): Ditto. - - * mail-vtrash.c: Moved camel-vee-store header ot camel levle. - - * mail-tools.c: Moved camel-vee-folder header to camel. - - * mail-local.c (local_storage_new_folder_cb): started hack for - progress reporting, which is currently to the console. - - * mail-mt.c (set_stop): Set the stop button sensitivity. - (mail_msg_received): enable/disable stop button while we're - processing stuff in another thread. - - * message-list.c (ml_tree_value_at): If our uid entry vanishes - before w'ere ready, then make a fake. - -2001-02-21 Jeffrey Stedfast - - * mail-crypto.c (pgp_mime_part_verify): Changed to use - PgpValidity. - - * openpgp-utils.c (openpgp_verify): Return a PgpValidity and set - the description as UTF-8 for later use in mail-format.c when - writing to GtkHTML. - - * mail-format.c (try_inline_pgp_sig): Updated to use the new - PgpValidity code. - (handle_multipart_signed): Updated. - -2001-02-21 Not Zed - - * mail-callbacks.c (composer_postpone_cb): Fix for api changes to - append_mail. - - * Makefile.am (evolution_mail_SOURCES): Removed mail-threads.[ch]. - - * mail-threads.[ch]: Removed. - - * subscribe-dialog.c (subscribe_do_get_store): Chagned to use new - thread stuff. This is really getting boring. - (subscribe_do_subscribe_folder): Changed to use new thread stuff. - Last one at last, phew. - - * session.c (register_callback): Changed to use new thread stuff. - YUCK. I dropped some functionality, now the timeout callback - return is ignored, so basically it keeps running till finished. - - * mail-ops.c (mail_operation_run): Removed, no longer used/needed. - (mail_do_append_mail): Changed to use new thread stuff. - (mail_do_transfer_messages): ditto. - - * mail-local.c (local_storage_new_folder_cb): Use new thread - stuff, also only run synchronous for this operation. - (mail_local_reconfigure_folder): - (reconfigure_clicked): Changed to use new mail thread stuff. - - * mail-config.c (mail_config_check_service): Changed to use new - thread stuff. - -2001-02-20 Dan Winship - - * mail-vtrash.c (get_trash_get): Pass NULL, not "/" for @top. - - * mail-callbacks.c (create_folders): Make this work with - CamelStores where the separator character isn't /. folder_created - and folder_deleted are still broken. - -2001-02-20 Not Zed - - * mail-vtrash.c: Include the camel-vee-store.h header from the - uninstalled copy. - -2001-02-19 Jeffrey Stedfast - - * component-factory.c (mail_load_storages): Create vTrash folders - for all remote stores as well. - -2001-02-20 Not Zed - - * mail-vtrash.c (create_trash_vfolder): Add the auto-update flag - to the folder open flags. - -2001-02-19 Jeffrey Stedfast - - * mail-vfolder.c (mail_vfolder_get_vfolder_storage): New handy - dandy function to ref and return the vfolder storage (will - probably be disavowed once I figure out how to get the vTrash - folder to show up in the EvolutionLocalStorage). - - * main.c (main): Call vtrash_cleanup(). - - * mail-vtrash.c: New file. - (vtrash_uri_to_folder): vtrash: URI handler - (vtrash_create): Replacement async vtrash function for the old one - in mail-ops.c - (vtrash_cleanup): Cleanup code - unrefs the cached vtrash folders - and free's the hashtable. - - * Makefile.am: Added mail-vtrash.[c,h]. - - * mail-tools.c (mail_tool_uri_to_folder): If we have a vtrash: - URI, call the vtrash URI handler function rather than continuing - on. Yes, I know this is a hack and it needs to be fixed. - - * mail-ops.c (mail_do_setup_trash): Removed. - (mail_trash_get): Removed. - - * component-factory.c (owner_set_cb): Create the vTrash folder for - the LocalStore here. - - * mail-local.c (get_folder_info): Implement. - -2001-02-20 Not Zed - - * mail-ops.c (fetch_mail_fetch): Unref the driver here, in the - subthread, so we dont block the gui while it sync's all the - folders. - (fetch_mail_fetched): Rewmoved above code from here. - -2001-02-16 Not Zed - - * mail-send-recv.c (receive_status): Dont do the thaw/freeze set here. - (update_folders): " - - * mail-vfolder.c (vfolder_refresh): Setup the virtual - 'unmatched' folder by default. - (vfolder_uri_to_folder): HAndle UNMATCHED folder specially, it has - no explicit sources. - -2001-02-16 Jeffrey Stedfast - - * mail-send-recv.c (receive_get_folder): Not sure it makes any - difference, but lets ref the folder while the hash table is locked - rather than after we unlock it. - -2001-02-16 Jeffrey Stedfast - - * main.c: * component-factory.c: Reverse the changes I made - yesterday. - -2001-02-15 Jeffrey Stedfast - - * main.c (main): Have the mail-config and openpgp initialize here - instead. - - * component-factory.c (owner_set_cb): No need to have mail-config - and openpgp init here. - -2001-02-15 Jeffrey Stedfast - - * mail-ops.c (do_scan_subfolders): Use mail_storage_create_folder - - * mail-callbacks.c (mail_storage_create_folder): Convenience - function so we can keep all the evolution_storage_add_new_folder() - code in one place as much as possible. - - * subscribe-dialog.c (recursive_add_folder): Use 'name' rather - than the no-description bs since that's what all the other places - do. - - * mail-callbacks.c (folder_created): New callback to handle the - "folder_created" signal - handles CamelFolderInfo's recursively. - (folder_deleted): Same but for "folder_deleted". - - * component-factory.c (storage_create_folder): Instead of doing - the evolution_storage_new_folder() stuff by hand, pass it off to - the new callback: folder_created(). At some point this will be - unecessary as we'll attach this callback to the "folder_created" - signal. - -2001-02-15 Jeffrey Stedfast - - * message-list.c: Wrapped the address compare functions in a - #ifdef - (address_compare): #ifdef the use of the smart address sorting - code and provide a #else for using g_strcasecmp(). - -2001-02-14 Jeffrey Stedfast - - * openpgp-utils.c (openpgp_verify): Add the --no-tty flag. - -2001-02-14 Dan Winship - - * mail-mlist-magic.c: Rewrite explanatory comments to use normal - regexps rather than procmail weirdness. - (check_sender): match "foo-owner" as well as "owner-foo". - (check_list_post): (New) Check for "List-Post: - - * component-factory.c (owner_set_cb): Setup the Trash folder. - - * mail-ops.c (create_trash_vfolder): Do better error handling. - (populate_folder_urls): Oops, helps to strdup the url into the - array if we plan on freeing the data. - (mail_get_trash): New async function that may eventually replace - mail_do_setup_trash(). - (do_setup_trash): Do better error handling. - - * mail-local.c (mail_local_store_class_init): Override - get_folder_info. - (get_folder_info): Implement. - -2001-02-13 Christopher James Lahey - - * mail-local.c (do_reconfigure_folder): Fix some uninitialized - variables. - -2001-02-12 Not Zed - - * message-list.c (build_tree): if doing a full update, save the - cursor pos and restore it afterwards. - (on_cursor_activated_cmd): Copy the current_uid to a new string. - I dont know why this is required, but it is. - (message_list_destroy): Free the cursor_uid as we're done with it. - (build_flat): IF the current uid disappeared from the list, then - unset the message. - (build_tree): Likewise. - -2001-02-12 Jeffrey Stedfast - - * mail-config.c (mail_config_write): Clean out the cruft in the - Accounts section before writing the current accounts out to the - config file. - - * mail-account-editor.c (construct): Strip the leading "/" from - the Namespace/Path entry if the provider doesn't require absolute - pathnames. - -2001-02-12 Kjartan Maraas - - * Makefile.am: xml-i18n-tools setup. - * GNOME_Evolution_Mail.oaf.in: Mark strings for translation. - -2001-02-11 Dan Winship - - * mail-callbacks.[ch]: Re-add non-static forward_messages. - mail-view.c needs it. - -2001-02-11 Jeffrey Stedfast - - * mail-callbacks.c (forward_inlined): Don't leak memory. - (forward_messages): change doinline to be a gboolean argument. - -2001-02-10 Jeffrey Stedfast - - * mail-callbacks.c (list_add_addresses): Check the full list of - IDs instead of just the default id and if we find an address - matching one of the user's ids, then save it. - (mail_generate_reply): Try to guess which account to use based - upon the list of To and Cc addresses and pass that as the 'From' - address to e_msg_composer_set_headers(). - (forward_get_composer): Updated to reflect changes to - e-msg-composer. - -2001-02-11 Gediminas Paulauskas - - * mail-config.glade.h: removed, xml-i18n-extract's the strings itself. - * *.glade: do not output_translatable_strings - * Makefile.am: removed *.glade.h from EXTRA_DIST. - -2001-02-09 Dan Winship - - * mail-local.c: Updates for CamelStore changes, small memory leak - fixes. - (lookup_folder): Removed (and moved into the reconfigure code) - since this method no longer exists in CamelStore. - (do_reconfigure_folder, etc): Update the info in the - MailLocalStore after reconfiguring. - (mail_local_lookup_folder): Removed - - * local-config.glade: fix padding of the label_format - - * message-list.c (ml_tree_value_at): Don't keep message infos - reffed across calls, since this can cause badness after a - reconfigure. Instead, just strdup the needed values and free those - on the next call. - - * mail-tools.c (mail_tool_get_root_of_store): Unused, remove. - (mail_tool_get_inbox): use camel_store_get_inbox. - - * evolution-outlook-importer.c (load_file_fn): - * evolution-mbox-importer.c (load_file_fn): Use - mail_tool_get_local_inbox() instead of mail_importer_get_folder() - - * mail-importer.c (mail_importer_get_folder): Removed - -2001-02-08 Jeffrey Stedfast - - * mail-callbacks.c (mail_generate_reply): New location for this - function. - - * mail-format.c: Removed mail_generate_reply as it's ONLY ever - used in mail-callbacks.c. - - * mail-ops.c (fetch_mail_fetch): Reworked some keep-mail-on-server - logic so that we ALWAYS look for a cached array of UIDs that we - may have downloaded previously so as not to download them again - even if we will be deleting them off the server. This fixes bug - #1344. - -2001-02-09 Not Zed - - * mail-ops.c (filter_folder_free): only free driver, if set. - (fetch_mail_fetched): Unref the driver here, so it can cleanup - before we call the 'done' callback. - - * component-factory.c (owner_set_cb): Add setup for mail - autoreceive stuff. - - * mail-send-recv.c (free_info_data): Free the send info's from teh - active hash, not the running list. - (receive_done): As we finish downloads, remove them and clean them - up, and also close the window. - (mail_autoreceive_setup): New function to setup & maintain - automatic download stuff. - -2001-02-08 Jeffrey Stedfast - - * mail-config-druid.c (construct): Set the sensitivity of the spin - button based on the state of the checkbox. - - * mail-config.c (config_read): Properly do defaults here. - (mail_config_write): Removed some of the settings being saved - here. - (mail_config_write_on_exit): Save those settings here instead. - -2001-02-08 Jeffrey Stedfast - - * mail-display.c (on_object_requested): Cast the CamelMedium to a - CamelMimePart before performing actions on it as if it were a - CamelMimePart. - - * mail-config-druid.c (druid_finish): Save the auto-check settings. - (construct): Initialize auto-check widgets. - (mail_config_druid_get_auto_check): New function - (mail_config_druid_get_auto_check_minutes): New functions - - * mail-config.c (config_read): Read in whether or not to check - every x minutes. - (mail_config_write): Save auto-check config data and SSL. - -2001-02-07 Jeffrey Stedfast - - * mail-autofilter.c (rule_add_subject): Use "contains" because the - subject might be broken into subparts and using the "is" rule will - then fail ;-) - -2001-02-08 Not Zed - - * mail-send-recv.c (mail_send_receive): - (mail_receive_uri): Init active_downloads hash if it hasn't been yet. - -2001-02-07 Not Zed - - * mail-send-recv.c (operation_status): Handle internal camel status return. - (receive_done): Remove active download when done. - (mail_receive_uri): Initiate download of a single source, with no gui. - (build_dialogue): Mark any new items as real active downloads. - (do_show_status): Make the progress bar optional. - -2001-02-06 Not Zed - - * mail-send-recv.c: camel_cancel->camel_operation. - - * mail-ops.old.c: camel_cancel->camel_operation. - - * mail-ops.c: camel_cancel->camel_operation. - - * mail-mt.c: camel_cancel->camel_operation. - - * mail-callbacks.c (stop_threads): camel_cancel->camel_operation. - - * mail-mt.h: CamelCancel->CamelOperation. - -2001-02-07 Jeffrey Stedfast - - * mail-mt.c (set_view_data): Check current_message for NULL - this - fixes a bug running under SunOS (not a major deal tho as it's in a - debug printf). - -2001-02-06 Jeffrey Stedfast - - * mail-config.c (mail_config_write_on_exit): Oops, save the - seen_timeout variable. - -2001-02-06 Christopher James Lahey - - * Makefile.am (evolution_mail_LDADD): Added libmenus.la. - - * folder-browser-factory.c (control_activate): Added GalView menus - here. - - * message-list.c, message-list.h (message_list_get_layout): Made - message_list_get_layout export. - -2001-02-06 Iain Holmes - - * mail-display.c (pixbuf_gen_idle): Set the size of the icon to 24x24 - always. - (button_press): Function to toggle the disposition of an attachment. - (on_object_requested): New way to indicate functions on attachments. - - * message-list.c (hide_load_state): Free the olduid. - -2001-02-06 Jeffrey Stedfast - - * mail-config-druid.c (set_defaults): Updated to checkfor - "(none)". - - * mail-account-editor.c (entry_changed): Make sure the email - address is valid. - - * mail-config-druid.c (identity_check): Check to make sure we have - a valid email address. - (is_email): New function to check a string to see if it's a valid - email address. - -2001-02-05 Jeffrey Stedfast - - * evolution-mbox-importer.c: We are now going to use a file - descriptor and a CamelMimeParser rather than a FILE pointer. - (load_file_fn): Open the file descriptor and initialize the - CamelMimeParser. - (importer_destroy_cb): Unref the mime parser. - (support_format_fn): Use an fd and use a case-insensitive - comparison as well as elimate a buffer overrun. - (process_item_fn): Process 1 CamelMimeMessage per invocation so as - to not lock up Iain's GUI and to work similar to the way Iain - originally coded it. - -2001-02-05 Christopher James Lahey - - * evolution-mbox-importer.c, evolution-mbox-importer.h: Moved - bonobo includes from the .c to the .h. Include - evolution-mbox-importer.h in evolution-mbox-importer.c. - - * evolution-outlook-importer.c, evolution-outlook-importer.h: - Moved bonobo includes from the .c to the .h. Include - evolution-outlook-importer.h in evolution-outlook-importer.c. - - * mail-callbacks.c: Include mail-send-recv.h. - - * mail-local.c (mail_local_lookup_folder): Cast local_store to - CAMEL_STORE. - - * mail-mt.c (mail_msg_cleanup): Make this function static. - - * mail-send-recv.c, mail-send-recv.h: Created mail_send_recv.h. - Included it in mail-send-recv.c. Added a #include - . - (mail_send_receive): Added a cast. - - * mail-summary.c (new_folder_cb, removed_folder_cb, - create_summary_view): Cast the source func in calling g_idle_add. - -2001-02-05 Jeffrey Stedfast - - * mail-format.c (try_inline_pgp_sig): New function to handle - inline pgp-signatures. - - * mail-config-druid.c (construct): Keep track of the CheckSettings - check boxes. - (transport_next): Connect if the user says so. - (incoming_next): Same. Also, don't jump to the next page if - test-settings fails. - -2001-02-05 Jeffrey Stedfast - - * mail-config-druid.c (incoming_next): Updated to not connect when - getting a list of authtypes. - (transport_next): No longer connects - again, this is - useless. Read the apply_changes argument for the reason why. - - * mail-account-editor.c (apply_changes): Updated. Set the - 'connect' argument to FALSE for now, this basically means that the - call is worthless tho so it may be best to either get rid of the - checks altogether or else make it connect. - (source_auth_init): Don't connect here, it's just plain annoying. - (transport_construct_authmenu): Same here. - - * mail-config.c (mail_config_check_service): Now takes a connect - argument. - -2001-02-03 Michael Meeks - - * mail-local.c (load_metainfo): Fix dodgy libxml allocation - pollution, and potential faults on NULL attributes. - -2001-02-02 Not Zed - - * mail-send-recv.c (mail_send_receive): Cleaned up so we dont add - an unecessary level of indenting. - - * message-list.c (ml_tree_value_at): For collapsed tree nodes, - scan the collapses nodes for the unread and status information. - Since we dont really have fake nodes anymore. - -2001-01-30 Ian Campbell - - * message-list.c: Add support for new icons for being - read/unread for fake root messages on threads. - -2001-01-30 Iain Holmes - - * mail-send-recv.c (mail_send_receive): Only allow one send and - receive to be running at once. - (build_dialogue): Set the icon for the window. - - * evolution-mbox-importer.c (support_format_fn): Only compare the first - 5 bytes of the signature. - -2001-01-30 Kjartan Maraas - - * folder-browser.c: Fix typo. - -2001-01-29 Jeffrey Stedfast - - * mail-importer.c (mail_importer_add_line): Cast the - camel_stream_mem_new() to a CamelStreamMem. - -2001-01-29 JP Rosevear - - * main.c: Return efence ifdefs to 0 for solaris build - -2001-01-29 Not Zed - - * message-list.c (tree_equal): Debug function to compare the tree - we think we have, after an incremental update. - (build_tree): Check the tree after we've built it. - (build_tree): Oops, turn on BROKEN_ETREE again. - - * mail-mt.c (mail_get_password): If we are being called from the - main gui thread, then just call the dialogue directly. Ideally we - dont want this anyway but lets handle the case nicely. - (mail_get_password): Try locking around the password request, to - single-queue any password requests. - (mail_msg_init): Push an exit handler to clean it up on completion. - - * mail-send-recv.c (receive_update_got_store): New function called - when the store has been retrieved asynchronously. - (mail_send_receive): Get the store asynchronously. This was - causing problems where the password dialogue would try and be - called from the main thread via a message. - - * mail-ops.c (mail_get_store): New function to get a store - (a)synchronously. More or less taken from subscribe-dialog, which - i will remove later. - (mail_scan_subfolders): Try running the scan subfolder thing - asynchronously, to help startup time. Not sure if this will work, - but presumably the shell can handle the folders appearing later - ok. - -2001-01-28 Jeffrey Stedfast - - * mail-config-druid.c (set_defaults): Turns out that I was wrong - about the g_get_real_name mem leak, god damn glib for not - following the const char* standard. - -2001-01-28 Jeffrey Stedfast - - * mail-config-druid.c (management_prepare): Use UTF-8. - (set_defaults): Use UTF-8 and also fixed a memory leak by freeing - the string returned by g_get_real_name(). - (mail_config_druid_get_account_name): Use UTF-8. - (mail_config_druid_get_full_name): Same. - (mail_config_druid_get_email_address): Same. - (mail_config_druid_get_organization): Same. - - * mail-account-editor.c (apply_changes): Save UTF-8 strings rather - than gtk strings. - (construct): Use the UTF-8 convenience functions to set the gtk - entries for the ID fields. - -2001-01-28 Ettore Perazzoli - - * mail-vfolder.c (vfolder_gui_add_rule): Make the OK button the - default one. - - * mail-search-dialogue.c (mail_search_dialogue_init): Use stock - buttons for OK and Cancel. Make the OK button the default one. - -2001-01-28 Ettore Perazzoli - - * mail-vfolder.c (vfolder_gui_add_rule): Set a default size for - the window so that more rules are visible. - - * mail-search-dialogue.c (mail_search_dialogue_construct): Set a - default size for the window so that more rules are visible. - -2001-01-28 Not Zed - - * mail-display.c (write_data_to_file): Changed to use - mail_save_part to save the data in another thread. - (save_data_cb): Hide the fileselector once we have a button press, - and are saving stuff. - - * mail-ops.c (mail_save_part): New function to save a part content - asynchronously. - -2001-01-27 Christopher James Lahey - - * folder-browser.c (etable_key): Don't handle home and end keys - since %ETable deals with them now. - -2001-01-27 Jeffrey Stedfast - - * message-list.c (address_compare): Protect against NULL address - pointers. - (subject_compare): Same but for subject pointers. - -2001-01-27 Iain Holmes - - * mail-summary.c (create_summary_view): Applied patch from John R Sheets - to fix some warnings. - (idle_check): Fixed the prototype to fix some warnngs as well. - -2001-01-26 Ettore Perazzoli - - * mail-display.c (get_embedded_for_component): Try a control - first, instead of an embeddable. - -2001-01-26 Jeffrey Stedfast - - * subscribe-dialog.c (populate_store_foreach): Check for a NULL - service->url as we obviously can't subscribe to folders on a - non-existant mail source :-) - (subscribe_do_get_store): Check for a NULL url here too, not that - we should need it anymore (due to the above fix) but it doesn't - hurt. Also, should we wait on the thread? Probably doesn't matter. - -2001-01-26 Iain Holmes - - * evolution-outlook-importer.c (load_file_fn): Replace fsetpos with - fseek and use a long instead of fpos_t. - (process_item_fn): Same. - - * mail-importer.h: Add a frozen item to tell when the folder is frozen. - - * evolution-mbox-importer.c (process_item_fn): Fix the blank message. - Set the frozen element. - (importer_destroy_cb): Thaw the folder if frozen. - -2001-01-26 Dan Winship - - * mail-identify.c (mail_identify_mime_part): Fix an uninitialized - variable use. - -2001-01-26 Jason Leach - - (Fixing an old FIXME) - - * component-factory.c (create_vfolder_storage): removing - create_vfolder_storage, replacing call to it with - vfolder_create_storage. - -2001-01-26 Not Zed - - * message-list.c (build_tree): Define BROKEN_ETREE again, till we - get this stuff fixed better. - -2001-01-25 Not Zed - - * folder-browser.c: Moved teh "sender contains" item to the end of - the list, so the gui doesn't suddenly change on everyone. Fixed - the sender-contains search string to be a valid s-exp (ha, didn't - test it even once eh ettore?!) - (search_save): Dont have the sender contains as the default case - (which well, never gets called anyway), oops i guess i should've - reviewed the patch a little more. - -2001-01-26 Ettore Perazzoli - - * folder-browser.c: Add a missing parenthesis to the "from - contains" rule. Also make it the last item instead of the first - one. - -2001-01-25 Iain Holmes - - * component-factory.c (component_factory_init): Init the mail - mail importers. - - * mail-local.[ch] (mail_local_lookup_folder): retrieve the local - folder given by the name. - - * mail-importer.[ch]: Basic functions for all importers to use. - - * evolution-mbox-importer.[ch]: Mbox importer. - -2001-01-25 Jeffrey Stedfast - The following fixes seem to clear up the problem of new mail not - being shown in the Inbox and/or other folders where mail had been - delivered. - - * mail-send-recv.c (build_dialogue): Freeze the inbox. - (receive_get_folder): Freeze folders before dumping them into the - hash table. - (free_folder_info): Thaw the folder. - (free_info_data): Thaw the Inbox. - -2001-01-25 Jason Leach - - (Don't prompt about unsaved changes for replies/forwards that have - not actually been modified) - - * mail-callbacks.c (do_forward_inline): Unset the has_changed for - the message composer. - (do_forward_attach): Same here. - (mail_reply): And here. - -2001-01-25 Dan Winship - - * mail-format.c (mail_content_loaded): Check if a message part's - content is available, and if it's not, queue a thread that will - load it and then queue an idle-handler redisplay of the message. - (call_handler_function): Call mail_content_loaded() on the part - and don't try to display it if it's currently offline. - (get_data_wrapper_text): Simplify a bit - - * mail-display.c (mail_display_queue_redisplay): rename and make - non-static. - (mail_display_redisplay): Use a "new and improved" way of - preserving the GtkHTML scroll location. ("new and improved" is - code for "gross and hackish", but there should be a real interface - for this eventually.) - (on_url_requested): Use mail_content_loaded() and don't write out - offline cid: URLs - - * mail-identify.c (mail_identify_mime_part): Use - mail_content_loaded and don't try to identify the data if it's - offline. - -2001-01-25 Christopher James Lahey - - * message-list.c: Made the message list pay attention to the - "cursor_activated" signal instead of the "cursor_change" signal. - -2001-01-25 Ettore Perazzoli - - * folder-browser-factory.c (update_pixmaps): Set the print icon - for various other items. - (set_pixmap): Be a bit more verbose in the warning message if the - icon isn't found [i.e. report the name of the file too]. - -2001-01-25 Ettore Perazzoli - - * folder-browser-factory.c (update_pixmaps): Set the pixmaps for - the "/menu/Folder/FolderConfig" and "/menu/Settings/SetMailConfig" - items. - (set_pixmap): Don't prepend the "buttons" prefix. - (update_pixmaps): Update accordingly. - -2001-01-24 Not Zed - - * folder-browser.c (search_string[]): Fix the subject match - expression, which was missing a closing ). - - * mail-send-recv.c (do_show_status): Escape any % signs in the - string before setting the format string. - -2001-01-24 Jeffrey Stedfast - - * mail-config.glade: Added a 3rd page to the account editor to - allow users to set their HTML sending preference and also allow - them to change their message status timeout. - - * mail-accounts.c (construct): Added handlers for the send-html - checkbox and for the mark-message-as timeout spinbutton. - -2001-01-23 Jeffrey Stedfast - - * mail-account-editor.c (apply_changes): Save the source and - transport changes whether the user can connect to the host or not. - -2001-01-23 Ettore Perazzoli - - [Applied patch from Tuomas Kuosmanen ] - - * folder-browser.c: Added enum value `ESB_SENDER_CONTAINS' as well - as a "Sender contains" item to the search menu. Also add a - corresponding "(match-all)" rule to the `search_string' array. - (search_save): Handle `ESB_SENDER_CONTAINS' here. - -2001-01-23 Ettore Perazzoli - - * GNOME_Evolution_Mail.oafinfo: Fixed the repo_ids so that they - use the right syntax. - -2001-01-23 Dan Winship - - * folder-browser-factory.c: - * mail-callbacks.c (send_receive_mail): Fix spelling. - -2001-01-24 Not Zed - - * mail-ops.c (fetch_mail_fetch): Set the default folder when - copying to mbox. This is a quick fix, i might need to do a slight - redesign to clean it up. - -2001-01-23 Jeffrey Stedfast - - * mail-send-recv.c (build_dialogue): Make sure the source->url is - not NULL (which is perfectly valid). - (mail_send_receive): Where oh where should my prototype be? - (receive_get_folder): Make sure to ref the folder before you add - it to the hash table. - - * openpgp-utils.c: - * mail-crypto.c: A few minor tweaks. - -2001-01-23 Not Zed - - * message-list.c (build_tree): Try turning off the BROKEN_ETREE - thing. It seems to work ok (better?) now, but if its still broken - i'll remove it again for the next release. - -2001-01-22 Jeffrey Stedfast - - * mail-config-druid.c (set_defaults): Automagically fill in the - user's default transport if he/she has setup previous accounts. - - * mail-format.c (handle_multipart_signed): Just wrote a temp way - of reporting success/fail of PGP/MIME signature verification - status. - -2001-01-22 Iain Holmes - - * evolution-outlook-importer.c: Outlook Express 4 .mbx importer. - - * component-factory.c (component_factory_init): initialise the - outlook importer. - - * GNOME_Evolution_Mail.oafinfo: Add the details for the Outlook - importer. - -2001-01-22 Dan Winship - - * mail-mt.[ch]: make mail_gui_thread non-static. - - * main.c (main): Set up signal handler for SEGV, BUS, FPE - (segv_redirect): if a gnome-segv'ing signal is received in - a thread other than mail_gui_thread, re-deliver it to that - thread to work around a problem with the gnome segv handler. - -2001-01-22 Jeffrey Stedfast - - * mail-format.c (handle_multipart_signed): Fixed to display - subparts (other than the signature part) and started to write a - pretty way to show if the signature verified or not. - -2001-01-23 Not Zed - - * mail-crypto.c (pgp_mime_part_verify): Fix a double-free problem. - -2001-01-22 Jeffrey Stedfast - - * mail-config-druid.c (incoming_type_changed): Oops, danw didn't - know 'provider' could be NULL :-) - -2001-01-22 Dan Winship - - * mail-config-druid.c (incoming_type_changed): Change "Path:" - label to "Namespace:" for IMAP. Use $MAILDIR rather than $MAIL for - Maildir. If $MAIL isn't set, guess. - - * component-factory.c (mail_hash_storage): Function to add a - store/storage mapping. - (add_storage): Use it. - - * mail-vfolder.c (vfolder_uri_to_folder): Use the vfolder name - rather than the string "mbox" (which wasn't ever used for - anything) in the vfolder URL. (Combined with the CamelVeeFolder - change, this makes camel_folder_get_name() return a pretty name - for vfolders now.) Call mail_hash_storage() to record the - CamelVeeStore/vfolder_storage mapping. (Ideally, there'd only be a - single CamelVeeStore... this is just a quick hack.) - - vfolders now display their unread count once you've looked at them - once. - -2001-01-22 Dan Winship - - * mail-tools.h: s/filter-driver.h/camel-filter-driver.h/ and - update first arg of mail_too_filter_get_folder_func - - * mail-tools.c (mail_tool_filter_get_folder_func): Update first - arg to CamelFilterDriver * - - * mail-send-recv.c (receive_status): - * mail-ops.c (send_queue_send): s/FILTER/CAMEL_FILTER/ - - * mail-callbacks.c: Remove filter-driver.h include - - * mail-accounts.c: Put the news functions inside #ifdef - ENABLE_NNTP to prevent warnings about unused statis functions. - - * subscribe-dialog.c (subscribe_folders, unsubscribe_folders, - subscribe_refresh_list): Update prototype to match BONOBO_UI_VERB. - (populate_store_list): add a de-constifying cast - -2001-01-22 Not Zed - - * .cvsignore: Added temp profiling files. - - * component-factory.c (owner_set_cb): remove a warning with - conditional news compilation. - - * mail-ops.h: Cleaned up the header list. - -2001-01-22 Jeffrey Stedfast - - * mail-crypto.c (mail_crypto_is_rfc2015_signed): Helps if I spell - stuff correctly so it can pass the tests ;-) - -2001-01-22 Not Zed - - * folder-browser-factory.c: Replace the old get_send mail with the - new one (button). - - * mail-ops.c (set_x_mailer): - (mail_load_evolution_rule_context): - (mail_do_fetch_mail): - (mail_do_filter_ondemand): - (mail_send_mail_old): - (mail_do_send_queue): All removed, (for) now lives in mail-send-recv.c. - (load_context): - (setup_filter_driver): - (filter_get_folder): - (mail_filter_folder): - (mail_fetch_mail): - (mail_update_subfolders): - (mail_send_mail): - (mail_send_queue): New equivalents of all these fundtions, moved - from mail-send-recv.c ... - (mail_filter_on_demand): Moved here too. - (mail_load_filter_context): Export this. - - * mail-callbacks.c (apply_filters): Use the new - mail_filter_on_demand() call. - (send_receieve_mail): Use mail_send_receive to do the work. Add a - little error handling here that used to be elsewhere. - (send_queued_mail): Removed. - (fetch_mail): Removed. - (select_first_unread): #ifdef'd this out. Not sure if this still - makes sense, but it doesn't get run right now anyway. - (composer_postpone_cb): Fix the setting of message flags. You - dont need to get them first, ever. - - * mail-send-recv.c (mail_send_message): Dont use - mail_tool_send_via_transport anymore (it does nothing useful). - - * mail-tools.c (mail_tool_camel_lock_up): Turned into a noop. - (mail_tool_camel_lock_down): And here too. - (mail_tool_move_folder_contents): Removed from the code (hasn't - bene used for ages). - (mail_tool_send_via_transport): Removed, it doesn't save anything. - -2001-01-21 Jeffrey Stedfast - - * component-factory.c (owner_set_cb): Initialize OpenPGP. - - * openpgp-utils.c (openpgp_init): No longer takes a passphrase - callback, we'll just use the mail-session one. Makes life simpler. - (pgp_get_passphrase): Use mail_session_request_dialog(). - - * mail-ops.c (do_send_queue): Remove the X-Evolution header before - we send. - - * mail-crypto.c (pgp_mime_part_sign): Don't forget to unref the - filters. - (pgp_mime_part_verify): Same. - (pgp_mime_part_encrypt): Same. - (pgp_mime_part_decrypt): Take NotZed's advice and use - camel_stream_mem_new_with_buffer instead of writing to a new - stream_mem. Also use camel_data_wrapper_construct_from_stream - instead of creating a parser and using that. - -2001-01-21 Jeffrey Stedfast - - * mail-crypto.c: Updated header comment and fixed some ref/unref - count problems in the various functions. Also fixed some other - little things. - (pgp_mime_part_encrypt): Do some canonical CRLF action before - encrypting. - (pgp_mime_part_sign): Make sure we are the owners of the byte - array. - (pgp_mime_part_verify): Same. - (pgp_mime_part_encrypt): Same. - (pgp_mime_part_decrypt): Same. - -2001-01-21 Christopher James Lahey - - * message-list.c (message_list_get_layout): Added - draw-focus="true" and selection-mode="browse" attributes to the - ETableSpecification. - (message_list_construct): Removed setting the "draw_focus" - argument since it doesn't exist any more. - -2001-01-21 Not Zed - - * mail-mt.c (mail_msg_new): Init a cancel field in the message. - (mail_msg_free): Free it. - (mail_msg_cancel): New function to attempt to cancel an operation - by id. Impelementation functions can still be uncancellable by - not registering for cancellation, etc, or do it themselves as - well. - - * mail-send-recv.c (fetch_mail_filter_folder): set folder_uid's - properly, so we can save it later. - (filter_folder_filter): Renamed from fetch_mail_filter_folder, - since its going to be used for all filtering. - (mail_fetch_mail): Changed from mail_filter_mail. - (mail_filter_folder): New function, replaces - mail_do_filter_ondemand functionality. - (mail_filter_on_demand): New function, actually replaces - mail_do_filter_ondemand. - (receive_get_folder): Added an exception arg. - (mail_send_message): New function to just send a message. - (send_mail_send): Use mail_send_message. - (send_queue_send): New send qeue code, use mail_send_message, and - clean up some stuff. - (mail_send_receive): Changed from mail_receive. - (build_dialogue): Setup the sending data, as well. - (mail_update_subfolders): New function to update folder info. - (send_mail_send): hook into cancellation if we want. - -2001-01-20 Jeffrey Stedfast - - * mail-ops.c (do_send_queue): Strip leading space from the - transport url gotten from the message. - -2001-01-19 Jeffrey Stedfast - - * mail-format.c (mail_generate_reply): If the name is empty - string, use the address. - -2001-01-19 Dan Winship - - * mail-display.c (pixmap_press): Update for e_popup_menu_run - change. - - * folder-browser.c (etable_key): On GDK_Menu (the menu key on - 105-key keyboards), pop up the right-click menu. - (on_right_click): update for e_popup_menu_run change. - - * subscribe-dialog.c (recursive_add_folder): New function to add a - folder and any parents of it that don't yet exist. Fixes bugzilla - #1028. - -2001-01-19 Not Zed - - * mail-send-recv.c: New swanky send/recieve thingy, well it so far - only receives (pop/mbox). Ignore all the warnings for now, and - the ugly 'button' to run it. - -2001-01-18 Jeffrey Stedfast - - * folder-browser-factory.c: Added the next/previous toolbar - buttons. - - * mail-callbacks.c (next_msg): New callback so we can have a next - toolbar button. - (previous_msg): Same but for previous. - -2001-01-17 Jeffrey Stedfast - - * mail-account-editor.c (construct): Anna's dialog now supports - SSL so we can get rid of the ssl-support checks. Also work around - the fact that Anna's dialog doesn't have an optionmenu for the - transport type, it's a label instead. - (transport_type_init): Cast the transport_type widget to a - GtkOptionMenu where appropriate as the widget that stores it is - now generic. - (apply_changes): Modify code to work with anna's dialog...*sigh* - (ok_clicked): Alert the user that one or more servers failed to - validate and allow him to continue anyway. - -2001-01-17 Jeffrey Stedfast - - * mail-config.c (mail_config_set_pgp_path): New config function to - set the path to the pgp binary. - (mail_config_get_pgp_path): Gee I wonder... - (mail_config_set_pgp_type): This one sets the type (ie PGP5, PGP2, - or GnuPG - see openpgp-utils.h for values) - (mail_config_get_pgp_type): Der. - -2001-01-17 Jeffrey Stedfast - - * mail-account-editor.c (construct): Handle NULL source and, while - we're at it, transport URLs. Apparently camel_url_new() and/or - camel-url_free() don't handle NULL input well. - - * mail-accounts.c (load_accounts): Handle NULL source URLs. - -2001-01-17 Jeffrey Stedfast - - * mail-account-editor.c (construct): Oops. "url && url->host" - doesn't do much without the '?' and ':' ;-) - -2001-01-17 Ettore Perazzoli - - * mail-ops.c (set_x_mailer): New function. - (send_mail_send): Use it. - (do_send_queue): Use it. - -2001-01-17 Martin Norbäck - - * openpgp-utils.c (pgp_get_passphrase): Changed the word entry - to enter, which is the correct word to use. - -2001-01-17 Jeffrey Stedfast - - * mail-callbacks.c (ask_confirm_for_empty_subject): Update to use - EMessageBox and to record if the user doesn't want to ever see - this dialog again. - - * mail-config.c (mail_config_get_prompt_empty_subject): New config - function. - (mail_config_set_prompt_empty_subject): Another new one. - -2001-01-16 Jeffrey Stedfast - - * mail-account-editor.c (apply_changes): Modify to be able to - handle a NULL source_url. - (source_auth_init): Allow for a NULL source url. - (source_check): Same. - - * mail-config.c (mail_config_write): Allow for NULL source - URLs. And while we're at it, NULL transport URLs as well. Might as - well save the use_ssl variable too. - (config_read): Same. - - * mail-config-druid.c (druid_finish): Modify to allow a NULL - source url. - (incoming_next): Modify to check for a NULL source and jump to the - transport page if one is encountered (this means the user decided - not to config a source). - (incoming_type_changed): Modify to set all widgets insensitive if - the user selected the "None" source menu item (aka NULL provider). - (incoming_check): Modify to allow the user to go to the next page - when he/she has chosen "None" for their source type. - (mail_config_druid_get_source_url): Return NULL if the provider is - NULL. - (mail_config_druid_get_transport_url): Same. - -2001-01-16 Dan Winship - - * mail-display.c (on_object_requested): Don't do thumbnails for - offline images - -2001-01-16 Jeffrey Stedfast - - * mail-callbacks.c (save_msg_ok): If the user hits "No", then - don't destroy the filesel window. - - * mail-ops.c (save_messages_save): Open with mode 0666 as danw - suggests. - -2001-01-16 Chris Toshok - - * component-factory.c (owner_set_cb): only load the news storage - if ENABLE_NNTP. - - * mail-accounts.c (construct): if !ENABLE_NNTP, remove the news - page from the dialog. - -2001-01-16 Radek Doulik - - * mail-format.c (mail_generate_reply): use - e_msg_composer_mark_text_orig - -2001-01-16 Dan Winship - - * mail-ops.c (send_mail_send, do_send_queue): Update the X-Mailer - header to use the string specified by configure. - -2001-01-16 Jason Leach - - * subscribe-dialog.c: removed unecessary #inlcude "e-title-bar.h" - -2001-01-16 Jason Leach - - * openpgp-utils.c (pgp_get_passphrase): Fix a string causing - translation problems. Bug #1147. - -2001-01-16 Not Zed - - * mail-ops.c (mail_do_fetch_mail): Setup a cancellation handle. - (do_fetch_mail): REgister for cancellation here. - (cleanup_fetch_mail): And unregister for cancellation here. - (mail_get_message): Add a cancel handle. - (get_message_get): Register/deregister for cancel. - (get_message_free): & clean up. - - * mail-mt.c (mail_msg_received): Removed debuggng. - - * mail-callbacks.c (stop_threads): Callback for stopping. - - * folder-browser-factory.c: Add a stop button verb thingy. - (control_activate): Disable the stop button by default. - -2001-01-15 Christopher James Lahey - - * message-list.c, message-list.h: Change from using filters for - date and size to using e_cell_date and e_cell_size. Moved a bunch - of includes from the message-list.h to the message-list.c. - -2001-01-15 Miguel de Icaza - - * mail-callbacks.c (configure_mail): Set the default button to - `Yes' here. - -2001-01-13 Jeffrey Stedfast - - * mail-account-editor.c (source_auth_init): If the preferred - authmech isn't found, default to the first one in the list. - (transport_construct_authmenu): This function already did the - above but I made it simpler. - (apply_changes): A number of cleanups. - -2001-01-13 Jeffrey Stedfast - - * mail-config-druid.c (druid_finish): Fixed mail_load_storages to - make a mini GSList of the account, not the account->source. Oops. - - * mail-accounts.c (news_delete): Updated to use the remove_news() - function. - - * mail-config.c (mail_config_remove_news): New convenience - function for removing news accounts. - (mail_config_remove_account): Pretty much the same thing. - - * mail-ops.c (do_send_queue): Get the X-Evolution-Transport URL - and use that if it exists, else fall back on the default - transport. - - * mail-callbacks.c (composer_postpone_cb): Set an - X-Evolution-Transport header. - -2001-01-12 Jeffrey Stedfast - - * Makefile.am: Removed GPG_* variables. - - * component-factory.c (mail_load_storages): Now takes a - 'is_account_data' variable to specify whether the sources is a - list of accounts of a list of services. Basically, the only time - you should pass in FALSE is when you are setting up NNTP storages. - (add_storage): Now takes a 'name' argument that specifies the name - to use in the storage. - (owner_set_cb): Updated to pass TRUE for accounts and FALSE for - news servers into mail_load_storages. - -2001-01-12 Christopher James Lahey - - * message-list.c: Changed filter_date and filter_size to match the - changes in gal. - -2001-01-12 Jeffrey Stedfast - - * mail-config.glade: Anna's dialogs. - - * mail-config.c (mail_config_get_account_by_address): - Removed. Danw and I decided on setting a X-Evolution-Transport - header on messages going to the Outbox so we can later guess which - transport to use when sending it. - - * mail-account-editor.c (apply_changes): Update to some day be - able to support SSL. - (construct): Update for Anna's dialogs... - - * subscribe-dialog.c (populate_store_list): Updated to reflect - past changes to the mail-config API. - -2001-01-12 Jeffrey Stedfast - - * mail-callbacks.c (composer_send_cb): Get the account by using - the new e_msg_composer_get_preferred_account() function. Also - check to make sure everything is configured (in case they deleted - their accounts while composing mail?). - - * mail-config.c (mail_config_get_account_by_address): New - convenience function. - -2001-01-12 Ettore Perazzoli - - * component-factory.c (component_fn): Pass NULL as the - @copy_folder_fn arg to `evolution_shell_component_new()'. - - * folder-browser.c (on_right_click): Removed hide menu. It - belongs to the view menu now. - -2001-01-12 Miguel de Icaza - - * message-list.c: Add strings for localization - - * folder-browser.c: Rename "Save" to "Store search as vFolder". - -2001-01-11 Miguel de Icaza - - * mail-display.c (on_object_requested): Unref the property bag - when we are done with it. - (get_embedded_for_component): Moved the code to request the - embeddable/control to a separate function. - -2001-01-12 Jeffrey Stedfast - - * mail-config.c (mail_config_get_account_by_name): New convenience - function that I will need later when I redo the composer From - field. - - * mail-display.c (on_object_requested): Update to reflect past - changes to the mail-config API. - - * session.c (mail_session_set_password): strdup() the key. - - * mail-config-druid.c (construct): We don't want to be able to set - the reply-to in the config druid. - (druid_finish): Don't set a reply-to anymore. - (mail_config_druid_finalise): Don't unref the providers. - - * mail-config.glade: Took out the Reply-To field in the druid. - -2001-01-11 Miguel de Icaza - - * mail-config-druid.c (incoming_type_changed): Guess the default - MAIL value for MBOX and Maildir files. - - * mail-callbacks.c (configure_mail): Force finalization of the - function before returning fixing the FIXME that was there. - -2001-01-11 Jeffrey Stedfast - - * mail-config-druid.c (transport_next): If the service_check - fails, pop-up a warning dialog letting the user know he or she may - have problems and then let them continue on with their lives. - (incoming_next): Same (+ jump them over the auth page to the - transport page). - - * mail-account-editor.c (apply_changes): Eek! Don't destroy the - account if the connection fails, duh. This is what is causing the - segfaults. - -2001-01-11 Dan Winship - - * folder-browser.c (got_folder): Connect to folder_changed as well - as message_changed for updating unread count - -2001-01-10 Miguel de Icaza - - * GNOME_Evolution_Mail.oafinfo: Add Bonobo/ItemContainer as the - set of supported interfaces in GNOME_Evolution_Mail_Composer - component. - -2001-01-11 Dan Winship - - * mail-format.c (write_field_to_stream): Translate the header name - to UTF8. - -2001-01-10 Jeffrey Stedfast - - * mail-callbacks.c (configure_mail): New function that explains to - the user why he can't do the action he requested and then procedes - to ask if he'd like to configure his accounts now. - (check_send_configuration): If the user doesn't have configured - accounts, don't let him continue and call configure_mail(). - (fetch_mail): Same. - (send_queued_mail): Same. - (send_receieve_mail): Same. - - * mail-config.c (mail_config_write): Don't save a "is_configured" - variable. Instead we'll just check to see if we have accounts - if - yes, then configured == TRUE. - (mail_config_is_configured): return accounts != NULL. - (mail_config_get_default_account): Mark the first account as the - default if none are marked. - -2001-01-10 Jeffrey Stedfast - - * mail-account-editor.c (source_auth_type_changed): Set the - sensitivity of the Password label too. - - * mail-config-druid.c (transport_back): New callback to handle - when the user hits the "back" button when on the transport - page. This is needed to handle the case where we don't want to - show the user the auth page (due to there being no auth choices). - (incoming_next): If we are going to skip over the auth page, set - the 'have_auth_page' variable to FALSE. - (construct): Initialize the have_auth_page to TRUE. - -2001-01-10 Jeffrey Stedfast - - * mail-config-druid.c (incoming_type_changed): Grab the focus of - the first widget that is sensitive. - (transport_type_changed): Same. - (identity_prepare): Grab the focus of the name entry. - - * mail-callbacks.c (send_queued_mail): Prevent Federico's segfault. - -2001-01-10 Jeffrey Stedfast - - * mail-config-druid.c (auth_type_changed): Clear the password - entry if it's not allowed. - (transport_type_changed): Clear the hostname if it is not allowed - by the provider type. - - * mail-account-editor.c (transport_type_changed): If the hostname - is allowed, clear it. - - * mail-config-druid.c (incoming_type_changed): Clear the contents - of the entry boxes that are not to be used. - (mail_config_druid_get_source_url): If the text in the entry is - emptry string, don't set it' contents in the url. - -2001-01-10 Miguel de Icaza - - * mail-callbacks.c (print_msg): Fix proto. - (print_preview_msg): Fix proto. - - * subscribe-dialog.c: Remove more UNSAFE macros. - -2001-01-09 Jason Leach - - * mail-display.c (pixmap_press): Bugfix for #1077: scrollwheel - doesn't work while hovering over an attachment icon. - -2001-01-09 Jeffrey Stedfast - - * mail-config-druid.glade: Moved to mail-config.glade - - * mail-accounts.c (construct): Updated to use mail-config.glade. - - * mail-account-editor.c (construct): Updated to use - mail-config.glade. - - * mail-config-druid.c (construct): Updated to use - mail-config.glade. - - * mail.h: Added the new mail config headers. - -2001-01-09 Dan Winship - - * mail-local.c (local_folder_changed_proxy): Change - mail_op_forward_event to mail_proxy_event. - -2001-01-09 Jeffrey Stedfast - - * mail-ops.c (save_messages_save): Let the system umask determine - the permissions of this file. - - * mail-config-druid.c (incoming_type_changed): Gray out the - appropriate labels too. - (auth_type_changed): And here. - (transport_type_changed): Here too... - - * mail-account-editor.c (source_check): Gray out the appropriate - labels too. - (transport_type_changed): And here too. - -2001-01-09 Jeffrey Stedfast - - * mail-account-editor.c: For all optionmenu's, set the appropriate - 'history'. - (keep_mail_check): Set the keep-on-server checkbutton sensitivity - based on whether or not the store is a storage or not. - (construct): Call keep_mail_check(). - - * mail-config-druid.c (incoming_type_changed): Set the - keep-on-server checkbutton sensitivity based on whether or not the - store is a storage or not. - - * mail-accounts.c (construct): Make sure the dialog isn't a - scrunched little thingy. - -2001-01-09 Dan Winship - - * Makefile.am (evolution_mail_LDFLAGS): Add -export-dynamic, so - libglade can resolve evolution-mail symbols. - -2001-01-09 Jeffrey Stedfast - - * mail-format.c: Updated. - (decode_pgp): Get rid of #ifdef PGP_PROGRAM's and handle - appropriately. - (handle_multipart_signed): Same. - (handle_multipart_encrypted): Same. - - * Makefile.am: Added openpgp-utils.[c,h] to the build. - - * openpgp-utils.c: New source file containing all of the pgp - interface code. - - * mail-crypto.c: Removed all of the openpgp funtions as they are - being moved to a new file. - (mail_crypto_is_rfc2015_signed): Renamed. - (mail_crypto_is_rfc2015_encrypted): Renamed. - -2001-01-09 Jeffrey Stedfast - - * session.c (mail_session_set_password): New function to set the - password for a given url. - - * mail-config-druid.c (druid_finish): Don't save the password in - the source url, instead insert it into the save-password hash. - (mail_config_druid_get_source_url): Check to make sure the - authmech isn't "", if it is then don't set the authmech. - - * mail-account-editor.c (apply_changes): Don't save the password - in the source url, instead insert it into the save-password - hash. Also check to make sure we don't set an empty string as the - authmech for the source or transport. - - * mail-accounts.c (mail_default): After reloading the accounts, - reselect the previously selected account. - (mail_delete): Same. - - * mail-config-druid.c (druid_cancel): Fixed segfault bug. - -2001-01-09 Radek Doulik - - * mail-format.c (write_headers): remove

- (handle_text_plain): add  
before - msg text - (handle_text_plain_flowed): ditto - -2001-01-09 Jeffrey Stedfast - - * mail-accounts.c (mail_default): Write the config data and reload - the accounts list so the "default" tag is relocated. - (mail_delete): Write the config data here too. - -2001-01-08 Jeffrey Stedfast - - * Makefile.am: - * component-factory.c: - * folder-browser-factory.c: - * folder-browser.c: - * mail-accounts.[c,h]: - * mail-account-editor.[c,h]: - * mail-callbacks.c: - * mail-config.[c,h]: - * mail-config-druid.[c,h]: - * mail-config-druid.glade: - * mail-display.c: - * mail-format.c: - * mail-tools.c: Brand spankin' new config druid, editor, - and manager. - -2001-01-08 Dan Winship - - * mail-ops.c: Add an #include - -2001-01-08 Jeffrey Stedfast - - * Makefile.am: - * component-factory.c: - * folder-browser-factory.c: - * folder-browser.c: - * mail-callbacks.c: - * mail-config.[c,h]: - * mail-display.c: - * mail-format.c: - * mail-tools.c: Reverted mail-config changes temporarily until - I get it working correctly. - -2001-01-08 Jeffrey Stedfast - - * mail-config-druid.c: More lovely fixes... - - * mail-callbacks.c: Don't segfault if a default account doesn't - exist. - -2001-01-08 Jeffrey Stedfast - - * mail-config-druid.c: A bunch of fixes. - - * mail-accounts.c: More fixes... - - * mail-account-editor.c (construct): Reparent the notebook to the - editor->vbox and set the resize policy. - -2001-01-07 Jeffrey Stedfast - - * mail-callbacks.c (providers_config): Use a - gnome_dialog_run_and_close(). - - * mail-accounts.c (construct): Reparent the notebook to the - dialog->vbox not to the dialog itself. Also set the resize policy - to allow the user to stretch it. - -2001-01-07 Jeffrey Stedfast - - * mail-tools.c (mail_tool_quote_message): Updated to reflect - changes to the mail-config API. - - * mail-display.c (redisplay): Updated to reflect changes to the - mail-config API. - - * mail-callbacks.c (providers_config): Use the new account dialog. - - * mail-config-druid.c (druid_finish): Load the new storage into - the shell. - (mail_config_druid_new): Take a shell argument. - - * mail-format.c (mail_generate_reply): Updated to reflect changes - to the mail-config API. - - * mail-config-druid.c: Fixed this to build. - - * mail-callbacks.c (check_send_configuration): Updated to reflect - changes to the mail-config API. - (create_msg_composer): Same. - (forward_get_composer): Same. - (send_queued_mail): Same. - (composer_send_cb): Same. - - * mail-account-editor.c: Updated to build cleanly. * - mail-config-druid.c: Same. * mail-accounts.c: Same. - - * folder-browser-factory.c (control_activate): Updated for API - changes in mail-config. - - * folder-browser.c (done_message_selected): Updated for API - changed in mail-config. - (folder_browser_gui_init): Same. - (got_folder): Same. - - * component-factory.c (owner_set_cb): After using the sources - list, free it as it is no longer a const GSList as with the older - mail-config code. - - * mail-config.c: Totally rewritten. - -2001-01-07 Jeffrey Stedfast - - * mail-accounts.c (mail_edit): Implemented. - - * mail-account-editor.c (apply_clicked): Implemented. - (ok_clicked): Implemented. - (cancel_clicked): Implemented. - (source_auth_type_changed): Implemented. - (source_auth_init): Implemented. - (transport_construct_authmenu): Implemented. - (transport_type_changed): Updated to change regenerate the auth - option menu. - (construct): Attached callbacks to OK, Apply and Cancel buttons. - - * mail-account-editor.c (source_auth_init): Use the new - mail_config_check_service(). - - * mail-config-druid.c: Remove check_service() as it will be moved - into mail-config. - -2001-01-06 Christopher James Lahey - - * message-list.c (message_list_select): Made it so that going to - the next or previous message in the list will at least move one - message, even if the current message matches the query. This - makes 'n' go to the next unread message, even if the current - message is unread. - -2001-01-06 Jeffrey Stedfast - - * mail-account-editor.c: Coded a bunch of the methods. - -2001-01-04 Iain Holmes - - * mail-summary.c (idle_check): Check if the HTML for the current - summary has been created, and if not then keep trying until it - has. - (new_folder_cb) - (removed_folder_cb) - (create_summary_view): Use the idle_check function to generate the - summary. - (create_summary_view): Don't set the HTML here. Set it via the - pipe. - -2001-01-05 Jeffrey Stedfast - - * mail-account-editor.[c,h]: New source files to provide an - account editor widget. - - * mail-config-druid.c (auth_type_changed): Set the authproto on - the druid so we can look it up later. - -2001-01-05 Jeffrey Stedfast - - * mail-accounts.c (mail_add): Since the druid now handles adding - the new account to the config, we'll just connect to the destroy - event and show the druid. - (mail_add_finished): Just reload the account list here. - - * mail-config-druid.c (druid_finish): New callback to handle the - "finish" signal. On second thought, it seems it would be best for - the finish callback to be here rather than in mail-accounts.c. - - * mail-accounts.[c,h]: Added. Contains source for the Account manager - window. And just like mail-config-druid.c, it's not yet complete. - - * mail-config-druid.c (mail_config_druid_get_incoming_keep_mail): - Renamed from _delete_mail - (mail_config_druid_get_transport_url): New convenience function - that replaces the get_hostname, get_protocol, etc. - (mail_config_druid_get_source_url): Same. - - * mail-config-druid.glade: Changed "Delete mail from server" to - "Keep mail on server" as this has a more positive ring to it. Both - I and Aaron agree this is the better phrase. - -2001-01-04 Jeffrey Stedfast - - * mail-config-druid.c: Fixed a few 'Oops'es. - - * mail-config-druid.glade: Added a "Default" button for marking an - account as the default. - -2001-01-04 Jeffrey Stedfast - - * mail-config-druid.glade: Updated. What else can I say? - -2001-01-04 Dan Winship - - * folder-browser.c (got_folder): Connect to "message_changed" on - the folder if it's on a remote storage. - (update_unread_count): Update the folder unread count / highlight - in the shell when the unread message count changes - -2001-01-04 Not Zed - - * mail-ops.c (mail_do_send_mail): Removed old implementation. - - * folder-browser.c (do_message_selected): If we haven't got a real - uid, then clear the display instead. - - * message-list.c (message_list_drag_data_get): Use new save - message function, and also wait for it to finish before - continuing. - (folder_changed): - (message_changed): Use mail_proxy_event instead of - mail_do_forward. - (mail_regen_list): New iplementation to replace the old. - : remove from headers. Dont define timeit by default. - (main_folder_changed): - (message_list_set_folder): - (message_list_set_threaded): - (message_list_set_search): - (message_list_hide_add): - (message_list_hide_uids): - (message_list_hide_clear): Use mail_regen_list instead of - mail_do_regenerate_messagelist. - (mail_do_regenerate_messagelist): Removed the old stuff. No - functionality changed yet, just using different thread stuff. - - * mail-callbacks.c (save_msg_ok): Use new save message function. - - * component-factory.c (create_view): - (add_storage): Use mail_scan_subfolders to build the folder info. - (create_folder): Use new implementation with our own callback. - (owner_set_cb): Changed b ack to use mail_get_folder, but now wait - for it to finish. This will let any gui still run, but also gives - us the required synchronous operation. - (got_folder): Callback for when the folder has been opened. - - * mail-ops.c (mail_get_folderinfo): New function to just get the - folder info in another thread. - (mail_scan_subfolders): New scan subfolder implementation that - uses mail_get_folderinfo. - (mail_do_scan_subfolders): Removed old implementation. - (mail_create_folder): Nerw implementation to create a folder, only. - (mail_do_create_folder): Removed old implementation. - (mail_save_messages): New implementation, fixes a couple of minor - problems, and now provides a return so it can be waited on. Also - check that the writes worked, etc. - (mail_do_save_messages): Remove previous implementation. - (mail_do_flag_messages): Removed, nothing uses it. - (mail_do_flag_messages): Removed, nothing uses it anymore. - (mail_get_folder): REturn the operation id, so callers can wait - for it. - (sync_folder_desc): - (expunge_folder_desc): Add describe functions so we know what its - doing. - (mail_send_mail): More generic implementation of sending mail. - - * mail-mt.c (mail_msg_new): Lock around seq increment. And insert - each new message into a hash table of active messages. - (mail_msg_init): Init the active message table. - (mail_msg_free): Remove the message from the active message table. - (mail_msg_wait): New function, waits for a message to be - processed, by id. - (mail_msg_check_error): Dont display the error if it is a - user-cancelled operation. - (mail_proxy_event): new implementation of mail_op_forward_event. - Only real difference is it uses the new thread stuff, and you can - wait for it to finish if you want. - (mail_proxy_event): If we're already in the main thread, just call - the function. - -2001-01-03 Jeffrey Stedfast - - * mail-config-druid.c: New source file that implements - mail-config-druid. Note: this is not yet complete. - -2001-01-03 Not Zed - - * mail-view.c (view_forward_msg): Call - mail-callbacks.c:forward_messages(), so the behaviour is the same - as from the folder browser. - - * mail-callbacks.c (forward_messages): New function to forward - messages, attached or not. - (forward_inlined): Changed to use new forward-messages - implementation. - (forward_attached): Likewise. - (do_forward_attach): Callback for forwarding as attachment, once - we have built it. - (do_forward_inline): Likewise, for inline, once we have retrieved - the message. - (forward_message): Removed. - - * mail-ops.c (mail_build_attachment): New function to build an - attachment of messages. - (mail_do_attach_message): Removed, functionality superceeded by - above. - (mail_do_forward_message): Removed. Likewise. - (mail_create_folder): Started work on an alternative - implementation of create_folder, but not sure about it yet. - - * mail-tools.c (mail_tool_generate_forward_subject): Remove locking. - (mail_tool_make_message_attachment): Free the description when done. - -2001-01-03 Radek Doulik - - * mail-format.c (write_headers): add font color setting for table, - changed border behavior - - * mail-display.c (redisplay): don't set body bg and text color - -2001-01-02 Not Zed - - * mail-callbacks.c (view_msg): Fix for mail_get_message change, - use queue thread. - - * folder-browser.c (done_message_selected): Fix mail_Get_message - calls, use new thread. - (do_message_selected): " - - * mail-ops.c (mail_get_message): Add a thread argument so callers - can specify which queue it executes on. - - * mail-mt.c (mail_msg_free): Fix a free order problem. - (mail_msg_destroy): Call mail_msg_free to do the work. - (mail_msgport_replied): " - (mail_msgport_replied): Check/display errors if we get them. - (mail_msgport_received): If we have a describe function, say what - we're doing, also set busy/unbusy. - (mail_msgport_replied): Clear busy when we get a reply. - (mail_get_password): Unset busy. - (mail_msg_received): Set busy as we go. - (mail_msg_destroy): Unset busy when done. - (mail_status): Blah blah, new status interface, the other wans't - workable with the way the shell api works. - -2000-12-29 Not Zed - - * folder-browser.c (do_message_selected): If we are reconfiguring, - just keep polling till we are done (yeah kinda shitty, but easy). - (folder_browser_set_uri): Clear reconfigure flag here. ick. - (got_folder): And here too. - (on_right_click): Remove locking. - (hide_sender): and here too. - (hide_subject): And here. - (on_right_click): If we are in reconfigure, then the whole menu is disabled. - - * mail-mt.c (status_busy_timeout): Clear the status_busy_timeout_id. - - * mail-local.c (local_storage_new_folder_cb): Made getting folders - completely synchronous. The shell expects it, and it was only - synchronous before by a sideeffect. - (do_reconfigure_folder): Remove locking stuff. - (do_reconfigure_folder): Use our own much simpler copying routine - than that stupid move_folder_contents thing. - (update_progress): Use mail_status_message() instead. - (do_reconfigure_folder): Set the reconfigure flag during - reconfigure & set busy flag. - (cleanup_reconfigure_folder): clear busy flag. - - * mail-tools.c (mail_tool_uri_to_folder): Remove the tool_lock - stuff. - (mail_tool_uri_to_folder_noex): Clear exception on exit. - (mail_tool_move_folder_contents): Get rid of this really stupid - function that is only used in one place. - - * component-factory.c (owner_set_cb): Use direct calls to get the - folders, as this code must run synchronous. Remove the event wait - stuff. - - * mail-callbacks.c (edit_msg): Call mail_get_messages, and create - the composers ourself. - (do_edit_messages): get_messages callback, create the composers - and connect to signals we need. - (view_msg): Dont call do_view_messages, just call - mail_get_messge for each to get them in parallel. - (do_view_message): view a single message. - - * mail-ops.c (mail_edit_messages): Just use mail_get_messages - for this operation. Removed the other async operation stuff. - Changed my mind, just removed entirely. - (mail_do_view_messages): Removed. - (mail_do_setup_folder): Removed. - (mail_do_scan_subfolders): Make this run synchronously, as every - caller expects it to (even if they didn't realise). - -2000-12-28 Not Zed - - * mail-callbacks.c (send_queued_mail): Dont expunge the folder - here, but in send_queue, otherwise it might execute out of order. - (expunge_folder): Remove the talbe prechange stuff, and infact - references to the message_list folder, as we have our own folder. - Also, dont allow expunge if we're already expunging. - (expunged_folder): Clkear the expunging flag if we're finished. - - * folder-browser-factory.c (control_deactivate): Likewise here. - Hrm, i thought this function required a callback, silly me. - - * mail-tools.c (mail_tool_make_message_attachment): Remov e - locking. - - * folder-browser.c (on_message_selected): Use a timeout handler so - we dont select immediately. - (folder_browser_set_uri): Changed to use mail_get_folder. - (got_folder): New callback called when get_folder is finished. - (folder_browser_destroy): Use new sync interface. - - * mail-ops.c (mail_get_message): New function to asynchrounously - get a message. - : #define out mail_tool_camel_lock stuff entirely. - (mail_get_folder): New function to asynchrounously get a folder. - (mail_do_load_folder): Removed, replaced by more generic function - above. - (mail_do_display_message): Removed, replaced by the more generic - funciton get_message. - (mail_get_messages): New function to get a list of messages - asynchronously. - (mail_sync_folder): New interface to sync a folder async. - (mail_expunge_folder): New interface for expunging folder, with - callback. - (do_send_queue): Remove lock stuff, and expunge if (and only if) - successful, also sync the sent folder while we're at it. - - * session.c (mail_session_request_dialog): Changed to use new - mail_get_password call. - - * mail-mt.[ch]: New threading/interthread messaging framework. - - * main.c (main): Init the message/thread system. - -2001-01-02 Dan Winship - - * mail-format.c (mail_part_is_inline): - (find_preferred_alternative): - * mail-display.c (launch_cb): Use header_content_type_simple, not - header_content_type_format. - -2000-12-26 Jeffrey Stedfast - - * mail-crypto.c (mail_crypto_openpgp_verify): Implemented. - -2000-12-23 Jeffrey Stedfast - - * mail-ops.c (mail_do_setup_trash): New function similar to - mail_do_setup_folder() except that this creates the Trash VFolder - (special-case). - -2000-12-21 Jeffrey Stedfast - - * mail-ops.c (do_send_mail): Don't free info inside the last - if-statement, if sent_folder doesn't exist we'll have a memory - leak. Instead free it afterward. - -2000-12-29 Dan Winship - - * mail-crypto.c: Oops. Update this for CamelContentType stuff too. - -2000-12-28 Dan Winship - - * mail-format.c (mail_part_is_inline, mail_get_message_body): Use - CamelContentType, and use header_content_type_is instead of doing - it by hand. - - (handle_text_plain): - (handle_multipart_related): - (find_preferred_alternative): - (handle_message_external_body): Use CamelContentType and - header_content_type_* functions instead of GMimeContentField. - - * mail-display.c (write_data_to_file, launch_cb): Use - CamelContentType and header_content_type_* functions instead of - GMimeContentField. - -2000-12-26 Iain Holmes - - * mail-display.c (mail_display_init): Initialise the thumbnail cache. - (mail_display_destroy): Free the cache. - (pixbuf_gen_idle): Check the cache for a pixbuf, add the pixbuf to the - cache if it's not there. - -2000-12-26 Iain Holmes - - * mail-summary.c (create_summary_view): Create a shared - BonoboEventSource object and use it for all the objects that - aggregate Bonobo::EventSource. - -2000-12-27 Dan Winship - - * subscribe-dialog.c (setup_subscribe_folder): Use info->name, not - input->full_name. Fixes #1029 in bugzilla.helixcode.com. - ({setup,do,cleanup}_subscribe_folder): Update previous fix: Jeff - had changed it to use ->full_name instead of ->name because that's - what camel_store_subscribe_folder needed. So we need to have - *both* names available, one for Camel, one for the shell. - -2000-12-24 Christopher James Lahey - - * message-list.c (filter_date): Changed this to format times in 12 - hour time instead of 24 hour time. - -2000-12-24 Christopher James Lahey - - * message-list.c (filter_date): Changed this to do different - formatting of dates within the last week. - -2000-12-24 Not Zed - - * Merge from camel-mt-branch. - -2000-12-23 Christopher James Lahey - - * message-list.c (filter_date): Changed this to do different - formatting of dates based on the current time. - -2000-12-23 Christopher James Lahey - - * message-list.c (message_list_get_layout): Added titles to the - pixbuf columns. - -2000-12-21 Iain Holmes - - * mail-summary.c: Added code to detect and regenerate the summary - when a new vfolder is created or removed. - - * mail-vfolder.c: Export the vfolder_storage variable, so that - the summary can add a listener to it. - -2000-12-05 Iain Holmes - - * component-factory.c (factory_destroy): Wait till all views have - gone and then destroy both factories. - -2000-12-21 Dan Winship - - * mail-display.c (pixbuf_for_mime_type): Deal with the possibility - that we have an icon-filename listed for a MIME type, but the icon - file doesn't actually exist. Also, if gnome-unknown.png can't be - found, fall back. Might fix a crash people have been reporting... - -2000-12-18 Chris Toshok - - * mail-format.c (handle_multipart_encrypted): for now #ifdef - PGP_PROGRAM falling back to handle_multipart_mixed. - (handle_multipart_signed): same. - -2000-12-18 Dan Winship - - * message-list.c (hide_save_state): Unlock camel when done to - prevent a hang later. - -2000-12-18 Miguel de Icaza - - * mail-tools.c (mail_tool_move_folder_contents): Only update - display every 2 seconds. - - * mail-ops.c (do_view_messages): Only update display every 2 seconds. - -2000-12-23 Not Zed - - * message-list.h (MessageList): Add a specific hide data lock. - - * message-list.c (message_list_drag_data_get): Do not use - cursor_uid, but get all currentlys elected messages directly off - the message-list. - (message_list_destroy): Removed mail_tool_camel_lock stuff. - (on_click): " - (message_list_hide_add, message_list_hide_uids, hide_load_state, - hide_save_state, message_list_hide_clear): ", but use a specfic - lock for the hide data. - (do_regenerate_messagelist): remove mail_tool_camel_lock stuff, - add hide_lock where required. - (message_list_init): Setup the hide_lock. - (message_list_destroy): Free the hide_lock. - -2000-12-22 Not Zed - - * mail-ops.c (mail_do_sync_folder): Run sync in different thread - each time. Just a quick litlte hack to check multithreading. - There are now few operations that single-queue. Need to work out - a way to make the allocation of threads & resources easier, so we - dont get overwhelmed with threads, but we dont block when we dont - have to, either. - - * message-list.c (main_folder_changed): If we have only changed - events, then process them directly. - (mail_do_regenerate_messagelist): Run regenerate in a new thread - each time, another quick hack to check mutlithreading. - - * mail-view.c (view_delete_msg): Call camel folder set message - flags directly. mail_do_set_message_flags() is now completely - unused. - - * folder-browser.c (mark_msg_seen): Call camel folder - set_message_flags directly. - - * mail-callbacks.c (flag_messages): New function, that just sets - flags of all selected messages, without all that messy thread - stuff (setting flags is in-memory). - (mark_as_seen): Use flag_messages(). - (mark_as_unseen): " - (undelete_msg): " - (delete_msg): " - -2000-12-20 Not Zed - - * message-list.c (message_list_select): Free messageinfo lookups. - (message_list_drag_data_get): " - (subtree_unread): " - (subtree_size): " - (subtree_earliest): " - (ml_tree_value_at): " Also, keep the message info around in a - static variable, and ref'd, so that any internal references we - have to it dont vanish while we're not looking. This has a couple - of problems ... esp since we never unref the last access, although - camel-folder-summary wont check this when its unref'd, so we're - 'safe'. - (save_node_state): free messageinfo lookups. - (on_click): " - (get_message_info): deconstify return. - - * mail-tools.c (mail_tool_move_folder_contents): Free messageinfo - lookups. - - * mail-ops.c (do_filter_ondemand): Free messageinfo lookups. - (do_flag_messages): " - (do_fetch_mail): Remove mail_tool_lock stuff. - (mail_operation_run): Quick hack to run an operation - asynchrounously, in a brand-new thread. - - * folder-browser.c (on_right_click): Free messageinfo lookups. - -2000-12-16 Not Zed - - * message-list.c (build_tree): Always use the slow (full-update) - version of the tree update code, to get around a bug(?) in etree. - (build_flat): Likewise. - -2000-12-15 Not Zed - - * mail-display.c (write_data_to_file): Dont blindly convert all - parts to utf8, e.g. image/jpg. We only convert text/* parts, and - only then if required. - -2000-12-14 Not Zed - - * component-factory.c (create_view): cast over a warning. - - * folder-browser-factory.c: Add verbs for hide functions. - - * message-list.c (message_list_hide_clear): - (message_list_hide_uids): - (message_list_hide_add): Some api renaming. - (message_list_hide_add): Allow ML_HIDE_SAME to be passed to mean - not to change the upper/lower range at all. - (hide_save_state): Save the state of the hide list to stable - storage. - (hide_load_state): Load the state of hte hide list. - (message_list_set_folder): Load/save the state of the folder if it - is changed/set. - (message_list_destroy): Save the state of the folder hide list - when done. - (save_tree_state): If we wrote out an empty state file, simply - remove it instead. - - * folder-browser.c (on_right_click): Add some hide menus. - (hide_read): Hide read messages. - (hide_deleted): Hide deleted messages. - (hide_selected): Hide selected/current message. - (hide_none): Show all hidden messages. - (on_right_click): Lock around accesses to the message (inside - mlist_detect_magic). - (on_right_click): Free the mailing list name. - -2000-12-13 Not Zed - - * folder-browser.c (on_right_click): Add camel locking since we - call it directly. Whoever heard of a lock you 'down' to unlock? - - * message-list.c (mail_do_regenerate_messagelist): Added hide - expression, messages to hide. Fixed all callers. - (do_regenerate_messagelist): IF we have a hide expression, search - and remove those from the uid list. If we have a hide range, - apply that afterwards. - (cleanup_regenerate_messagelist): Handle freeing the hide uid - temporary data, if required. - (message_list_destroy): Free hide data, also lock around all camel - object stuff. - (message_list_length): New function to get the number of messages - avaialble to be hidden by range. - (message_list_set_hide): Set the hide expression and range. - Issue: Should hiding be remembered? - (message_list_unhide_all): Turn off all hiding. - (message_list_hide_uids): Hide a list of uid's. - -2000-12-15 Dan Winship - - * subscribe-dialog.c (folder_toggle_cb): Update this for the new - signal handler prototype. Fixes the crash on double-click. - -2000-12-15 Jeffrey Stedfast - - * mail-format.c (handle_multipart_signed): New callback to handle - multipart/signed parts. - (decode_pgp): Update to account for the cipherlen argument needed - for openpgp_decrypt. - (is_rfc2015): Removed as we now have a better version in - mail-crypto. - (handle_multipart_encrypted): Updated to use the PGP/MIME utility - functions. - - * mail-crypto.c (mail_crypto_openpgp_decrypt): Don't check - (!*plaintext) as it could be a binary stream. Now also takes a - cipherlen argument. - (mail_crypto_openpgp_sign): New function. - (pgp_mime_part_sign): New function to replace a mime part with the - pgp signed equivalent. - (pgp_mime_part_encrypt): New function to replace a mime part with - the pgp encrypted equivalent. - (pgp_mime_part_decrypt): New function to decrypt a pgp encrypted - mime part (like from pgp_mime_part_encrypt) and replace it. - (is_rfc2015_signed): New function to determine if a mime part is - an rfc2015 signed part. - (is_rfc2015_encrypted): New function to determine if a mime part - is an rfc2015 encrypted part. - (mail_crypto_openpgp_verify): New openpgp function to verify a - signature. - -2000-12-14 Christopher James Lahey - - * mail-threads.c (update_active_views): Unref the iterator when - we're done with it. - -2000-12-14 Larry Ewing - - * mail-display.c (mail_display_new): call - gtk_html_set_default_content_type to make gkthtml default to utf-8 - when parsing. This requires gtkhtml >= the released 0.8. - -2000-12-14 Ettore Perazzoli - - * mail-threads.c (read_msg): Call `ui_set_busy()' before - `ui_set_message()' so that we are sure that the - set_busy/unset_busy calls always happen in order. - -2000-12-13 Christopher James Lahey - - * folder-browser.c (my_folder_browser_init): Made the vertical - scrollbar always be there. - - * message-list.c (message_list_get_layout): Changed the minimum - width of some of the pixmap column headers. - -2000-12-12 Christopher James Lahey - - * component-factory.c (create_view): Added a cast. - - * mail-summary.c: Added #include "mail-summary.h". Commented out - folder_free, summary_free, and view_destroy_cb since they're not - used. - (do_changed): Added a cast. - (create_summary_view): Changed some types so that casting would be - easier. - - * session.c (mail_session_remember_password): Added a cast. - -2000-12-12 Dan Winship - - * mail-summary.h: Fix to use the right .h instead of the - deprecated one. - -2000-12-12 Jeffrey Stedfast - - * mail-callbacks.c (forward_message): Attach a signature when - forwarding, fixes bug #826. - -2000-12-11 Dan Winship - - * session.c (mail_session_enable_interaction): New function to - tell the code that it's ok (or not) to interact with the user when - trying to authenticate to a service. Starts out turned off. - (mail_session_request_dialog): If interaction is disabled, fail if - the password isn't in the cache. - - * component-factory.c (owner_set_cb): Call - mail_session_enable_interaction() after everything else. (This - means that the IMAP password dialog will no longer pop up [under - the splash screen] at startup.) - -2000-12-11 Dan Winship - - * component-factory.c (create_view): Deal with "mailstorage" type - views (top-level mail storages) by trying to fill the storage's - folder tree again if we failed before. - (add_storage): Create new storages with a URI and type - "mailstorage". - - * mail-ops.c (cleanup_scan_subfolders): On success, mark the - storage as having been loaded, so create_view won't try again. - -2000-12-11 Jeffrey Stedfast - - * mail-format.c (decode_pgp): Updated to reflect arguments to the - openpgp functions - now also takes an outlen argument. - (try_inline_pgp): Updated. - (handle_multipart_encrypted): Updated here too. - - * mail-crypto.c (crypto_exec_with_passwd): Updated to handle - binary streams and such. - (mail_crypto_openpgp_encrypt): Always initialize the passwd_fds - even if we don't plan on signing. Added an 'inlen' to specify the - length of the input data (as it could be binary). Also added a - 'userid' argument for cases when we want to sign as well as - encrypt. - (mail_crypto_openpgp_decrypt): Updated to take an outlen argument - in case the ciphertext is encrypted binary data. - (mail_crypto_openpgp_clearsign): Added a 'hash' and 'detach' - arguments. 'hash' allows the program to specify the preferred hash - function (which will come in handy when generating - PGP/MIME). 'detach' allows the program to specify whether it wants - a detached signature or the entire signed text. - -2000-12-11 Dan Winship - - * message-list.c: Remove the never-once-used BonoboObject stuff - and make MessageList be a GtkWidget instead. Also, keep track of - the ETable directly rather than repeatedly calling - e_table_scrolled_get_table. - - * folder-browser.c (folder_browser_destroy): Use gtk methods - rather than bonobo methods to destroy the message list. - (on_right_click, on_double_click): These are being attached to the - ETable directly now, so fix the first argument (which isn't being - used anyway, but...). Ignore double-clicks on "active" columns - (the ones where clicking does something beyond "select"), fixing - bug #811, which is what got me started on this to begin with... - (folder_browser_gui_init): simplify now that MessageList itself is - a widget. Also use message_list->table rather than - e_table_scrolled_get_table. - - * mail-local.c (mail_local_reconfigure_folder): Add "mail_" to - the beginning of this function name to match its prototype and the - other vague namespace conventions in the mailer. - - * mail-callbacks.c (select_all, invert_selection): Use ml->table. - (configure_folder): s/local_reconfigure_folder/mail_&/ - - * mail-ops.c (do_flag_messages): clean up the cleanup a bit - - * mail-tools.c (mail_tool_quote_message): Remove an unused - variable. - -2000-12-11 Not Zed - - * local-config.glade: reordered the options and added maildir, - mbox, maildir, mh, in that order. - - * mail-local.c (reconfigure_clicked): Added maildir, re-ordered to - match the changed xml file too. - (do_reconfigure_folder): WHoever 'threaded' this code forgot to - check that folder_browser functions shouldn't be called here. - (cleanup_reconfigure_folder): Call it here instead. - (lookup_folder): Blah blah, we have to lookup the folder and - verify its still the same format, joy. Becaause someone thought - it would be wise to make the code 5x more complicated for no - reason, and totally break 'mail reconfigure' in the process. i'm - really happy about that one. - (cleanup_register_folder): Uh, yeah, so like, the - local_store->folders hashtable is supposed to point to like, - LocalFolders, not CamelFolders. - (free_local_folder): Free the localfolder struct properly. - (free_folder): Call above to free data properly. - (get_folder): Fix for fixing folders hashtable. - (local_storage_removed_folder_cb): Same here. - (local_storage_new_folder_cb): Ref the local_store when putting it - in the local_folder. - (cleanup_register_folder): Properly free the local_folder if the - op failed. - (free_local_folder): Unhook events also. - (d): Oops, left debug turned on. - -2000-12-09 Christopher James Lahey - - * message-list.c (message_list_init): Change the "drawfocus" - argument on e_table_scrolled_get_table(etable) instead of on - etable (etable is an ETableScrolled.) - -2000-12-08 Jeffrey Stedfast - - * mail-callbacks.c (save_msg_ok): Check to see if the file already - exists, if it does prompt the user to for permission to overwrite - the file. - (forward_message): g_strdup the cursor_uid if there is only a - single message to be forwarded or we'll segfault later. - - * mail-ops.c (do_save_messages): Rewrote yet again. I'm back to - almost an identical implementation as the first time I wrote this - except now we write the From line which I had forgotten last - time. This means that we no longer have to unlink the .ev-summary - file created and we also use fewer resources (no need to create a - CamelMboxFolder object). - -2000-12-08 JP Rosevear - - * folder-browser.c (on_double_click): the e-table double-click - signal now has extra params - -2000-12-07 Ettore Perazzoli - - * component-factory.c (add_storage): Pass `NULL' as the - @toplevel_node_handler_id arg in `evolution_storage_new()'. - FIXME: We should be passing the ID of the mail component here. - * mail-vfolder.c (vfolder_create_storage): Likewise. - -2000-12-08 Jeffrey Stedfast - - * message-list.c (message_list_get_layout): Set the "Size" field - to sort using integer comparison instead of string. - (filter_size): New function to transform a integer size into a - more readable form. - (ml_value_to_string): Use filter_size. - (ml_value_is_empty): COL_SIZE is no longer a string, so handle - this as an integer. - (ml_initialize_value): Here too. - (ml_free_value): And here. - (ml_duplicate_value): And here too. - (message_list_create_extras): Setup the size etable cell. - -2000-12-08 Christopher James Lahey - - * folder-browser.c: Connect to signals on the ETable instead of - the ETableScrolled. - - * subscribe-dialog.c: Used the e_table_scrolled_get_table function - instead of accessing the variable directly. - -2000-12-08 Christopher James Lahey - - * message-list.c: Connect to signals on the ETable instead of the - ETableScrolled. - -2000-12-07 Christopher James Lahey - - * message-list.c: Got rid of code referencing the ETableScrolled - proxy functions. Changed the call to e_table_set_cursor_row to - send a model row instead of a view row. - -2000-12-07 Jeffrey Stedfast - - * mail-callbacks.c (forward_message): Only do a - message_list_foreach if we plan on attaching messages, otherwise - just use ml->cursor_uid. - - * mail-ops.c (cleanup_forward_messages): If attaching multiple - forwarded message, wrap them in a multipart/digest otherwise just - attach the single message as a message/rfc822. - -2000-12-07 Dan Winship - - * mail-display.c (on_object_requested): Make the iTip hack spew a - g_warning and not crash if you have no identity configured. To be - revisited. - - * mail-callbacks.c: (various) - * folder-browser.c (filter_mlist): - * mail-autofilter.c (filter_gui_add_from_message): - * mail-vfolder.c (vfolder_gui_add_from_message): Add some - g_return_if_fail()s to protect from crashes until the code to - enable/disable commands based on how many messages are selected is - done. - -2000-12-06 Jeffrey Stedfast - - * mail-vfolder.c (vfolder_gui_add_rule): Make the vfolder editor - resize correctly. Fixes bug #835. - -2000-12-06 Dan Winship - - Fix up shutdown so that things that should be destroyed get - destroyed. Among other things, this fixes the bug where IMAP - stores weren't disconnected at shutdown. - - * mail-threads.c (update_active_views): Update for - folder_browser_factory_get_control_list change to EList. - - * folder-browser-factory.c: Turn control_list into an EList so - that we can safely remove items from it while it's being iterated - (which will happen as FolderBrowsers are destroyed at shutdown - while the thread code is trying to update the status bars). - (control_destroy_cb): Just destroy the folder_browser. - (browser_destroy_cb): New callback for FolderBrowser destroy. - Remove the control from control_list here instead of - control_destroy_cb, because the controls don't seem to get - destroyed reliably... - - * component-factory.c: Clean up stuff. - (factory_destroy): Get rid of this. - (owner_unset_cb): Schedule an idle handler to quit. - (idle_quit): Wait for all of the FolderBrowsers to be destroyed - and then destroy the storages and quit. - - * mail-summary.h (create_summary_view): Fix prototype - -2000-12-06 Jeffrey Stedfast - - * mail-config.c (mail_config_folder_to_cachename): Use - e_filename_make_safe (which used to be e_str_make_safe). - - * mail-display.c (make_safe_filename): And here. - - * message-list.c (message_list_drag_data_get): Here too. - -2000-12-06 Dan Winship - - * mail-local.c (cleanup_register_folder): Run the folder_changed - code on message_changed as well, so the unread message counts - update as messages are read. - - * folder-browser.c: Remove bits of filter-on-demand and toolbar - bug workaround cruft that don't do anything useful any more. - - * mail-ops.c (cleanup_load_folder): unref the ref we added in - setup_load_folder. - -2000-12-05 Jeffrey Stedfast - - * mail-display.c (write_data_to_file): Use a charset filter to - make sure the data is written out in the charset it was meant to - be in instead of UTF-8. - - * mail-format.c (mail_format_raw_message): Don't use the raw - message body as the format argument, use "%s" instead. If the raw - message contains %'s then it will segfault otherwise. - -2000-12-04 Dan Winship - - * mail-config-gui.c (service_page_item_new): Fix a typo so that - toggling the "remember password" checkbox will activate the "OK" - button if it was inactive. - -2000-12-05 Ettore Perazzoli - - * mail-vfolder.c (vfolder_create_storage): Updated the call to - `evolution_storage_new()': pass NULL for @toplevel_node_uri. - - * component-factory.c (add_storage): Updated the call to - `evolution_storage_new()': pass NULL for @toplevel_node_uri. - -2000-12-04 Jeffrey Stedfast - - * subscribe-dialog.c (setup_subscribe_folder): Use info->full_name - rather than info->name so that we get the namespace part of the - folder path as well. - -2000-12-04 Ettore Perazzoli - - * folder-browser-factory.c: Updated to define verbs - "MessageForwardInlined" and "MessageForwardAttached" instead of - "MessageForwardInline" and "MessageForwardAttach". - - * folder-browser.c (on_right_click): Make forwarding as an - attachment the default. - - * mail-callbacks.c (forward_inlined): Renamed from `forward_msg'. - (forward_attached): Renamed from `forward_attach'. - * mail-callbacks.h: Updated accordingly. - -2000-12-01 Dan Winship - - * session.c (mail_session_remember_password): Writes out passwords - (to .gnome_private) in our patented proprietary "Best Awesome - Super Encryption 64" ("BASE64") format which could not possibly - ever be cracked by even the most cryptographically knowledgeable - five-year-olds. - (mail_session_init): Load remembered passwords at startup. - (mail_session_forget_passwords): Erase them from disk as well as - memory. - - * mail-config.c: Add "remember_password" field to - MailConfigService. - (mail_config_write_on_exit): Call mail_session_remember_password - for services with "remember_password" set. - * mail-config-gui.c: Add "remember password" checkbox to the - dialogs, and make it appear and disappear as appropriate. - - * component-factory.c (mail_load_storages): Unref the store - regardless of whether or not we're using it, so we don't leak - references to non-storage stores. - -2000-12-01 Jeffrey Stedfast - - * message-list.c (e_mail_address_new): Perform better - error-handling. - -2000-12-01 Radek Doulik - - * mail-ops.c (mail_op_report_status): use mail_op_set_message_plain - - * mail-threads.c (mail_op_set_message_plain): plain version of - mail_op_set_message, doesn't use printf, passes message untouched, - use set_message - (mail_op_set_message): set_message - (set_message): helper function - -2000-11-30 Jeffrey Stedfast - - * mail-ops.c (cleanup_fetch_mail): Don't display a dialog, instead - inform the user that there was no new mail by setting a status - message. - - * message-list.c (message_list_drag_data_get): Use the new - e_str_make_safe function. - - * mail-display.c (make_safe_filename): And here. - - * mail-config.c (mail_config_folder_to_cachename): Here too. - -2000-11-30 Not Zed - - * mail-ops.c (cleanup_load_folder): Set threaded view before - setting the folder (cleanup some flash ons tartup). - - * message-list.c (message_list_init): Initialise a mempool for uid - string storage. - (new_id_from_uid): Added messagelist arg, allocate strings from - uid_pool. - (new_id_from_subject): Same. Fixed all callers. - (remove_node_diff): Dont free uid here. - (build_flat_diff): Nor here. - (clear_tree): Flush the mempool, rather than freeing the id's - directly. - (free_tree_ids): Removed, no longer required. - (free_tree_ids): Likewise. - (message_list_init): Dont connect to the table destroy signal - anymore to free the uid table. - (message_list_destroy): Free the uid pool here. - (*): Use accessors for messageid stuff. - (content_is_attachment): Removed, no longer required. - (ml_tree_value_at): Get the attachment flag directly from the - summary. - (ml_tree_value_at): For 'fake' nodes, try and do something better - than "?" for from, to, and size. - (subtree_size): New function, add up the total size of a subtree. - (subtree_earliest): Get the earliest date from a subtree. - (ml_tree_value_at): Return earliest date sent/received for fake - nodes. - (ml_tree_value_at): Return something to mark a fake subject line - as a fake subject, although i dont know, i guess this buggers up - sorting ... - (subtree_size): Check the info node is still there. - (subtree_earliest): Same here. - (subtree_unread): And here. The info node might vanish if the - folder has changed/is changing and we try and redraw stuff while - its doing it. - (message_list_drag_data_get): Use accessors. - -2000-11-29 Jeffrey Stedfast - - * message-list.c (message_list_drag_data_get): Implement. - (message_list_init): Connect the d&d signal. - - * mail-ops.c (do_save_messages): Use camel a bit more to help us - out. Don't create the file ourselves, treat it as a CamelFolder so - we don't have to worry about formatting. - -2000-11-29 Dan Winship - - * main.c (main): Remove no-longer-needed e_unicode_init. - - * mail-tools.c (mail_tool_quote_message): Fix the allocation here - (again) and put a comment explaining it. (Fixes a crash when - replying.) - -2000-11-28 Dan Winship - - * component-factory.c (owner_set_cb): Wait until after setting up - the local storage to find the Drafts/Outbox/Sent folders. - - * mail-ops.c (do_setup_folder): Use the file: store rather than - mbox:. - -2000-11-28 Jeffrey Stedfast - - * folder-browser-factory.c: Added the SaveAs bonobo menu verb - thingy. - - * mail-callbacks.c (save_msg): New callback for saving messages. - (save_msg_ok): - - * folder-browser.c (on_right_click): Add a Save As menu item. - - * mail-ops.c (cleanup_save_messages): Save all emails to the path - given. - -2000-11-28 Dan Winship - - * mail-local.c (cleanup_register_folder): Fix the initial unread - counts after the last patch. - -2000-11-27 Dan Winship - - * mail-local.c (local_folder_changed): This needs to run from the - main thread, not the camel thread, so add a proxy signal handler - to call mail_op_forward_event. Fixes hangs (eg bugzilla #909). - -2000-11-27 Jeffrey Stedfast - - * mail-display.c: Removed some unecessary debugging printf's - -2000-11-27 Dan Winship - - * mail-config-druid.glade: Revert the new druid for now, until the - corresponding code is done, so that the druid will work again. - -2000-11-21 Iain Holmes - - * mail-config-gui.c (mail_config): Don't use the "delete-event" - signal. - -2000-11-21 Iain Holmes - - * mail-display.c (pixbuf_for_mime_type): free fm_icon. - - * component-factory (summary_fn): Remove the configure param. - (factory_destroy): Made into a generic function so that the - summary_factory can be ref-counted as well as the normal - factory. - -2000-11-21 Dan Winship - - * Makefile.am: add GPGME_CFLAGS and GPGME_LIBS - -2000-11-21 Jeffrey Stedfast - - * mail-config.c (mail_config_view_source): New function to return - if user wants to view message source. - (mail_config_set_view_source): New function to set whether the - view wants to view source. - - * mail-ops.c (mail_do_view_message_sources): Removed. We're not - gonna view-source this way anymore. - - * folder-browser-factory.c: Removed the ViewSource bonobo verb - from the Message menu. - (control_activate): Added ViewSource. - - * folder-browser.c (on_right_click): Removed Message menu item to - view message source. - (folder_browser_toggle_view_source): New callback to set whether - or not the MailDisplay shows the raw message or the pretty-ified - message. - - * mail-callbacks.c: Removed view_source. - - * mail-display.c (redisplay): If toggle_raw is set then display - the raw message else display the pretty formatted message. - (mail_display_redisplay): New function to force the redisplay of a - message. - - * mail-format.c (mail_format_raw_message): New function to - write the raw message data. - -2000-11-21 Not Zed - - * mail-vfolder.c (vfolder_uri_to_folder): IF we dont find a - source, clear the exception and ignore it silently. for e.g. if - the user reconfigured their mailboxes and one of them no longer - exists. - -2000-11-21 Radek Doulik - - * mail-display.c: #include - -2000-11-21 Not Zed - - * message-thread.[ch]: Removed. No longer serves a purpose. - - * Makefile.am (evolution_mail_SOURCES): Removed message-thread.[ch]. - - * message-list.c (build_subtree): - (node_equal): - (add_node_diff): - (build_subtree_diff): - (do_regenerate_messagelist): - (cleanup_regenerate_messagelist): Changed to use camel-folder-thread. - (message_list_set_folder): If we get set a new folder, unhook any - events before unrefing the folder too (the folder is never reset - currently, but this would cause problems). - (subtree_unread): Check for uid null, wont crash, but its a bug. - (ml_tree_value_at): If the uid is null, then fake an obviously bad - line. - (build_subtree): Yeah well, we can't like freeze/thaw here, - because this is called recursive, and freeze/thaw isn't - recursive, like pre model and post model change was. - (build_tree): Maybe we can try it here, although i dont think - it'll help much. - (build_flat): And this is also a tree. yes a tree. - (build_tree): Added changes arg. If set, then try the 'diff' - approach, unless the tree is already empty. - (message_list_set_threaded): Dont clear the tree here. - (message_list_set_search): Or here. - -2000-11-20 Not Zed - - * message-list.c (save_node_state): Save out the md5 hash of the - messageid as hex, since thats all we have for those nodes. - (build_subtree): Expand the messageid to a hex string first, then - check it. - (add_node_diff): And the same here. - - * message-thread.c (thread_messages): Changed for changes to - messageid/references items. - (id_hash, id_equal): New functions to hash on the binary message id hash. - (thread_messages): removed some more no longer used dead code. - -2000-11-20 Jeffrey Stedfast - - * message-list.c (e_mail_address_compare): New comparison function - that will replace address_compare if/when we ever go to save the - preparsed addresses in the ETable rather than parsing them each - time. Also fixed it so that we should get better sorting when - addresses don't contain name parts (I was checking for NULL but - not '\0'). - (address_compare): Use e_mail_address_compare. - -2000-11-19 Peter Williams - - * mail-ops.c (update_changed_folders): Instead of making the CORBA - call in the dispatch thread, store the new display names and have - cleanup_fetch_mail make the CORBA calls. Fixes deadlocks. - (cleanup_fech_mail): Loop through the update_infos and make the - CORBA calls. - (setup_fetch_mail): Clear some new data items. - -2000-11-17 Jeffrey Stedfast - - * mail-format.c (mail_generate_reply): Use the new quote_message - function and make it start with "On %s, %s wrote:" since people - seem to want that. - - * mail-ops.c (cleanup_forward_messages): Use the new quote_message - function. - - * mail-tools.c (mail_tool_quote_message): New convenience function - to quote a message body (since both the reply and forward code do - similar quoting) - -2000-11-17 Not Zed - - * message-list.c (message_list_destroy): Before we destroy - ourselves, unhook ourselves from the folder update events. Should - fix a common crash on exit case. - -2000-11-16 Jeffrey Stedfast - - * folder-browser-factory.c: Added the MessageViewSource bonobo - menu verb. - - * mail-ops.c (mail_do_save_messages): New async function to save - messages as individual files in a given path. - -2000-11-15 Jeffrey Stedfast - - * folder-browser-factory.c: Added a new Forward as Attachment - bonobo menu item verb. - - * mail-view.c (view_forward_msg): Updated to reflect changes to - mail_do_forward_message(). It now forwards the message without - attaching it - is this what we want? - - * mail-ops.c (mail_do_view_message_sources): New async function to - display message source dialog windows. - (setup_forward_messages): If we were asked not to forward the - message(s) as attachment(s) and the user chose more than a single - message, then default to making each message an attachment. - (cleanup_forward_messages): If we aren't forwarding the message as - an attachment, then quote the text and set the composer's body - with it. - - * mail-callbacks.c (view_source): New callback to view the message - source of all messages that are currently selected. - (forward_attach): New callback to forward a message as an - attachment (forward_msg is now for forwarding a message without it - being an attachment). - (forward_message): Convenience function for forwarding messages. - -2000-11-13 Jeffrey Stedfast - - * subscribe-dialog.c (subscribe_do_subscribe_folder): Take a - 'subscribe' argument so that this can function as a subscribe AND - unsibscribe method. - (describe_subscribe_folder): Updated. - (do_subscribe_folder): Updated. - (cleanup_subscribe_folder): Updated. - (subscribe_folder_info): Pass along a TRUE as the 'subscribe' - param. - (unsubscribe_folder_info): Pass along a FALSE as the 'subscribe' - param. - -2000-11-13 Christopher James Lahey - - * message-list.c: Removed some e_table_model calls and replaced - them with e_tree_model calls. - -2000-11-12 Dan Winship - - * mail-local.c (mail_do_register_folder): Do this the normal way - rather than calling mail_operation_wait_for_finish. There was some - reason for it originally, but it no longer applies. This makes - adding new folders from the folder selection dialog no longer - hang. - -2000-11-12 Jeffrey Stedfast - - * mail-ops.c (do_filter_ondemand): Sync the source folder. - -2000-11-11 Matt Bissiri - - * evolution-mail.oafinfo: - * mail-threads.c: (retrieve_shell_view_interface_from_control): - Update the remaining "IDL:Evolution*" to "IDL:GNOME/Evolution*" - to sync up with yesterday's IDL re-scoping. - -2000-11-10 Michael Meeks - - * Makefile.am ($(EVOLUTION_MAIL_CORBA_GENERATED)): sort include order. - -2000-11-09 Jeffrey Stedfast - - * subscribe-dialog.glade[.h]: New glade file for possibly using to - create the subscribe dialog. - -2000-11-08 Radek Doulik - - * mail-format.c (mail_generate_reply): likewise - - * mail-callbacks.c (create_msg_composer): added send_html arg to - e_msg_composer_new_with_sig_file call - -2000-11-07 Jeffrey Stedfast - - * mail-search-dialogue.c (mail_search_dialogue_construct): Allow - rule part to expand when the user resizes the dialog. - -2000-11-07 Jeffrey Stedfast - - * folder-browser.c (search_save): Don't handle custom searching - anymore... we don't want this. - (search_full): Same. - (folder_browser_search_menu_activated): Set the search entry - widget sensitive. - (folder_browser_search_query_changed): Same. - -2000-11-07 Jeffrey Stedfast - - * folder-browser.c (search_full_clicked): Updated to use the - ESearchBar object rather than the previously used search widgets. - (search_full): Same. - (search_save): Same. Also use enums to make it a little easier to - read now that we have to have enums anyway. - (folder_browser_search_menu_activated): New ESearchBar menu - callback. - (folder_browser_search_query_changed): New ESearchBar query - callback. Replaces search_set() - (folder_browser_clear_search): Updated to use the ESearchBar - object rather than the previously used search widgets. - (folder_browser_gui_init): Don't hand construct a search widget, - use the new ESearchBar convenience widget. - - * mail-ops.c (cleanup_load_folder): Updated to reflect changes to - FolderBrowser. - -2000-11-07 Jesse Pavel - - * mail-display.c (pixmap_press): modified some of the EPopupMenu - structures to account for differences in the popup menu API (as - informed by Jeff. - (on_object_requested): passed the user's default email address - to the iTip control. - -2000-11-07 Ettore Perazzoli - - * Makefile.am (INCLUDES): Add the composer dirs. - -2000-11-07 Not Zed - - * mail-display.c (on_object_requested): God, I sure wish people - would listen when i'm saying i'm changing and API. I mean - I even mailed everyone and everything. Can't see any changelog - either. - -2000-11-06 Not Zed - - * mail-autofilter.c (rule_from_message): Updates for api changes. - - * mail-tools.c (mail_tool_generate_forward_subject): Fixed for api - changes. Sigh, whoever wrote the multithread code of the mailer, - had little idea. You can't just lock for getting a const value, - until you are finished with it, cause the owner still owns it. - Fixed this too. Yuck, what a horrid forwarding format, can we - change this, or make it configurable? The mail headers show who - forwarded it, we dont need to duplicate it in that UGLY subject. - - * mail-format.c (write_field_to_stream): Removed some jeffness. - dont g_strdup stuff we dont need to, and remove the - value_is_encoded thing since we can get the unencoded address - now. - (write_address): New function to write an address field. - (write_headers): Uses write_address to write addresses, cleaner, - fixed the god-awful unreadable indenting too. - (handle_text_plain): Use a 'smarter' printf format, so we dont - need to allocate and copy substrings unecessarily (esp since - they're about to be allocated any copied another few times - anyway *sigh*). - (write_field_to_stream): Commented out the isprint check, which - afaik serves no purpose. - (list_add_addresses): New function to build a list of - display-ready addresses. Although I think the composer then uses - these as internet-ready addresses. It should probably take a list - of CamelAddress's if thats what it wants. - (mail_generate_reply): Cleaned up the address list creation stuff - a heap, and fixes for camel api changes. Also fixed a small - memory leak as a side effect (fulladdr wasn't freed if it was the - same as the sender). - - * mail-display.c (on_object_requested): Changed for interface - changes to the from address. I think passing the encoded - (internet version) of the address is right here. - -2000-11-06 Jeffrey Stedfast - - * folder-browser.c (on_right_click): Move filter stuff into a - submenu of the popup menu. - -2000-11-06 Jesse Pavel - - * mail-display.c: used Camel to parse the full address before - passing the email address to my iTip control. - -2000-11-06 Dan Winship - - First draft of folder tree unread message indication for /local - mail folders. - - * mail-local.c: Add a new CamelStore subclass, MailLocalStore, - which attaches to an Evolution_LocalStorage on one side and - CamelSession on the other, and keeps track of local folders. Some - of this code was previously in mail-local-storage.c, which no - longer exists. - (local_reconfigure_folder, etc): Various mail_op-related cleanups, - and wrap d() around a bunch of printfs. - - * mail-tools.c (mail_tool_get_local_inbox_url, - mail_tool_get_local_movemail_url): Removed - (mail_tool_get_local_inbox): Simplified. - (mail_tool_do_movemail): Remove unused dest_url variable. - (mail_tool_uri_to_folder): Simplify. Now down to two cases - (vfolder, and everything else). - - * component-factory.c (owner_set_cb): Pass evolution_dir to - mail_local_storage_startup. - - * Makefile.am (evolution_mail_SOURCES): Remove - mail-local-storage.[ch] - - * mail-summary.c: Remove mail-local-storage.h include - -2000-11-06 Kjartan Maraas - - * mail-autofilter.c: Fix up #include - * mail-crypto.c: Same here. - * mail-search-dialog.c: Here too. - * main.c: Fix indentation of #ifdef - * message-thread.c: Fix include. - -2000-11-06 Jeffrey Stedfast - - * mail-callbacks.c (delete_msg): Don't invert the flag. - (undelete_msg): Same (when multiple messages are selected). - -2000-11-06 Jeffrey Stedfast - - * folder-browser-factory.c: Updated to have the same menu items as - the new right-click menu - eventually these 2 menus should be the - same. - - * folder-browser.c (on_right_click): Now correctly handles the - case of multiple selection. - - * mail-callbacks.c (enumerate_msg): Make public so it can be used - in other source files (it's a useful function!) - -2000-11-05 Jeffrey Stedfast - - * folder-browser.c (on_right_click): Added an "Undelete" option to - the right-click menu and also set a mask so it was only selectable - if the message is marked as deleted. Also set a mask for "Mark as - Read" and "Mark as Unread". - - * mail-callbacks.c (undelete_msg): New callback to undelete - messages. - -2000-11-03 Dan Winship - - * message-list.c (cleanup_regenerate_messagelist): don't free the - MessageList search when it's being reused - -2000-11-03 Jeffrey Stedfast - - * mail-local.c (mail_local_map_uri): Don't show the passwd in the - url string. - (mail_tool_local_uri_to_folder): Same. - (do_reconfigure_folder): Same. - -2000-11-03 Jeffrey Stedfast - - * Makefile.am: Added new header files. - - * component-factory.c (owner_set_cb): - s/session_init/mail_session_init - - * session.c: Renamed public functions to mail_session_*. - FIXME: Rename session.c to mail-session.c - - * folder-browser-factory.c: #include "mail-callbacks.h", #include - "mail-session.h" and replace forget_passwords with - mail_session_forget_passwords - - * mail.h: Move session prototypes to mail-session.h, Move - mail-crypto prototypes to mail-crypto.h, Move mail-callback - prototypes to mail-callbacks.h - - * mail-session.h: New header file containing public prototypes - for session.c - - * mail-format.c: #include "mail-crypto.h" - - * mail-view.c: - * folder-browser.c: #include "mail-callbacks.h" - - * mail-crypto.h: New header file containing public prototypes - for mail-crypto.c - - * mail-callbacks.h: New header file containing public prototypes - for mail-callbacks.c - - * message-list.c (message_list_get_layout): Set useful defaults. - (message_list_setup_etable): Don't set the Outbox defaults on a - folder just because it doesn't have a corresponding saved file. - -2000-11-03 Dan Winship - - * mail-config-gui.c (service_page_item_new): url_flags are now on - CamelProvider, not CamelService - - * main.c: - * subscribe-dialog.c: - * mail-threads.c: Kill warnings - -2000-11-03 Federico Mena Quintero - - * Makefile.am: Clean the idl-generated files properly. - -2000-11-03 Not Zed - - * mail-view.c: Added mail-display.h. - - * mail-autofilter.c: Removed unecessary headers. Who ran indent - over this code? Sigh. - - * mail-ops.c (display_message_input_s): Added messagedisplay. - (mail_do_display_message): Added messagedisplay arg. - (mail_do_display_message): Dont bother doing another thread when - we know we dont have a uid. - (): Added folder-browser.h to headers. Sigh. - - * folder-browser-factory.c (control_activate): Setup the - viewthreaded callback to the folder_browser function. - - * folder-browser.c (my_folder_browser_init): Connect to - right_click of etable of the messagelist here. - (on_right_click): Changed for argument changes. - (folder_browser_toggle_threads): Changed to take a fb, and to set - threaded mode on the messagelist. - (my_folder_browser_init): Connect also to the double_click signal. - (my_folder_browser_init): Connect to the message_selected signal - of the message_list. - (on_message_selected): Signal handler for message selected. - (my_folder_browser_init): Fix for change to message_list_new(). - - * message-list.h: Dont include folder-browser.h. - (message_list_toggle_threads): Moved into folder-browser.h. - (struct _MessageList): Removed folderbrowser. - - * mail.h: Dont include folder-browser.h here either, but - mail-types.h instead. - Moved prototypes moved into folder-browser.c into - folder-browser.h. (vfolder_*, filter_*). - - * mail-display.h: Dont include folder-browser.h here, but - mail-types.h and specific camel headers. - - * message-thread.c (sort_node): Invert the sort order logic so the - list is sorted in mailbox order, not reverse mailbox order. - - * message-list.c (free_tree_ids): Fix a merge foo. - (remove_node_diff): Removed unused row argument. Fixed - callers/prototype. - (clear_tree): pre_change on the removal of the root node. - (build_flat): Only perform pre_change if we are rebuilding the - whole lot. For incremental change let etable do its thing. - (build_tree): Likewise for building the tree view. If making - incremental updates, do them as we build it. - (vfolder_subject): - (vfolder_sender): - (vfolder_recipient): - (filter_subject): - (filter_sender): - (filter_recipient): - (filter_mlist): - (on_right_click): Moved to folder-browser.c, where they belong. - (message_list_init): Dont connect to right_click anymore. - (message_list_toggle_threads): Moved to folder-browser.c, renamed. - (on_double_click): Moved to folder-browser.c - (on_click): Set the flags directly, rather than in anothre thread, - which is just not necessary. - (message_list_class_init): Added a new signal 'message_selected', - to indicate when a message was selected. - (on_cursor_change_idle): Emit a signal, rather than directly - triggering the display update. - (select_row): Removed, no longer used. - (idle_select_row): And this too. - (select_msg): Removed as well. - (message_list_select): Emit a signal, rather - thandisplaying/clearing the mail-display directly. - (mark_msg_seen): Moved to folder-browser.c - (message_list_new): Removed folderbrowser argument. - -2000-11-02 Jeffrey Stedfast - - * message-list.c (on_right_click): Sync with message - menu. Addresses bugzilla bug #778. - -2000-11-02 Christopher James Lahey - - * message-list.c: Turn on draw grid for the main ETable (this may - not be working in ETable itself.) - -2000-11-01 Jeffrey Stedfast - - * mail-threads.c (mail_op_set_message): fmt argument should be - const. - -2000-11-01 Dan Winship - - Make "Get Mail" even more functional on IMAP (scans all folders), - and do a first cut at folder tree highlighting (for IMAP/news - only). - - * mail-ops.c (do_fetch_mail): For imap (sigh, we *still* shouldn't - be hardcoding that), rescan the store's folder tree, rescan each - changed folder for new messages, and update the shell folder tree. - (do_scan_subfolders): Update for component-factory.c changes, and - set folder display names and highlights appropriately when - building the storage. - - * component-factory.c (add_storage): Make this static (was - mail_add_new_storage). Use camel_service_get_name for the name - rather than url->host. (Among other things, this lets you use a - single machine as both an IMAP server and a news server.) - (mail_lookup_storage): Hash storages based on their CamelStore - rather than the URL. - (factory_destroy): Disconnect each of the CamelStores in the - storages_hash. - - * subscribe-dialog.c (cleanup_subscribe_folder): - * mail-vfolder.c (vfolder_refresh): Pass "highlighted" flag to - evolution_storage_new_folder - -2000-11-01 Jeffrey Stedfast - - * mail-ops.c (mail_op_report_status): Don't call the default - logging function. - (do_fetch_mail): Set the logfile and don't pass the logfile to - filter_driver_set_status_func - it's purpose has been altered. - (do_filter_ondemand): Same. - -2000-11-02 Not Zed - - ** Merged in camel-incremental-branch. - - * mail-format.c (mail_get_message_body): Jeff! Sigh. - We should definetly not be strduping the - content, it has already been copied and duplicated. Look at - get_data_wrapper_text. - -2000-11-01 Chris Toshok - - * subscribe-dialog.h: add fields search_entry and search_top. - - * subscribe-dialog.c: add mail-ops.c style async operations for - getting the store (to remove deadlock in the case where a auth - dialog is dismissed at startup and then the subscribe dialog is - brought up), and subscribing/unsubscribing to folders. One case - remains, that is getting the list of all folders. - (subscribe_search): flesh out this function - (build_tree): use the search_top field so we can search for - groups/folders. - (subscribe_dialog_destroy): free search_top. - (subscribe_dialog_construct): init search_top. - -2000-10-30 Iain Holmes - - * mail-summary.c (generate_folder_summaries): Fix spelling :) - Set folder->uri to NULL for the Inbox. - -2000-10-26 Iain Holmes - - * mail-summary.c (generate_html_summary): Add view:// uris to - switch the display to that folder. - -2000-11-01 Jeffrey Stedfast - - * folder-browser-factory.c: Hmmm, someone can't spell Filder, - er...I mean Filter ;-) - -2000-11-01 Jeffrey Stedfast - - * mail-autofilter.c (rule_from_message): If the name is NULL or - empty, then set the title to "Mail from

". Closes - bugzilla bug #777. Also when filtering on Subject, set the file - name to "Subject is " rather than just "" - I - think this is a bit more user-friendly. - (strip_re): Use unsigned char when passing to is() - functions from ctype.h. - (rule_add_subject): Use the "is" rule instead of "contains". - -2000-11-01 Jesse Pavel - - * mail-display.c: added property bag support for Bonobo - controls, support which helps only the iTip control, currently. - -2000-11-01 Dan Winship - - * mail-display.c (pixbuf_gen_idle): Lots of fixes and - simplifications. Should get rid of the "missing icon" problem. - There is still a problem with some images failing to get - thumbnails, even though they display correctly. - (pixbuf_for_mime_type): New function to try really hard to get the - right icon for a MIME type, including looking in mc and nautilus's - pixmap directories. - (on_object_requested): Always use pixbuf_gen_idle, even for - non-image types, to prevent code duplication. - -2000-10-31 Jeffrey Stedfast - - * mail-format.c (mail_get_message_body): Shouldn't we be - strdup'ing the content? This seems to fix the memory corruption - problems. - (mail_generate_reply): Make sure that the last char in the - generated reply text is '\0' (when body text doesn't end with a - \n, a random char will appear otherwise). - -2000-10-31 Dan Winship - - * mail-config-gui.c (do_test_service): Update for - camel_service_disconnect change. - -2000-10-31 Jeffrey Stedfast - - * mail-autofilter.c (filter_gui_add_for_mailing_list): Match "is" - rather than "contains" now that we have the "is"-rule. - -2000-10-30 Dan Winship - - * mail-config-gui.c (config_do_query_authtypes): Redo this so that - it works for all pages, not just the first page. (Now that this is - finally working again, I expect Anna to finish her redesign in the - next 15 minutes.) - (service_page_item_new): Fix up the sizing of the Auth line to - look more like everything else. - -2000-10-29 Dan Winship - - * mail-tools.c (mail_tool_uri_to_folder): Simplify this a lot by - making IMAP and NNTP use the same code, now that the IMAP - namespace doesn't need special magic handling. - - * message-list.c (mail_do_regenerate_messagelist): Don't try to - regenerate the message list if there is no folder. (The Bonobo UI - code will call this as the callback for the "Threaded View" - command.) - - * mail-ops.c (do_fetch_mail): Sync the folder before refreshing so - we don't lose flag settings. - -2000-10-27 Jeffrey Stedfast - - * mail-callbacks.c (composer_send_cb): Check to make sure that the - recipient list is neither NULL nor a 0-length list of addresses - and pop up a dialog letting the user know why we are not allowing - him/her to send the message. - -2000-10-26 Dan Winship - - * mail-display.c (write_data_to_file): Don't destroy a dialog - after run_and_close'ing it. - -2000-10-26 Jeffrey Stedfast - - * mail-callbacks.c (composer_send_cb): Check for the TO recipient - list being NULL and don't send. - -2000-10-25 Jeffrey Stedfast - - * mail-ops.c (do_send_mail): Don't forget to unref the - FilterDriver. - - * mail-callbacks.c (apply_filters): New callback for applying - on-demand filters. (removed the old on-demand filters callback). - - * mail-ops.c (do_filter_ondemand): Rewrote to apply "incoming" - filters to all selected messages. - (mail_do_filter_ondemand): No longer takes a FilterContext - argument or a destination folder argument (why did we ever need - this last one??) but now takes a uids argument. - - * folder-browser-factory.c: Add a MessageApplyFilters menu item. - -2000-10-25 Iain Holmes - - * mail-summary.[ch]: Updated for the new ExecutiveSummary code. - - * Makefile.am: Added the summary files and the evolution-services CFLAGS - and LIB stuff. - - * component-factory.c: Re-enabled the summary stuff. - -2000-10-25 Dan Winship - - * main.c (main): Pass send/postpone signal handler functions to - evolution_composer_factory_init. - -2000-10-25 Jeffrey Stedfast - - * subscribe-dialog.c (subscribe_select_all): Implemented. - (subscribe_invert_selection): (was unselect_all) Implemented. - -2000-10-25 Dan Winship - - * message-list.c: Add a "flagged" column, based on the Camel - "flagged" flag, for assigning an arbitrary "hey, I care about - this" flag to a message. - (ml_tree_set_value_at): Remove - (ml_tree_is_cell_editable): No, it's not. - (on_click): Handle the read/unread and flagged fields via the - click handler. Among other things, this makes it not select - a message when you change its read status. - -2000-10-24 Dan Winship - - * subscribe-dialog.c (folder_info_subscribed, - subscribe_folder_info, unsubscribe_folder_info): Don't prepend "/" - to the folder's full_name. Deal with hierarchy in the - EvolutionStorage tree better. - (storage_tree_path): Helper function to build a storage path from - a CamelFolderInfo. - -2000-10-23 Dan Winship - - * *: Add some missing _()s and N_()s. - -2000-10-23 Dan Winship - - * Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR. - -2000-10-23 Jeffrey Stedfast - - * mail-ops.c (do_send_mail): Apply outgoing filters to the - message. - -2000-10-23 Christopher James Lahey - - * message-list.c: Fixed a possible error in row numberings. This - needs to be changed quite a bit anyway, but this should make - things slightly nicer in some cases. - -2000-10-23 Christopher James Lahey - - * folder-browser.c: Made the top of the folder browser a little - prettier. - - * mail-display.c, mail-vfolder.c: Made more dialogs resizable. - -2000-10-23 Jeffrey Stedfast - - * mail-autofilter.c (filter_gui_add_from_message): Don't forget to - set the rule source! (eg "incoming", "demand", or "outgoing") - -2000-10-22 Ettore Perazzoli - - * message-list.c (message_list_init): Always display the vertical - scrollbar. - - * mail-display.c (mail_display_new): Always display the vertical - scrollbar. - -2000-10-20 Jeffrey Stedfast - - * mail-config.h: #include - -2000-10-20 Michael Meeks - - * mail.h: s/BonoboUIHandler/BonoboUIComponent/ - - * mail-callbacks.c (run_filter_ondemand): ditto. - - * session.c (forget_passwords): ditto. - -2000-10-20 Dan Winship - - * evolution-mail.oafinfo: Declare composer factory. - - * main.c (main): Initialize it - -2000-10-19 Chris Toshok - - * message-list.c (nuke_uids): e-tree-model is now opaque. use the - accessor to get the root node. - -2000-10-19 Jeffrey Stedfast - - * mail-callbacks.c: #include "mail-vfolder.h" - (vfolder_edit_vfolders): Don't call the dummy vfolder_edit - function. - - * folder-browser-factory.c: s/VFolderEdit/SetVFolder - -2000-10-19 Dan Winship - - * mail-ops.c: (do_fetch_mail): For an imap store, just refresh the - INBOX. - - * folder-browser-factory.c (control_deactivate): Don't sync - non-existent folders. - * message-list.c (nuke_uids): Don't traverse non-existent trees. - -2000-10-19 Ettore Perazzoli - - * Makefile.am (glade_messages): New. - (EXTRA_DIST): Add `$(glade_messages)'. - -2000-10-19 Dan Winship - - * mail-ops.c: Clean up some old #if 0 code. - -2000-10-19 Jeffrey Stedfast - - * mail-format.c (mail_generate_reply): Get the MailConfigIdentity - *before* we create a new composer object so that we can set the - signature file. - -2000-10-18 Michael Meeks - - * folder-browser-factory.c (register_ondemand): kill. - (create_ondemand_hooks): die. - (control_activate): remove hook. - - * test-mail.c (create_container): kill old UI handler. - -2000-10-18 Christopher James Lahey - - * message-list.c: Fixed some column widths. - -2000-11-02 Not Zed - - * message-list.c (get_message_info): Call get_message_uid to get - the uid, save some duplicated code. - (folder_changed): Handle the case of a NULL changes input. - - * message-thread.c (thread_messages): Removed pointless - variable/assignment 'container'. - (thread_messages): Try and cope with duplicate message id's. - -2000-11-01 Not Zed - - * mail-callbacks.c (main_select_first_unread): Changed to use 0 as - the first row to select a message. - - * mail-ops.h (mail_do_regenerate_messagelist): Removed from - header. This function is no longer public since it is really an - internal message-list function. - - * folder-browser.c (search_full_clicked): Call the set_search() - function, rather than messagelist_rebuild, which is going private. - (search_set): Same here. - (folder_browser_clear_search): And here. - (etable_key): Call message_list_select() instead of - message_list_home and message_list_end. Removing some odd code - duplication. - - * message-thread.c (do_thread_messages): Moved the mail lock to - here, rather than locking for each message lookup (which is - useless anyway). This is still not correct either, as the tree - references folder data ... but a bit better than it was. - (thread_messages): Removed the mail tool lock stuff, lock in - higher functions. - - * message-list.h: Added a threaded indicator to the message list - itself. - (threaded_view): removed a mystery variable. - - * message-list.c (do_regenerate_messagelist): Made the code a - little more readable. - (build_tree): Fixed argument to be a thread_messages struct, not a - container. - (cleanup_regenerate_messagelist): Free changeinfo. - (mail_do_regenerate_messagelist): If we are adding changes to a - flat view, we dont need to goto the other thread at all, so - process immediately. - (message_list_toggle_threads): Clear the tree if we're changing - the view mode. - (message_list_toggle_threads): And reset the rowmap, since it is no - longer valid. - (build_tree): If we are building into an already empty tree, just - build into that (probably irrelevant optimisation). - (build_subtree): Build hte subtree in the same order as we got it, - not inverted order. - (message_list_set_threaded): New function to select the threaded - view/flat view. - (mail_do_regenerate_messagelist): Removed references to - mail_config, get it from the ml->threaded var instead. - (message_list_destroy): No longer free the key data for the - uid_rowmap. - (new_id_from_uid): Convert a uid string into an id string. - (new_id_from_subject): Likewise for subject strings. - 'id' strings replace the 'uid:' and 'subject:' stuff with - accessors and macros and use less memory and is more readable. - (id_is_uid): macro to check if an id string is a uid. - (id_uid): Returns the uid part of a uid id string. - (id_subject): Returns the uid part of a subject id string. - (build_subtree): Use the new id functions, and dont duplicate the - uid in the uid rowmap, but just reference it from the tree node. - (node_equal): Use new id functions. - (add_node_diff): And here too. - (remove_node_diff): And here. Also remove the uid from the - rowmap, and dont free it anymore. - (get_message_info): And here. - (get_message_uid): And here. - (subtree_unread): And here. - (ml_tree_value_at): " - (ml_tree_set_value_at): Noted a memory leak. do_flag_messages() - doesn't free the contents of the uid array, just the uid array - (well that i can tell, teh code has more problems anyway). - (ml_tree_set_value_at): And fix the id accessors. - (save_node_state): " - (build_flat): Use id macros/functions. Dont alloc memory for hash - key. - (build_flat_diff): Use id macros. - (build_flat_diff): Remove the hash table entry before freeing its - key data (in the node). - (free_key): Removed. Keys are no longer alloc'd. - (clear_tree): When we clear the tree, also clear the uid_rowmap, - as it is no longer valid (or contains allocated keys!). - (free_tree_ids): Renamed from nuke_uids. - (free_ids_cb): Renamed from nuke_uids_cb. - (free_tree_ids): Changed arg to be a ETreeModel directly. - (ml_tree_value_at): Map id to subject using the right macro. - (free_tree_ids): Check we have any nodes to traverse first. - (build_flat): Insert to row -1 to append the nodes (faster). - (remove_node_diff): Only remove the uid rowmap entry if it is - referencing this node (i.e. the key string is the same key string, - not just a matching key string). - (add_node_diff): Remove the uid rowmap entry before inserting a - new one to force the key to be replaced. This is required as the - tree may temporarily contain duplicate messages during the - rebuilding phase. - (message_list_set_search): New function, set the search string. - Only redo the search if it has changed, etc. - (mail_do_regenerate_messagelist): Made static. There is no need - for external code to call this. - (message_list_set_folder): NOP if the new folder is the same. - (message_list_set_folder): Clear the tree before rebuilding it. - (message_list_select): Ok, this wins the award for 'most bizarre - interface'. Changed the start row to mean the end of the list if - we supply -1, rather than the start of the list. Also fixed the - endpoints (it would never select message 0 if searching - backwards). - (idle_select_row): Changed start row to 0 from -1. - (message_list_end): Removed. - (message_list_home): Removed. - (go_to_message): Removed. message_list_select can do this. - (message_list_select): Check that direction is one of the valid - ones, otherwise we could be thrown for loops. - -2000-10-31 Not Zed - - * message-list.c (node_equal): Compares an etree node with a - message-thread node to see if they point to the same object. - (add_node_diff): Adds a new thread node to the etree. - (remove_node_diff): Removed an etree node, freeing any additional - data. - (build_subtree_diff): Takes an existing etree definition, and a - new thread definition and makes the etree match, using as few - operations as possible. - (do_regenerate_messagelist): No longer free/clear the uid/rowmap - here. - (regenerate_messagelist_input_t): Added a tree field - are we - building a tree view? - (regnerate_messagelist_data_t): Added a tree field, if we built a - tree result. Added a changes parameter, for building diff's after - search/etc. - (mail_do_regenerate_messagelist): Setup the tree indicator. - (build_flat_diff): Apply a changeset to a message list. - (build_flat): Added a changes argument, if present, use - build_flat_diff() to build the list. - (do_regenerate_messagelist): If we are generating a threaded view, - build the threaded list here, rather in another separate - invocation. - (cleanup_regenerate_messagelist): Call build_tree directly on the - threaded list. - (message_list_init): Init the uid_rowmap hash table here instead - of somewhere odd. - (message_list_destroy): Assume uid_rowmap exists. - (do_regenerate_messagelist): Remove the code here that is messing - with the message list data (search/uid_rowmap). We're in a - different thread boys ... - -2000-10-26 Not Zed - - * message-list.c (cleanup_regenerate_messagelist): Fixed some - logic to make more sense (gboolean)!pointer replaced with - (pointer != NULL). - (build_tree): Put the tree pre/post change stuff in here, where it - should be. - (build_flat): Same here. - (cleanup_regenerate_messagelist): Remove model_changed stuff here. - (setup_regenerate_messagelist): Remove pre_change stuff here. - -2000-10-20 Not Zed - - * message-list.c (main_folder_changed): Perform incremental update - of the display for flat view. - (ml_tree_value_at): Spit out a mroe meaningful warning when we - can't find the uid in our tree, in the folder. - - * message-thread.c (thread_messages): Made public. - (thread_messages_free): Made public. - (thread_messages): Now we also return a struct _thread_messages, - which is passed to other functions. - (container_free): Renamed from thread_messages_free. - (thread_messages_free): Take a thread_messages argument. - (thread_messages_add): New function to add a list of uid's to the - thread list. - (thread_messages_remove): Likewise, for removing them. - (cleanup_thread_messages): Change for struct changes. - (do_thread_messages): Likewise. - -2000-10-19 Not Zed - - * mail-tools.c (mail_tool_do_movemail): removed unused var - - * folder-browser.c (search_full_clicked): Fix for api changes, - such as it can be called an api, its mroe an utter mess infact. - (search_set): Same. - (search_set): And here. - (folder_browser_clear_search): And here. - - * message-list.c (folder_changed): Copy and forward the changeinfo - list to the mian thread. - (main_folder_changed): Free the changeinfo. Todo: something smart - with this information. - (struct regenerate_messagelist_input_s): Added a changes field. - (mail_do_regenerate_messagelist): Added a change list argument. - (message_list_set_folder): Fix for mail_do_regenreate_messagelist - api. - (message_list_toggle_threads): Same. - -2000-10-18 Iain Holmes - - * mail-config-gui.c (mail_config): Make all the CLists have passive - titles. - (identity_dialog): Make the default button the "OK" button, and set - the dialog to close on pressing return on the entryboxes. - -2000-10-17 Iain Holmes - - * mail-config-gui.c (service_page_item_new): Disable the optionmenu - because it is empty. - (service_page_item_auth_fill): Enable the optionmenu as there's stuff - in it now. - - * mail-callbacks.c (reply_to_sender): Call check_send_configuration - when we have the FolderBrowser because if it is done in mail_reply - (with passing NULL) it will only be able to continue if the mailer - has already been configured. - (reply_to_all): Same. - -2000-10-18 Not Zed - - * folder-browser.c (folder_browser_gui_init): No, we REALLY dont - want to perform an immediate search as the keys are pressed. - - * mail-display.c (on_object_requested): Kill a minor warning with - a cast. - - * mail-config.c: Include mising ctype.h to kill a warning. - - * message-thread.c (main): Fixed the test case for api changes. - - * message-list.c (message_list_drag_data_get): Set some flags to - get_folder(). I dont even think this will work because - mail_tool_get_folder doesn't handle file url's. - - * mail-vfolder.c (vfolder_uri_to_folder): Pass appropriate flags. - - * mail-ops.c (do_setup_folder): Pass appropriate flags. Hmm, - whats the difference between setup and create. *shrug* - (do_create_folder): Pass appropriate flags to get_folder. Needs a - way to specify the index flag. - - * mail-tools.c (mail_tool_get_folder_from_urlname): Changed create - to flags argument. - (mail_tool_get_local_inbox_url): Add an index argument. - (mail_tool_get_local_inbox): honour index flag. - (mail_tool_get_inbox): Changed for api change. - (mail_tool_uri_to_folder): Fixed calls to store_get_folder(); - - * mail-local.c (load_metainfo): Added an indexed field to the metainfo. - (save_metainfo): And save it too. - (do_reconfigure_folder): Honour index flag when creating the new - folder. Do not open the old folder with an index at all. - (mail_local_map_uri): Add an index argument - tells if the mbox is - indexed. - (mail_tool_local_uri_to_folder): Create & pass flags properly. - (#include gnome.h): Dont include all of gnome, just what we use, - and explicity include xml-memory, so we get xmlFree(). - -2000-10-16 Jeffrey Stedfast - - * folder-browser.c (search_full_clicked): Un #if 0'd out - (search_full): Same. - (folder_browser_gui_init): Connect search_full and search_activate. - (search_set): Uncomment search_full() - - * Makefile.am: Re-add `mail-search-dialogue.h' and - `mail-search-dialogue.c'. - -2000-10-16 Jeffrey Stedfast - - * mail-format.c (mail_generate_reply): Decode recipient names so - that they display nicely in the To and Cc fields. - (write_field_to_stream): Now takes another argument - 'value_is_encoded' so that we know if we should decode that string - before proceding onward. Since the message subject is already - decoded before it's passed in, we don't want to decode it again - (wasted cpu time and/or any 8bit chars will be assumed to be - latin1 encoded and thus the decoded value will be corrupt). - -2000-10-16 Chris Toshok - - * mail-config-gui.c (service_page_get_url): only set the url->user - field if the user string is non-NULL and not empty. - -2000-10-16 Not Zed - - * message-list.c (message_list_setup_etable): Uh, fixed jeff's - wrong fix for setting the speficiation (the function changed to - set_state(), as can be seen in the e_table-scrolled_load_state() - call only 2 lines above). - -2000-10-13 Not Zed - - * message-list.c (message_list_setup_etable): oops, chose the - wrong thing to cut out after a merge conflict. - -2000-10-15 Chris Toshok - - * message-list.c (subtree_unread): ETreePath != GNode now, use - accessors. - (ml_tree_value_at): same. - (save_node_state): same. - (save_tree_state): same. - (nuke_uids_cb): convert to e_tree_model_node_traverse required - type. - (nuke_uids): g_node_traverse -> e_tree_model_node_traverse. - -2000-10-14 Ettore Perazzoli - - * evolution-mail.oafinfo: Add "evolution:shell-component-icon" - attribute. - -2000-10-13 Jeffrey Stedfast - - * message-list.c (message_list_setup_etable): Don't free the - service name. - -2000-10-12 Jeffrey Stedfast - - * mail-ops.c (do_fetch_mail): sync & expunge the source folder - after filtering. - -2000-10-12 Jeffrey Stedfast - - * message-list.c (message_list_setup_etable): Create the 'spec' - and 'extras' arguments and call e_table_scrolled_new() rather than - set_specification as that function no longer (?) exists. - - Also started to add drag & drop functionality to something like - Nautilus (but #if 0'd it out until I had time to finish it and - till after 0.6). - -2000-10-12 Not Zed - - * message-list.c (message_list_setup_etable): Duh, fix the test - for the folder name, strstr != strcmp is it. - -2000-10-10 Not Zed - - * message-list.c (folder_to_cachename): Removed, changed callers - to use mail_config_folder_to_cachename instead. - - * mail-config.c (mail_config_folder_to_cachename): New utility - function to get a cache name for a folder. - - * mail-tools.c (mail_tool_do_movemail): Changed to return the path - to the mbox, rather than opening a folder of it. - - * mail-ops.c (mail_incorporate_messages): Dont bother making the - pseudo messageinfo, filder_driver_filter_message will do it for - us. - (report_status): Callback to report status of filtering operation. - (do_fetch_mail): Changed significantly - for the api changes to - the filtering system. Also now incorporates a mailbox file - directly, without having to import it into a camel folder first. - (mail_incorporate_messages): Removed entirely, no longer needed. - - * mail-vfolder.c (vfolder_refresh): Fix for context api changes. - (vfolder_uri_to_folder): Likewise. - - * folder-browser-factory.c (create_ondemand_hooks): Changed for - api changes. Also only adds demand filters to the menu (fixed a - small logic bug). - -2000-10-11 Chris Toshok - - * subscribe-dialog.c (folder_etree_value_at): special case for - folders with NULL urls (which aren't selected/subscribeable). - (unsubscribe_folder_info): can't (un)subscribe from folders with - non-NULL urls. - (subscribe_folder_info): same. - -2000-10-12 Christopher James Lahey - - * message-list.c: Replace To with From except in Drafts, Outbox, - or Sent boxes. Make Subject column pay attention to text - attributes like bold and strikethrough. - -2000-10-12 Iain Holmes - - * component-factory.c: Disable the executive summary. - -2000-10-11 Chris Toshok - - * subscribe-dialog.c (FOLDER_ETABLE_SPEC): set expansion to 0.0, - minimum-width to 16, and resizable to false for the subscribed - column. - (folder_info_subscribed): new function so we can do the correct - path munging. - (subscribe_folder_info): only add the folder to the storage if - there wasn't an exception subscribing it. - (unsubscribe_folder_info): same, but unsubscribing. - (folder_etree_value_at): use folder_info_subscribed. - (folder_toggle_cb): same. - (unsubscribe_folder_foreach): same. - (subscribe_folder_foreach): same. - (subscribe_dialog_gui_init): set the bold column on the text cell, - and add the subscribed pixbuf. - -2000-10-11 Anna Marie Dirks - * mail-threads.c: Changed the password-getting dialog so that the - text entry has focus. - -2000-10-11 Chris Toshok - - * subscribe-dialog.c (STORE_ETABLE_SPEC): change cell type to - "string" since we're not including it in the extras. - -2000-10-11 Christopher James Lahey - - * message-list.c, message-list.h, subscribe-dialog.c: Changed - these to use the proper form for the column element. - -2000-10-11 Christopher James Lahey - - * message-list.c, message-list.h, subscribe-dialog.c: Updated - these to the new ETable style of specifications. - -2000-10-11 Chris Toshok - - * subscribe-dialog.c (subscribe_dialog_gui_init): convert to the - new gal e-table stuff. - (html_size_req): - (html_new): - (put_html): #if 0 out the html functions since description stuff - isn't used and we don't want the warnings. - -2000-10-11 Chris Toshok - - * subscribe-dialog.c (subscribe_dialog_gui_init): remove the html - description stuff for now. - -2000-10-10 Chris Toshok - - * subscribe-dialog.c (folder_toggle_cb): umm.. duh :) only - subscribe if it's not subscribed, and vice versa. - (subscribe_folder_foreach): make sure to call - e_tree_model_node_changed. - (unsubscribe_folder_foreach): make sure to call - e_tree_model_node_changed. - -2000-10-10 Chris Toshok - - * mail-ops.c (setup_scan_subfolders): add a ref to input->storage - here so that the ref/unref pattern more closely matches other - mail-ops. also, this keeps the storage from being freed when we - hit the unref in cleanup_scan_subfolders, which is important - because we maintain a reference to it in the storage_hash in - component-factory.c - - * subscribe-dialog.h: add storage field. - - * subscribe-dialog.c (subscribe_folder_info): new function, - subscribe to a folder given it's CamelFolderInfo, and add it to - the shell - we're generating a path from the name of the folder - which is bad. - (unsubscribe_folder_info): same (except we unsubscribe and remove - from the shell). - (storage_selected_cb): unref the currently selected storage. - (subscribe_dialog_destroy): unref the currently selected storage. - (subscribe_dialog_construct): sc->storage = NULL. - - * component-factory.c (mail_lookup_storage): new function, to look - up a EvolutionStorage corresponding to a CamelService. we ref the - EvolutionStorage before passing it back. - (mail_add_new_storage): insert the storage into storages_hash if - result is EVOLUTION_STORAGE_OK. - - * mail.h: add prototype for mail_lookup_storage. - -2000-10-10 Larry Ewing - - * mail-format.c (mail_generate_reply): make sure we dup the return - value of get_reply_to or get_from when building the recipient list. - -2000-10-10 Iain Holmes - - * mail-summary.c (generate_html_summary): Removed the
  • from the - HTML. - -2000-10-10 Cody Russell - - * mail-threads.c: Added #include - -2000-10-09 Iain Holmes - - * mail-summary.c: Removed the extra arguments to rule_context_load. - -2000-10-09 Chris Toshok - - * subscribe-dialog.c, subscribe-dialog.h: use our own etable to - display the stores, and get them from the mail-config api. put - #if 0'ed code in place to add/remove the folders from the shell - when they're subscribed/unsusbcribed. also, react to double - clicks in the folder etable by toggling subscription status. - -2000-10-08 Iain Holmes - - * mail-summary.c (create_summary_view): Updated to use new icon code. - -2000-10-08 Iain Holmes - - * mail-summary.c (generate_html_summary): Generic function to - recreate the HTML of the summary. Checks all the folder summaries. - (generate_folder_summarys): Create a summary of all the vfolders - and the Inbox. - (create_summary_view): Generate the folder summarys before the - HTML. - -2000-10-09 Ettore Perazzoli - - * folder-browser.c: Don't #include "mail-search-dialogue.h" as - it's missing from the repository. - (search_full_clicked): Temporarily `#if 0'ed out. - (search_full): Likewise. - (folder_browser_gui_init): Don't connect `search_full'. - (create_option_menu): Don't connect `search_menu_deactivate'. - (folder_browser_gui_init): Don't connect `search_activate'. - (search_set): Don't do `search_full()'. - (folder_browser_gui_init): Likewise. - - * Makefile.am (evolution_mail_SOURCES): Remove - `mail-search-dialogue.h' and `mail-search-dialogue.c' as NotZed - forgot to put them into CVS. - -2000-10-06 Not Zed - - * mail-search-dialogue.c: New widget, full search dialogue for - mail. - - * folder-browser.c (search_set): If we click on custom search, run - the full search dialogue. - (folder_browser_gui_init): Add a button to perform a full search. - (search_full): Bring up the mail search dialogue asynchronously. - (search_full_clicked): Handle search options. - (folder_browser_destroy): Free the saved rule if there is one - there. - (search_options[]): Added a custom option option - brings up the - full search dialogue. - (search_set): Disable the search entry if we are doing a full - search. - - * mail-vfolder.c (vfolder_create_storage): Yay, finally - depeterised this stuff. - (vfolder_uri_to_folder): Removed an irrelevant comment. - - * mail-callbacks.c (filter_edit): And here. - - * mail-ops.c (do_fetch_mail): And here too. - - * mail-autofilter.c (filter_gui_add_from_message): Fixed call to - context_load. - (filter_gui_add_for_mailing_list): And here too. - - * folder-browser-factory.c (create_ondemand_hooks): Remove that - ondemand callback snot. - -2000-10-05 Not Zed - - * message-list.c (message_list_init_etable): Build the etable once - we know what folder we are going to use. - (save_header_state): Save the header spec to a cache file. - (message_list_destroy): Save the header spec. - (message_list_setup_etable): Setup the etable spec for this - folder, from a saved version if one exists, or to suit the folder - type (sent/received). - (message_list_set_folder): Setup the etable here once we have a folder. - -2000-10-09 Michael Meeks - - * message-list.c (message_list_toggle_threads): re-write. - - * folder-browser-factory.c (control_activate): update paths, need - CVS HEAD bonobo, use a listener not a verb. - -2000-10-08 Miguel de Icaza - - * mail-ops.c (mail_incorporate_messages): Tag string for translation - (do_flag_messages): ditto. - - * mail-threads.c (pipe_write): Repeates writes on EINTRS. - (pipe_read): Repeats reads on EINTRS. - (mail_operation_queue): Use pipe_write - (mail_op_set_percentage): ditto. - (mail_op_hide_progressbar): ditto. - (mail_op_show_progressbar): ditto. - (mail_op_set_message): ditto. - (mail_op_get_password): ditto. - (mail_op_error): ditto. - (mail_op_forward_event): ditto. - (mail_operations_terminate): ditto. - (dispatch): use pipe_read. - (dispatch): use pipe_write - (dispatch): ditto. - - * mail-ops.c (mail_incorporate_messages): Only show message being - incorporated every 2 seconds, to avoid a bunch of CORBA round trips. - (do_transfer_messages): ditto. - (do_forward_messages): ditto. - -2000-10-07 Miguel de Icaza - - * mail-ops.c (do_fetch_mail): Move the functionality to - incorporate messages into mail_incorporate_messages. - (mail_load_evolution_rule_context): New function. Move the - functionality for loading the context rules to its own function. - -2000-10-06 Iain Holmes - - * mail-summary.c: Fix the locking up of the mail by only calling - camel functions from the camel thread, and ORBit functions from - the GTK thread. Watch for the message-changed signal again. - - * component-factory.c (summary_fn, component_factory_init): - Re-enabled it, cos I think it works again. - - * mail-display.h: Remove the pb_cache. - - * Makefile.am: Readd the mail-summary.[ch] files and add the - evolution-services library to the link. - -2000-10-06 Chris Toshok - - * mail-ops.c (do_scan_subfolders): set the @subscribed_only - parameter to TRUE, since the subscribe UI is the only interface - that should show unsubscribed groups. - -2000-10-06 Ettore Perazzoli - - * mail-ops.c (do_scan_subfolders): Add missing @subscribed_only - parameter in the call to `camel_store_get_folder_info()'. [FALSE, - I hope that's right.] - -2000-10-05 Jeffrey Stedfast - - * mail-format.c (write_field_to_stream): Decode the header before - writing it to the header box. - - * mail-callbacks.c (send_receieve_mail): fetch mail before - sending, this is a temp fix for POP-before-SMTP authentication. - -2000-10-05 Michael Meeks - - * component-factory.c (summary_fn, component_factory_init): - Disable summary stuff, it appears to be badly broken. - - * Makefile.am (evolution_mail_SOURCES): add mail-summary.[ch] - - * subscribe-dialog.c (update_pixmaps): upd. - (set_pixmap): upd. - (subscribe_dialog_gui_init): upd. - remove redundant and annoying forward definitions. - - * folder-browser-factory.c (control_deactivate): upd. - (control_activate_cb): upd. - (control_activate): upd. - (set_pixmap): upd. - (update_pixmaps): upd. - (register_ondemand): upd. - (create_ondemand_hooks): upd. - -2000-10-04 Jeffrey Stedfast - - * message-list.c (address_compare): Use CamelInternetAddress - instead of my quick hack (aka InternetAddress). - -2000-10-05 Iain Holmes - - * mail-summary.c: Don't watch for the message-changed signal. - -2000-10-05 Iain Holmes - - * component-factory.c (component_factory_init): Setup the summary - factory as well. - (summary_fn): New function to create the ExecutiveSummaryComponent. - - * mail-summary.c: Create the view, and update it when something - changes. - -2000-10-04 Iain Holmes - - * mail-display.c (on_object_requested): Removed the pixbuf cache - as it would return the pixbufs in the reverse order every so often - and generally get all confused. - -2000-10-04 Dan Winship - - * folder-browser-factory.c (control_deactivate): Add back the - "sync folder on leave" hack that got lost in the UIHandler merge. - -2000-10-04 Jeffrey Stedfast - - * folder-browser-factory.c: Instead of UnSelectAll, we want - InvertSelection. - - * mail-callbacks.c (select_all): Finished this function. - (invert_selection): Finished. (was unselect_all - but that's not - what we really wanted as it'd be pointless. invert_selection is a - much more useful callback :-) - -2000-10-04 Chris Toshok - - * mail-tools.c (mail_tool_get_root_of_store): remove news specific - check. - (mail_tool_uri_to_folder): news: -> nntp: - -2000-10-04 Jeffrey Stedfast - - * mail-ops.c (do_filter_ondemand): Don't expunge the source - mailbox on completion. - -2000-10-04 Dan Winship - - * mail-ops.c (do_scan_subfolders): Don't try to add_folders if - get_folder_info returned NULL. - -2000-10-04 Not Zed - - * message-list.c (message_list_init_header): Fix the attachment - icon width. - (content_is_attachment): Perform some simple tests to see if the - message contains an attachment. - (build_subtree): Kill a pointless warning. - -2000-10-04 Miguel de Icaza - - * mail-callbacks.c (delete_msg): Added a comment to a piece of - code that I was trying to "fix" just to find that the strange - behaviour here that was about to be fixed, was actually a fix to - the problem I was trying to fix. - - So put the original comments from Dan, and will hope that someone - with more knowledge about this can figure why the delete key wont - delete messages and select the next unread message. - -2000-10-02 Chris Toshok - - * subscribe-dialog.c (subscribe_dialog_destroy): destroy our - tree_model and remove the root node. also, release_unref our - control and view, and unref the listener. - - * mail-tools.c (mail_tool_uri_to_folder): news url's contain host - names too, now. - -2000-10-02 Chris Toshok - - * subscribe-dialog.c, subscribe-dialog.h: add a - storage-set-view-listener, and add a little printf saying what - storage was selected. - -2000-10-02 Chris Toshok - - * subscribe-dialog.c (subscribe_dialog_gui_init): get - Evolution::StorageSetView interface on our storage set view - control, and set "show_folders" to FALSE. - -2000-10-02 Chris Toshok - - * Makefile.am (INCLUDES): add -I$(top_srcdir)/widgets/misc - - * subscribe-dialog.c (subscribe_dialog_gui_init): change the - window title to Manage Subscriptions, bold subscribed folders, and - add a title bar ala the evolution shell (but without the close - button). - -2000-10-02 Chris Toshok - - * subscribe-dialog.h: add fields for the storage set - Bonobo_Control and Evolution_StorageSetView interfaces. - - * subscribe-dialog.c (subscribe_dialog_gui_init): create the uih - as early as possible, and add the storage set view to the left - side of the hpaned. - -2000-09-22 Michael Meeks - - * folder-browser-factory.c (set_pixmap): upd. - (control_activate): upd. - -2000-10-02 Dan Winship - - * mail-config-gui.c: Remove "Port" entry from source dialog. We'll - use "host:port" like Netscape and other programs do. - (service_page_get_url): If host ends in ":###", use that as port. - (service_page_set_url): If URL contains a port, append it to the - hostname, separated by a colon. - -2000-10-02 Chris Toshok - - * Makefile.am (evolution_mail_SOURCES): subscribe-control.[ch] -> - subscribe_dialog.[ch] - - * mail-callbacks.c (manage_subscriptions): subscribe_control -> - subscribe_dialog. Also, pass the shell to subscribe_dialog_new. - - * mail-types.h: SubscribeControl -> SubscribeDialog. - - * subscribe-dialog.c, subscribe-dialog.h: rename from - subscribe-control.[ch]. - - * subscribe-dialog.c (subscribe_dialog_construct): pass - Evolution_Shell in. - (subscribe_dialog_new): takes Evolution_Shell argument now. - -2000-10-02 Chris Toshok - - * message-list.c (message_list_init_renderers): remove the 2 tree - pixbufs, so adjust the offsets to the score pixbufs. also, pass - NULL for the open/closed pixbufs to the tree cell renderer. - -2000-10-02 Dan Winship - - * mail-ops.c (mail_do_scan_subfolders, etc): Update for - CamelFolderInfo changes. - - * message-list.c (message_list_destroy): Don't save_tree_state if - there's no folder associated with the MessageList. - - * folder-browser.c (folder_browser_set_uri): Only call - mail_do_load_folder if the URI is not "". - -2000-10-02 Iain Holmes - - * mail-display.[ch]: Add a cache for the pixbufs, hashed on CID, - so that we only have to make a thumbnail once. - -2000-10-01 Iain Holmes - - * mail-display.c: Generate the thumbnails on an idle function so - that the user interface isn't locked. Checks in case the widget it - will use to display the image isn't destroyed. - -2000-10-01 Iain Holmes - - * mail-display.c (on_object_requested): If the attachment is an - image display a thumbnail of it, instead of the generic image - icon. - -2000-09-29 Miguel de Icaza - - * folder-browser-factory.c: Add print preview verb here. - - * mail-callbacks.c (do_mail_print): Handle printing here, the - complete engine. - (mail_print_preview_msg): new. does print previewing. - (mail_print_msg): does printing of the message. - -2000-09-29 Chris Toshok - - * subscribe-control-factory.c, subscribe-control-factory.h: nuked. - - * subscribe-control.c, subscribe-control.h: lots of changes. we - now pop up a dialog, and will have a storage set view on our left - side, like the shell does. - - * mail.h: add prototype for manage_subscriptions. - - * mail-callbacks.c (manage_subscriptions): new function, pops up - the subscribe dialog. - - * folder-browser-factory.c: add the verb for managing - subscriptions. - - * Makefile.am (evolution_mail_SOURCES): add subscribe-control.[ch] - again. - -2000-09-28 Chris Toshok - - * subscribe-control.h (subscribe_search): added prototype. - - * subscribe-control.c (subscribe_search): new function. - - * subscribe-control-factory.c (make_folder_search_widget): new - function, to add search widget to toolbar. - (control_activate): create the search widget and add it to the - toolbar. - -2000-09-28 Jeffrey Stedfast - - * mail-ops.c (do_send_queue): Messages should be appended to Sent - as Seen. - (do_send_mail): Same. - -2000-09-28 Ettore Perazzoli - - * Makefile.am: Don't compile `subscribe-control' for now. It - needs to be converted to the new UI handler code in Bonobo; it - doesn't compile right now. - -2000-09-27 Chris Toshok - - * subscribe-control.c (subscribe_refresh_list): new function. - - * subscribe-control.h (subscribe_refresh_list): new prototype. - - * subscribe-control-factory.c (update_pixmaps): add RefreshList - pixmap. also, add it to the verbs list. - -2000-09-27 Chris Toshok - - * mail-types.h: add SubscribeControl typedef. - - * Makefile.am (evolution_mail_SOURCES): add the subscribe stuff. - - * subscribe-control-factory.h * subscribe-control-factory.c * - subscribe-control.c: * subscribe-control.h: Mostly mocked up - subscribe ui. - -2000-09-27 Jeffrey Stedfast - Note: We need a configuration option to specify whether to log - filtering actions or not. - - * mail-ops.c (do_filter_ondemand): Updated to pass a log file - pointer to filter_driver_run. - (do_fetch_mail): Same. - (mail_do_fetch_mail): Fixed a compiler warning. - -2000-09-27 Jeffrey Stedfast - - * mail-callbacks.c (composer_postpone_cb): Fix it so that "send - later" will still mark a message as being replied, forwarded, - whatever. Closes bug #568 on bugzilla. - -2000-09-27 Jeffrey Stedfast - - * mail-ops.c (do_filter_ondemand): If the message has been - deleted, don't try filtering it - skip to the next message. Fixes - bugzilla bug #639. - -2000-09-25 Jeffrey Stedfast - - * folder-browser-factory.c: Shuffling (un)select all menu items to - the Edit menu. - -2000-09-25 Jeffrey Stedfast - - * folder-browser-factory.c: Added new menu items - - * mail-callbacks.c (mark_as_seen): New callback to mark all - selected messages as Seen. - (mark_as_unseen): New callback to mark all selected messages as - Unseen. - (select_all): New callback to select all messages (not yet - finished) - (unselect_all): New callback to unselect all messages (not yet - finished) - -2000-09-25 Not Zed - - * message-list.c (folder_to_cachename): Function to convert a - folder name/path to a filename for per-folder data. - (save_tree_state): - (load_tree_state): - (free_tree_state): For loading/saving the state of the expansion - of nodes in the tree. - (message_list_destroy): Save the tree state when done. - (save_node_state): Changed logic, we save when the node should be - closed on startup. i.e. any new nodes with children automatically - default to being open. - (subtree_unread): Check for unread messages in a subtree. So - false messages (for tree roots) are properly displayed. - -2000-09-25 Jeffrey Stedfast - - * message-list.c (address_compare): Updated to use Nat's - ENameWestern parser. - - * Makefile.am: link against e-util/ename/libename.la - -2000-09-25 Dan Winship - - * mail-ops.c: CamelException is not for compile-time errors. - Replace lots of argument checks in setup_ functions with - g_return_if_fails in the public functions. Also remove some - prototypes that weren't needed because they were for static - functions that are defined before they're used. - -2000-09-23 Michael Meeks - - * folder-browser-factory.c (set_pixmap): upd. - (control_activate): upd. - -2000-09-23 Ettore Perazzoli - - * message-list.c (internet_address_new_from_string): Skip spaces - at the beginning of the string first before doing anything else. - The code that follows doesn't like the first character of the - string to be a space. - -2000-09-22 Jeffrey Stedfast - - * message-list.c (address_compare): New comparison function for - email addresses. - (subject_compare): New comparison function for message subjects. - (message_list_init_header): Updated to use the new compare funcs. - -2000-09-21 Jeffrey Stedfast - - * mail-format.c (mail_generate_reply): Fixed some memory - leakage. Call free_recipients() so we don't leak memory. - -2000-09-19 Jeffrey Stedfast - - * mail-ops.c (do_scan_subfolders): Use the folder's full_name so - recursive directory structures display correctly ;-) - -2000-09-19 Dan Winship - - * mail-ops.c (do_scan_subfolders): Update for CamelFolder changes - (subfolder_names -> subfolder_info). - -2000-09-19 Dan Winship - - * mail-callbacks.c (create_msg_composer, compose_msg, send_to_url, - mail_reply, forward_msg): * mail-format.c (mail_generate_reply): * - mail-ops.c (cleanup_edit_messages): - - * mail-view.c (view_forward_msg): Deal with NULL composer. - -2000-09-18 Dan Winship - - * main.c (main): Call gnome_vfs_init() since the composer now does - file operations (to get the MIME type of attachments). - -2000-09-18 Jeffrey Stedfast - - * message-list.c: Removed COL_ONLINE_STATUS because we don't want - that. Renamed COL_PRIORITY to COL_SCORE and set it up to sort-of - work, I'm not really sure which renderer I should use. - -2000-09-18 Christopher James Lahey - - * Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and - $(EXTRA_GNOME_LIBS). Removed unneeded libraries. - - * component-factory.c, folder-browser-factory.c, folder-browser.c, - mail-callbacks.c, mail-config-gui.c, mail-display.c, - mail-display.h, main.c, message-list.c, message-list.h: Fixed the - #include lines to deal properly with gal. - -2000-09-16 Michael Meeks - - * Makefile.am (INCLUDES): add datadir - - * folder-browser-factory.c (control_activate): use it. - -2000-09-15 Dan Winship - - * mail-callbacks.c (transfer_msg): Revert **Temp fix** from below - since the relevant shell bug has been fixed now. - - * mail-ops.c (do_fetch_mail): Fix the sense of the "keep on - server" check so we're not doing this backwards. Don't - get_message_flags, because POP doesn't support it and it's - pointless anyway since we're setting deleted, not toggling it. - call camel_folder_sync with expunge=TRUE so that the deletions are - actually recorded. - -2000-09-15 Dan Winship - - This bug was so much fun to fix the first time that I decided to - fix it again. - - 2000-07-11 Dan Winship - - * mail-ops.c (real_send_mail): Set the post_send_data flag - rather than toggling it. (Maybe we'll need more control - over it later, but for now, the only flag we set is - "replied", and we want that set, not toggled.) - -2000-09-14 Jeffrey Stedfast - - * mail-callbacks.c (transfer_msg): **Temp fix** Send "" as the - default folder to select as anything else seems to cause a - segfault in shell's user_get_folder(). - (check_configured): A spoon full of 'line wrapping' makes the - medicine go down, the medicine go dowwwwn... - -2000-09-14 Iain Holmes - - * mail-callbacks.c (check_configured): Ask if you want to - configure the mail client if it isn't configured already. - (check_send_configuration): Remove the error box if mail isn't - configured. - (send_queued_mail): Same. - -2000-09-14 Dan Winship - - * mail-ops.c (setup_append_mail): camel_folder_append is perfectly - happy to take a NULL info. - -2000-09-14 Michael Meeks - - * folder-browser-factory.c: move fn to bonobo. - (set_pixmap): update. - (control_deactivate): add bonobo_ui_handler_unset_container - -2000-09-14 Christopher James Lahey - - * mail-config-gui.h: Changed the include here because it caused - make distcheck to fail for me. I changed it from to - "shell/Evolution.h". This seems to have fixed things. - -2000-09-14 Jeffrey Stedfast - - * mail-ops.c (do_fetch_mail): Only use the cache if the user plans - to keep_on_server. - -2000-09-14 Michael Meeks - - * folder-browser-factory.c (control_deactivate): kill - warning. (control_activate): set threaded toggle state, - add freeze / thaw. - (set_pixmap, fill_toolbar, update_pixmaps): update. - -2000-09-13 Christopher James Lahey - - * folder-browser-factory.c: Fixed a warning (Missing include - file.) - -2000-09-12 Ettore Perazzoli - - ($(EVOLUTION_MAIL_CORBA_GENERATED)): Add space after `-I'. - -2000-09-12 Ettore Perazzoli - - * Makefile.am: Remove `ui.xml' stuff. - -2000-09-12 Dan Winship - - * mail-local-storage.c (mail_local_storage_startup): set - folder_tree before adding the listener, since that will eventually - invoke callbacks that will look at it. - - * folder-browser-factory.c (control_deactivate): sync the folder - on deactivate. - -2000-09-12 Ettore Perazzoli - - * message-list.c (on_right_click): Also display the name of the - mailing list in the "Filter on Mailing List" item for additional - Coolness factor. - - * mail-autofilter.c (filter_gui_add_for_mailing_list): Create the - rule with `filter_filter_new()' so that it also has an action - part. - - * mail-mlist-magic.c (get_header): Use the right header name to - retrieve the header. - -2000-09-12 Ettore Perazzoli - - * message-list.c (on_right_click): Grey out the mailing list - filter item if `mail_mlist_magic_detect_list()' returns NULL on - this message [i.e., if we cannot figure out a mailing list for - this message]. - (filter_mlist): Good boys don't use F words. - - * mail-mlist-magic.c (check_sender): Work safely if - `header_name_return' or `header_value_return' are NULL. - (check_x_been_there): Likewise. - (check_delivered_to): Likewise. - (check_x_mailing_list): Likewise. - (check_x_loop): Likewise. - (get_header): Use the right header name to retrieve the header. - - * message-list.c (on_right_click): Mark strings for translation. - -2000-09-12 Ettore Perazzoli - - * folder-browser-factory.c: Use the latest, shiny, amazing TigerT - art for the toolbar. - - * component-factory.c: #include "mail-local-storage.h". - (owner_set_cb): Removed unused variable. - - * message-list.c (filter_sender): Made static. - (filter_recipient): Likewise. - (filter_subject): Likewise. - (vfolder_recipient): Likewise. - (vfolder_sender): Likewise. - (vfolder_subject): Likewise. - - * mail.h (vfolder_subject): Removed prototype [WTF was this doing - here?!?!]. - (vfolder_sender): Likewise. - (vfolder_recipient): Likewise. - (filter_subject): Likewise. - (filter_sender): Likewise. - (filter_recipient): Likewise. - - * message-list.c: Added a new "Filter on mailing list" menu item. - (filter_mlist): Callback for this menu item. Use - `filter_gui_add_for_mailing_list' to pop up the filter dialog with - the appropriate rule. - - * mail-autofilter.c (filter_gui_add_for_mailing_list): New. - - * message-thread.c (dump_tree): Removed unused variable. - - * mail-mlist-magic.c: New. - * mail-mlist-magic.h: New. - - * mail-autofilter.c (rule_match_recipients): Mark strings for - translation. - (rule_from_message): Likewise. - (filter_gui_add_from_message): Likewise. - -2000-09-12 Jeffrey Stedfast - - * mail-ops.c (do_fetch_mail): Was trying to unhook an event from - the wrong folder - oops. - -2000-09-12 Not Zed - - * message-thread.c: Reverted to version 1.15. - (remove_node): Ok, if a node has a parent, remove it from the - parent list, otherwise remove it from the (supplied) root list. - (group_root_set): When we merge children, free the lost node. - (thread_messages_free): Remove the return, run as is. - (prune_empty): Plugged another small leak. - -2000-09-11 Jeffrey Stedfast - - * mail-callbacks.c (run_filter_ondemand): Updated to use the new - mail_do_filter_ondemand. - - * mail-ops.c (do_fetch_mail): Update to use the new - filter_driver_run args. - (do_filter_ondemand): Updated to use the new filter_driver_run - args. - (mail_do_filter_ondemand): Take a FilterContext as a argument - instead of a driver as we need to destroy the filter inside the - do_filter_ondemand function and things'd get messy. - -2000-09-11 Jeffrey Stedfast - - * mail-ops.c (do_fetch_mail): Don't have the filter driver - self_destruct. - -2000-09-11 Jeffrey Stedfast - - * mail-ops.c (do_fetch_mail): If we're fetching from an mbox - formatted file then we need to do some special-casing. - -2000-09-11 Ettore Perazzoli - - * component-factory.c (owner_set_cb): Call - `mail_local_storage_startup()' to set up handling of the local - storage. - - * mail-local-storage.c: New. - * mail-local-storage.h: New. - -2000-09-11 Christopher James Lahey - - * mail-display.c: Fixed some warnings. - -2000-09-11 Dan Winship - - * mail-display.c, mail-format.c: Another big rewrite of this - stuff. Now all (well, most) attachments get a small icon with a - description and a (non-obvious) right-click pop-up menu with - options to save, open in an external program, or show/hide inline. - - TODO: antialias the icon, add more options to the pop-up for - certain MIME types, add an icon to the headers, fix PGP to work - like everything else, fix message/external-body to work again, - add some icon caching action, etc, etc. - -2000-09-09 Jeffrey Stedfast - - * mail-ops.c (do_fetch_mail): Use the CamelUIDCache so that we - only retrieve *new* messages and also send notes to the status bar - telling it which message we're downloading so that Ettore can - sleep at night ;-) - -2000-09-09 Jeffrey Stedfast - - * mail-ops.c (do_fetch_mail): Updated to not send hook/unhook data - to filter_driver_run as it no longer takes those args. - (do_filter_ondemand): Same. Also wrap filtering in freeze/thaw to - prevent signals from being queued up - -2000-09-09 Jeffrey Stedfast - - * mail-ops.c (do_fetch_mail): Freeze the default folder before - filtering and thaw it afterward to prevent a ton of - "folder_changed" signals from being queued. - -2000-09-08 Christopher James Lahey - - * folder-browser.c, mail-config-gui.c, mail-ops.c: Fixed some - warnings. - - * message-list.c: Added base ETableModel functions. - -2000-09-08 Jeffrey Stedfast - - * mail-ops.c (do_fetch_mail): Updated to pass a CamelMessageInfo - to filter_driver_run - (do_filter_ondemand): Same. - -2000-09-07 Jeffrey Stedfast - - * mail-ops.c (do_filter_ondemand): Updated to check the boolean - return code from filter_driver_run to find out whether or not the - message was filtered so that it can decide whether or not to - delete the message from the source folder or not. - -2000-09-07 Jesse Pavel - - * mail-format.c (mail_generate_reply) Changed the behavior of - Reply-to-All so that the sender's address does not appear in - the cc: list. - -2000-09-07 Jeffrey Stedfast - - * mail-ops.c (do_fetch_mail): Updated to pass an exception to - filter_driver_run and also check the exception before deleting the - message from the source folder. - (do_filter_ondemand): Updated to pass an exception to - filter_driver_run - -2000-09-07 Dan Winship - - * session.c (session_init): Pass a storage dir to - camel_session_new now. - - * main.c (main): Can't call session_init here now, because it - requires evolution_dir to be set. - - * component-factory.c (owner_set_cb): call session_init here. - - * mail-ops.c (do_fetch_mail): Fix previous fix. (Free the uids, - just do it correctly.) - -2000-09-07 Jeffrey Stedfast - - * mail-ops.c (do_fetch_mail): Don't free uids, let the camel - folder do that when it gets finalized - -2000-09-06 Jeffrey Stedfast - - * mail-ops.c (mail_do_filter_ondemand): New async function to - filter messages on demand. - (do_fetch_mail): Updated to filter 1 message at a time using the - new filter-driver code - - * mail-callbacks.c (composer_postpone_cb): Send NULL as the - message info. - (run_filter_ondemand): Use mail_do_filter_ondemand instead of - filter_driver_run - - * mail-tools.c: Removed mail_tool_filter_contents_into and - mail_tool_fetch_mail_into_searchable as they have now been - deprecated. - -2000-09-06 Dan Winship - - * message-list.c (clear_tree): set the data to NULL for the tree - root, so nuke_uids won't try to free anything. - -2000-09-06 Ettore Perazzoli - - * folder-browser.c (folder_browser_new): @shell made const. - `CORBA_Object_duplicate()' it before storing it. - (folder_browser_destroy): Free the shell object with - `CORBA_Object_release()', not `CORBA_free()'. - - * folder-browser-factory.c (folder_browser_factory_new_control): - @shell made const. - -2000-09-05 Dan Winship - - * mail-display.c (make_safe_filename): - * mail-format.c (handle_mystery): - * mail-identify.c (mail_identify_mime_part): - camel_mime_part_get_filename now deals with both - Content-Disposition and Content-Type. - -2000-09-05 Peter Williams - - * mail-ops.c (cleanup_load_folder): Check for NULL folder. - (mail_do_setup_folder): Copy the 'name' parameter so that - we can free it. - - * message-list.c (nuke_uids): Depth '-1' means "unlimited", not 0. - -2000-09-05 Dan Winship - - * component-factory.c (owner_set_cb): Re-rename "Sent". - - * folder-browser.c (fb_resize_cb): Remove the "+ 90" here since it - seems to break things for me, and it's not commented anyway and - there's no excuse for adding 90 to a number with no explanation. - -2000-09-05 Peter Williams - - * folder-browser.c (folder_browser_destroy): Don't free the shell; - it's not ours. - -2000-09-05 Dan Winship - - * mail-tools.c (mail_tool_move_folder_contents): only call - camel_folder_get_message_info if the folder has - summary_capability. Don't hack up a fake CamelMessageInfo: - append_message will take NULL. - - * mail-ops.c: Replace mail_do_setup_draftbox, - mail_do_setup_outbox, and mail_do_setup_sentbox with - mail_do_setup_folder. - (do_send_mail, do_send_queue): s/sentbox_folder/sent_folder/ - - * component-factory.c (owner_set_cb): Use mail_do_setup_folder, - rename sentbox_folder to sent_folder, and call - mail_operation_wait_for_finish after the setup_folder calls in - case anything needs to use the _folder variables. - -2000-09-04 Jeffrey Stedfast - - * mail-format.c (mail_generate_reply): Applied Jesse's patch that - will append a signature to the replied message text - - * folder-browser-factory.c: Changed "Send & Receieve" back to "Get - Mail" temporarily so that the toolbar buttons don't all get - stretched to some weird proportion - -2000-09-03 JP Rosevear - - * mail-config.c (mail_config_add_news): Copy the passed in item - before adding - (mail_config_add_source): ditto - (mail_config_add_identity): ditto - - * mail-config-gui.c (mail_config): We don't actually need a notebook - pointer. - (identities_edit_clicked): Don't explicitly destroy, we are using - gtk_clist_set_data_full now - (sources_edit_clicked): ditto - (news_edit_clicked): ditto - (mail_config): Use gtk_clist_set_row_data_full to kill leaks - -2000-09-03 Jeffrey Stedfast - - * folder-browser-factory.c: Change the "Get Mail" toolbar button - to become "Send & Receieve" - - * mail-callbacks.c (send_queued_mail): New callback function for - sending queued mail - (send_receieve_mail): New callback for Send & Receieve that - basically just calls send_queued_mail and then fetch_mail - - * mail-ops.c (cleanup_send_mail): Mod to be able to handle a NULL - composer window - (setup_send_mail): Modified to handle a NULL composer widget - (mail_do_send_queue): New convenience async function to send all - messages in a folder (aka all messages in a queue) - -2000-09-02 Jeffrey Stedfast - - * mail-tools.c (mail_tool_move_folder_contents): Since POP3 - doesn't implement get_message_info, we need to check for info to - be NULL. In this case, we need to make our own info structure to - pass to append_message and then remember to free it - afterward. Should we even bother with get_message_info? And if so, - should we then implement get_message_info for POP3? - -2000-09-02 Ettore Perazzoli - - * folder-browser.c (etable_key): Make the `Home' key to move to - the beginning of the list and `End' to the end of it, using - `message_list_home()' and `message_list_end()'. - - * message-list.c (message_list_home): New. - (message_list_end): New. - - * folder-browser.c (folder_browser_new): Don't ref the shell here. - (folder_browser_destroy): Don't unref the shell. Instead, - `CORBA_free()' the object reference. - - * folder-browser-factory.c (control_activate): Bind "Open in New - Window" to `Ctrl-O'. - -2000-09-02 Lauris Kaplinski - - * mail-config-gui.c: Use e_utf8 wrappers - - * main.c (main): Do e_unicode_init, so we are not confusing - libunicode - -2000-09-01 Christopher James Lahey - - * folder-browser.c: Removed a warning. - -2000-09-01 Jeffrey Stedfast - - * mail-callbacks.c (compose_msg): Attach a callback to the - postpone signal - (send_to_url): Same - (mail_reply): Same - (forward_msg): Same - (composer_postpone_cb): Callback function for the postpone signal - - * mail-ops.c (mail_do_setup_outbox): New convenience function to - load the Outbox folder - (mail_do_setup_sentbox): Same, but for Sentbox. - (do_send_mail): Now saves messages in Sentbox if sent successfully - (mail_do_append_mail): New convenience async function for - appending messages to a folder - - * component-factory.c: Added outbox_folder and sent_folder - (owner_set_cb): Call our new convenience functions to load Outbox - and Sentbox - -2000-09-01 Ettore Perazzoli - - * mail-ops.c (cleanup_scan_subfolders): Update for the extra arg - needed by `evolution_storage_new_folder()'. - * mail-vfolder.c (vfolder_refresh): Likewise. - -2000-08-31 Peter Williams - - * folder-browser.c (folder_browser_new): Don't ref the shell: - causes a race upon exit. - (folder_browser_destroy): Don't unref it. - - * mail-config-gui.c (service_page_item_new): Add a checkbutton - "use default port" to make life simple. - (service_page_get_url): Honor use_default_port. - (service_page_set_url): Set use_default_port based on the input - URL. - (toggle_port): New function, sets the sensitivity of the - port entry based on "use default port" - - (config_do_query_authtypes): Make this asynchronous, as it - may involve connecting to a server. - (service_page_detect): Call the async auth querier. - (service_page_item_new): Put the authentication stuff in if - the url_flags have URL_ALLOW_AUTH. Call the async auth querier - to get the info. - -2000-08-30 Ettore Perazzoli - - * mail-view.c (mail_view_create): Make the HTML widget grab the - focus. - -2000-08-30 Peter Williams - - * mail-config-gui.c (do_test_service): Explicitly connect to - the service again. - - * component-factory.c (mail_load_storages): Now that - camel_service_get_provider exists, use it to make this function - much simpler. - -2000-08-29 Peter Williams - - * folder-browser.c (folder_browser_new): Ref the Evolution_Shell. - Is this correct, or is it a circular reference? - -2000-08-29 Dan Winship - - * mail-ops.c (mail_do_send_mail): Update this and related - functions to no longer take a From address. (The composer deals - with it itself now.) - (do_send_mail): Add the Evolution version back to the X-Mailer - header (this change got lost in the thread migration). - - * mail-callbacks.c (composer_send_cb): Don't re-fetch the From - address. It's set by the composer now. Don't free the - post_send_data from here. - (mail_reply): Attach to the composer's destroy signal to free the - psd. (The current code would free it more than once if an error - occurred while trying to send the first time.) - -2000-08-28 Peter Williams - - * mail-config-gui.c (mail_config_apply_clicked): Add new news sources, - not only stores. - -2000-08-28 Jeffrey Stedfast - - * mail-callbacks.c (composer_send_cb): Free the from address when - we're done with it. Also, e_msg_composer_hdrs_get_from returns - alloc'd memory so don't strdup it. - -2000-08-28 Peter Williams - - * mail-ops.c (do_transfer_messages): Add status messages. - (do_flag_messages): Same. - (do_scan_subfolders): Same. - (do_forward_messages): Same. - (do_view_messages): Same. - -2000-08-28 Ettore Perazzoli - - * mail-view.c (mail_view_create): Use `gnome_app_set_toolbar()' - the easy way instead of doing things manually with `GnomeDock' and - `gnome_app_add_toolbar()'. - (MINIMUM_WIDTH): New #define. - (MINIMUM_HEIGHT): New #define. - (view_size_allocate_cb): New, callback for the "size_allocate" - signal of the mail view. It saves the last allocation in a static - `last_allocation' variable. - (mail_view_create): Connect it. - (set_default_size): New function. Set the default width/height to - the last allocation width/height; if the width/height is less than - the `MINIUM_WIDTH' or `MINIMUM_HEIGHT', use that value instead. - - * mail-tools.c (mail_tool_move_folder_contents): Show `i + 1', not - `i', so that we correctlly start counting from one instead of zero. - -2000-08-28 Peter Williams - - * *.c: s,mail_dialog_run,gnome_dialog_run,g. - - * main.c (main): Since only the main thread is dealing with GTK+, - free the GDK threads mutex and never worry about locking again. - -2000-08-28 Jeffrey Stedfast - - * mail-crypto.c (mail_crypto_openpgp_encrypt): Fix to prevent - possible buffer overflows and a logic fix. - -2000-08-27 Jeffrey Stedfast - - * mail-crypto.c (mail_crypto_openpgp_clearsign): New crypto - function to clearsign plaintext - -2000-08-27 Ariel Rios - - * folder-browser-factory.c (control_activate): Added bonobo menu - handler for mark_all_deleted function. - - * mail.h: (mark_all_deleted): Added prototype. - - * mail-callbacks.c (mark_all_deleted): Added callback for marking - all displayed messages in a folder as deleted. - -2000-08-26 Ettore Perazzoli - - * mail-view.c (mail_view_create): Use - `gtk_window_set_default_size' on the toplevel instead of - `gtk_widget_set_usize()', and make the default size smaller. - -2000-08-25 Christopher James Lahey - - * mail-crypto.c: Fixed an uninitialized variable. - -2000-08-26 JP Rosevear - - * evolution-mail.gnorba: Kill - - * Makefile.am: Remove gnorba related stuff - -2000-08-25 Peter Williams - - * mail-config-gui.c (service_page_item_new): If the service wants - a host, also let the user specify a port. - (MailDialogServicePageItem): Add members for the port GtkEntry and - the default port. - (service_page_get_url): Translate the port in the entry back into - the CamelURL. - (service_page_set_url): Read in the port from the URL or use - the default. - -2000-08-25 Jeffrey Stedfast - - * mail-crypto.c (mail_crypto_openpgp_encrypt): Implemented PGP 2.x - encryption. We only need to get the passphrase if we plan to sign - the text, otherwise we don't need to worry about getting the - passphrase. - -2000-08-24 Lauris Kaplinski - - * folder-browser.c: Use e_utf8 wrappers - - * mail-config-gui.c: Use e_utf8 wrappers - -2000-08-24 Peter Williams - - * folder-browser-factory.c (control_activate): Add all the - functions from message-list.c's popup menu to the main - menu as well - - * message-list.c (vfolder_subject): These functions become - public. - - * mail-callbacks.c (mark_all_seen): Don't call camel_folder_get_uids - here. IMAP, for example, will try to communicate with the IMAP - server during that call. - - * mail-ops.c (cleanup_fetch_mail): Tell the user - which URL has no new mail, as they may be checking - more than one source. - (mail_do_flag_all_messages): New function. Flags all of - the messages in a folder. Something of a hack. This merely - extends the flag_messages operation; it doesn't implement - a new one. - (do_flag_messages et al): Fetch the uids if we need to; - use camel_folder_free_uids if necessary, etc. - - * mail-tools.c (mail_tool_move_folder_contents): Add - messages to tell the user what's going on. - -2000-08-24 Christopher James Lahey - - * folder-browser-factory.c: Fixed some warnings in the uihandler - code. - -2000-08-24 Peter Williams - - * component-factory.c (mail_load_storages): New function. - Loads a list of URI's as mail storages, and inserts them - into the shell's folder tree if appropriate (really, only - puts them into the folder tree.) - (mail_add_new_storage): Insert a storage into the folder - tree. Not always appropriate (eg, /var/spool/mail/user is - a storage that shouldn't be in the folder tree.) - (create_view): Generate the Evolution_Shell and pass it - to folder_browser_factor_new_control so that its member - 'shell' can be set. - (owner_set_cb): Instead of create_news_storage and - creating the imap storages, load the news storages and - mail storages via mail_load_storages(). - - * folder-browser-factory.c (control_activate): Change to - use providers_config again instead of mail_config. Pass - the folderbrowser so that the config code knows where - to insert the new storages if any are created. Pass - forget_passwords the folderbriwser, too, for good luck. - (folder_browser_factory_new_control): Take a new parameter, - the Evolution_Shell that we belong to. The field in - FolderBrowser has been there but was never getting set by - anything, and we need this to be able to insert new storages - into the shell's folder list. - - * folder-browser.c (folder_browser_new): Accept the - new Evolution_Shell parameter. Set it. (Should we - ref it or something?) - - * mail-config-gui.c (struct MailDruidDialog): Store an - Evolution_Shell. With this we can insert the stores into - the shell's folder list. - (struct MailDialog): Same. - (service_page_item_changed): Close a leak. - (identity_dialog): Unswitch the Add/Edit identity titles. - (news_dialog): Analogous to above. - (mail_druid_finish): Add the new mail source to the shell - view. - (mail_config_druid): Take a new Evolution_Shell parameter - for later use. - (mail_config_apply_clicked): Add all the mail sources to - the shell view. - (mail_config): Take a new Evolution_Shell parameter. - - * mail-callbacks.c (check_configured): Accept a FolderBrowser - so that we know where to put the new storages if any are - created. Almost all the callbacks are passed a FB * anyway - so this isn't a big deal. - (check_send_configuration): Make sure that we're configured - enough to be able to send mail. composer_send_cb() used to - do this, but it would need a FolderBrowser *, and there are - too many entry points to composer_send_cb to make this - feasible. - (fetch_mail): Pass the extra parm to check_configured(). - (free_psd): Move so that composer_send_cb can call this - directly. - (composer_send_cb): Don't check for proper configuration - here -- it is the caller's responsiblity to call - check_send_configuration(). Call free_psd() directly. - (compose_msg): Call check_send_configuration(). - (send_to_url): Same. This is called from mail-display.c, - though, and cannot reasonably be passed a FB. So: we can't - start up the config dialog directly; the user must do it - manually. Oh well. - (mail_reply): Same as above. - (forward_msg): Same as compose_msg(). - (edit_msg): Same as above. - (providers_config): Reenable so that we can pass mail_config - its FolderBrowser. - - * mail-display.c (write_data_to_file): Use the much more - straightforward run_and_close to retrieve the user's answer, - instead of the reply callback stuff. - - * mail-threads.c (mail_dialog_run): New wrapper for - gnome_dialog_run that will take care of the GDK lock correctly. - Far far more complicated than it should be. - (mail_dialog_run_and_close): Analogous to above. - (read_msg): Set inside_read_msg and unset it for the benefit - of the two above functions. Don't bracket ourselves in - GDK_THREADS_ENTER/_LEAVE anymore. - (mail_operation_queue): Use mail_dialog_run_and_close. - (show_error): As above. - (get_password): As above. - - * mail-display.c (write_data_to_file): This has the only - exception to the rule that "use mail_dialog_run(_and_close) - instead of the gnome equivalent always." Not quite sure why - it doesn't work here (the file selection window?). - - * mail-config-gui.c (identity_dialog): Change to - mail_dialog_run_and_close. - (source_dialog): Same as above. - (news_dialog): Same as above. - (cleanup_test_service): Same as above. - (mail_config): Change to mail_dialog_run(). - - * session.c (mail_request_dialog): Change to - mail_dialog_run_and_close. - - * mail-tools.c (mail_tool_uri_to_folder_noex): As above. - - * mail-ops.c (cleanup_fetch_mail): As above. - - * mail-local.c (local_reconfigure_folder): As above. - - * mail-callbacks.c (check_send_configuration): As above. - (ask_confirm_for_empty_subject): As above. - (edit_msg): As above. - (filter_edit): As above. - -2000-08-23 Dan Winship - - * folder-browser-factory.c (control_activate): Reformat a bit, - make "Folder" appear before "Message", fill in the Message menu - more. - -2000-08-23 Peter Williams - - * mail-ops.c (describe_fetch_mail): Don't use the camel calls - to describe the operation. - -2000-08-22 Peter Williams - - * mail-tools.c (mail_tool_get_folder_from_urlname): Don't connect - to the service explicitly. - (mail_tool_send_via_transport): Don't connect to the transport - explicitly. - (mail_tool_get_root_of_store): Same. - - * mail-config-gui.c (do_test_service): Just try camel_session_get_service, - which will now connect for us. - - * message-thread.h: Add a note about *next being the first member - of struct _container... if it isn't, everything goes Very Wrong. - - * message-thread.c (free_container): Extra debug print. - (remove_node): Handle the case of empty containers holding the child - that we're interested in. - (thread_messages_free): Extra debug print. - -2000-08-20 Jeremy Wise - * folder-browser.c: (fb_resize_cb) Added function to monitor resize - of the e_paned in the main view. - -2000-08-18 Peter Williams - - * mail-tools.c (mail_tool_filter_contents_into): Fix a race. filter_driver_run is an - async operation so it won't even be started by the time we sync the folders and check - for the movemailbox to be emtpy. Thus the empty check for the movemail would fail - 99% of the time. - - * mail-callbacks.c (run_filter_ondemand): Pass he new argument to the ever-mushrooming - filter_driver_run. - -2000-08-17 Peter Williams - - * folder-browser-factory.c (control_activate): Fix menu item names. - (register_ondemand): Put the ondemand hooks into the new folder menu. - -2000-08-17 Ettore Perazzoli - - * mail-vfolder.c (vfolder_gui_add_rule): Use stock OK/Cancel - buttons and add i18n support. - - * folder-browser-factory.c (control_activate): Changed menu item - label from "Mark all messages seen" to "Mark All Messages as - Read". Changed capitalization of some other menu items. - (control_activate): Put the message- and folder- related menu - items in new "Message" and "Folder" subtrees which are created in - the `' item created by the shell. - (control_deactivate): Updated accordingly. - (control_activate): Put the filter and vfolder editors, the mail - configuration and the "forget password" command into the - "settings" menu. - (control_deactivate): Updated accordingly. - - * mail-config-gui.c (transport_page_new): Add translation mark. - (service_page_new): Show the menu items before appending them. - (service_page_item_new): Use `GTK_FILL' for the "Detect supported - types..." button. - - * local-config.glade: Change the apply button into an ok button. - -2000-08-17 Peter Williams - - Implement filtering on demand. - - * folder-browser-factory.c (register_ondemand): New function. Callback - to put the filter-on-demand filters into the bonobo UIH; - (create_ondemand_hooks): New function. Read in our on-demand filters - and hook them into the UI. - (remove_ondemand_hooks): New function. Remove the hooks when done with - them. - (control_activate): Call create_ondemand_hooks() - (control_deactivate): Call remove_ondemand_hooks(); - - * mail-callbacks.c (run_filter_ondemand): New function. Callback - for running a filter on demand. - (filter_edit): Pass NULLs as the new arguments to rule_context_load. - - * mail.h: Prototype run_filter_ondemand(); - - * folder-browser.c (oc_destroy): New function. Iterator to destroy - an fb_ondemand_closure. - (folder_browser_destroy): Free the data associated with the ondemand - menu items. - (my_folder_browser_init): Clear the filter_ variables. - - * folder-browser.h: Two new members of FolderBrowser: filter_menu_paths, - a list of fb_ondemand_closures so that the menu items can be freed and - removed; and filter_context, a permanently loaded FilterContext for - running the ondemand filters. Prototype the new fb_ondemand_closure - structure. - - * mail-autofilter.c (filter_gui_add_from_message): Pass NULLs as the - new parameters to rule_context_load (we don't need to hook up ondemand - menu items...) - - * mail-tools.c (mail_tool_filter_get_folder_func): Rename from - get_folder_func() and make public so mail-callbacks.c:run_filter_ondemand() - can use it too. - (mail_tool_filter_contents_into): Use the new name of get_folder_func. - Pass NULLs as the extra arguments to rule_context_load. Pass the - extra source type to filter_driver_run (only use INCOMING). - - * mail-tools.h: Publicly prototype mail_tool_filter_get_folder_func() - - * mail-vfolder.c (vfolder_create_storage): Pass NULLs as the extra - arguments to rule_context_load. - - * message-list.c (message_list_init): Free our strdup'd uids when - the table model gets destroyed. - (nuke_uids): New function. Walk the tree nodes to free the uids. - (nuke_uids_cb): New callback for nuke_uids(); - - -2000-08-16 Richard Hult - - * mail-ops.c (cleanup_display_message): Use a configurable timeout. - - * mail-config.c (mail_config_set_mark_as_seen_timeout): New function - for the settable mark-as-seen timeout. - (mail_config_mark_as_seen_timeout): Likewise. - (mail_config_write): Write the timeout setting. - (config_read): Read timeout setting. - - * mail-config-gui.c (mail_config): Add option for the settable - mark-as-seen timeout. - (mail_config_apply_clicked): Likewise. - (timeout_changed): New function for the timeout setting. - -2000-08-16 Peter Williams - - * message-thread.c (walk_containers): More (default disabled) - mem debugging here. Fix the big leaks. - - * mail-format.c (get_url_for_icon): Copy the url_path so that - it can't get freed under us. - - * mail-threads.c (mail_operation_queue): Fix a leak. - - * mail-ops.c (mail_do_display_message): Fix another leak. - - * message-list.c (message_list_destroy): Remove the seen_id timeout - if necessary. - - * mail-local.c (mail_tool_local_uri_to_folder): Fix a leak. - - * session.c (auth_callback): Fix a leak. Almost seems as if - I've been using Purify... - - -2000-08-15 Peter Williams - - * message-thread.c (alloc_container): Add support for debugging - container allocations -- currently disabled. Make sure that - the g_strfreev works. - - * message-list.c (main_message_changed): Address bug #496 -- - possible race when forwading a message_changed event. - - * mail-threads.c (dispatch): Close the dispatch thread's half of - pipes when about to exit. - (mail_operations_terminate): Close the main thread's half of the - pipes when about to exit. - (all): Add i18n support. - - * mail-tools.c (all): Add i18n support. - - * mail-ops.c (transfer_messages): Generalize move_messages into - transfer_messages so that we can copy too. - (all): Add i18n supprt where appropriate. - - * mail-ops.h: Prototype the new mail_do_transfer_messages. - - * folder-browser-factory.c: Add a UI hook for copy_msg. - - * mail-callbacks.c (transfer_msg): Generalize move so that it supports - copy as well, and add a callback 'copy_msg'. - - * message-list.c (on_right_click): Add a right-click hook for Copy Message. - - * session.c (mail_request_dialog): Don't deadlock when in main thread. - -2000-08-14 Peter Williams - - * mail-threads.c (show_error): Fix the error dialogs. - (read_msg): Re-enable them. - - * mail-ops.c (do_scan_subfolders): Silence a compile warning. - -2000-08-13 Jeffrey Stedfast - - * mail-crypto.c (mail_crypto_openpgp_encrypt): Added support for - encrypting via PGP 5.0 - -2000-08-13 Ettore Perazzoli - - * mail-ops.c (cleanup_create_folder): Release the listener object - with `CORBA_Object_release()', not `CORBA_free()'. - -2000-08-13 Ettore Perazzoli - - * main.c (main): Set the signal handlers for `SIGSEGV' and - `SIGBUS' to the default ones. - -2000-08-13 Jeffrey Stedfast - - * mail-config.c (mail_config_write): Set config->configured to - TRUE - -2000-08-13 Ettore Perazzoli - - * mail-config-gui.c (mail_config_druid): Don't - `GDK_THREADS_ENTER()'/`GDK_THREADS_LEAVE()'. - -2000-08-13 Ettore Perazzoli - - * mail-threads.c (update_active_views): Just iterate through all - the controls, not just the active ones. - - * folder-browser-factory.c: Don't keep track of active controls. - Rather, keep track of all of them. - (folder_browser_factory_get_active_control_list): Removed. - (folder_browser_factory_get_control_list): New. - -2000-08-13 Dan Winship - - * Makefile.am (evolution_mail_SOURCES): add mail-local.h - -2000-08-13 Ettore Perazzoli - - * mail-threads.c (read_msg): For now, don't do anything about - errors. - -2000-08-13 Dan Winship - - * mail-format.c (add_url): Fix some freed-memory references - - * mail-threads.c (get_password): Don't free the prompt. It - doesn't belong to you. - -2000-08-13 Ettore Perazzoli - - * mail-ops.c (mail_do_create_folder): Duplicate the listener - object. - (cleanup_create_folder): Free the listener. - -2000-08-13 Jeffrey Stedfast - - * mail-threads.c (get_password): Don't wrap the gnome_dialog_run - in GDK_THREADS_ENTER/LEAVE - -2000-08-13 Ettore Perazzoli - - * folder-browser-factory.c (control_destroy_cb): Remove the - control from the active control list, if it's there. - - * mail.h (folder_browser_factory_new_control): Removed prototype. - (folder_browser_factory_init): Removed prototype. - - * folder-browser-factory.h: New. - - * folder-browser-factory.c: New static variable `active_controls', - list of the currently active controls. - (control_activate): Add the control to it. - (control_deactivate): Remove the control from it. - (folder_browser_factory_get_active_control_list): New. - - * mail-threads.c (mail_operations_get_status): New function. - - * folder-browser.c (folder_browser_gui_init): Add i18n support for - the labels. - - [The following is actually from a patch by Peter Williams - .] - - * Removed types `PERCENTAGE', `HIDE_PBAR', `SHOW_PBAR'. New - struct `block_info_s'. Removed all the code to create and destroy - the progress window. - -2000-08-13 Jeffrey Stedfast - - * component-factory.c (create_news_storage): Updated to reflect - changes to mail_do_scan_subfolders - (create_imap_storage): Same. - - * mail-ops.c (mail_do_scan_subfolders): No longer takes an - add_INBOX argument - -2000-08-13 Dan Winship - - * mail-ops.c (do_scan_subfolders): Lose a reference to the store - on purpose. To be fixed later. - -2000-08-12 Dan Winship - - * component-factory.c (create_imap_storage): Take the source as a - command-line argument rather than fetching it from mail-config. - (owner_set_cb): Call create_imap_storage on each configured IMAP - store. - - * mail-format.c (decode_pgp): Redo this so that the lock icon - remains active after a failed decryption so you can click on it - and try again. - (try_inline_pgp, handle_multipart_encrypted): Put a border around - the decrypted data. - - * message-list.c (cleanup_regenerate_messagelist): Don't clear the - tree here. If two "folder_changed"s arrive in close succession, - then one possible ordering of events is - cleanup_regenerate_messagelist, cleanup_regenerate_messagelist, - cleanup_thread_messages, cleanup_thread_messages. Which would - result in the message list being filled in twice without being - cleared in between. So don't clear it until the rebuilding - function itself is called. - (clear_tree): New function to empty out the ETreeModel in the - message list. - (build_tree): Change to simpler interface. Call clear_tree. - (build_subtree): Does most of the work of the old build_tree - (build_flat): Remove unused arg. Call clear_tree. - - * message-thread.c (cleanup_thread_messages): Update for - build_tree interface change. - - * mail-ops.c (do_send_mail): Don't leak the transport. - - * mail-tools.c (mail_tool_get_folder_from_urlname): Don't ref the - store returned from camel_session_get_store. It's already reffed. - (mail_tool_get_root_of_store): Ditto. - (mail_tool_send_via_transport): Remove some commented-out code and - fix it to not leave the transport connected if sending fails. - - * mail-callbacks.c (delete_msg): Toggling a flag is an - "instantaneous" operation, so if we're only doing one, just do it - and return, rather than queueing it for the other thread. This - makes the "Delete" key work correctly (move to the next message) - again. - - * mail-identify.c: Remove workaround for gnome-vfs 0.2 bug. - - * mail-format.c (lookup_handler): Remove workaround for function - introduced between gnome-vfs 0.2 and 0.3, since we depend on 0.3 - now. - -2000-08-12 Michael Meeks - - * main.c (main): kill using_oaf assertion. - -2000-08-11 Peter Williams - - * Makefile.am: Make it so that test-mail links - -2000-08-11 JP Rosevear - - * folder-browser-factory.c (control_activate): Move menu items - that affect a single message together, ditto with ones that - affect multiple messages, put a separator in. - -2000-08-11 Christopher James Lahey - - * mail-format.c, mail-tools.h, message-list.c: Fixed a warning. - -2000-08-11 Dan Winship - - * mail-display.c, mail-format.c: Redo this again. Get rid of - struct mail_format_data and move most of that info into - MailDisplay itself, and pass the MailDisplay around. Add a GData** - to MailDisplay, and put the urls hash table into that. Also add - the ability to redisplay the currently-displayed message (with the - same GData**), and add a "show_pgp" datum to it that controls - whether or not to decrypt PGP messages, and redo the PGP stuff - (again) to take that into account. Now you don't get the annoying - PGP password dialog box without any warning. - -2000-08-11 Peter Williams - - * mail-config-gui.c (service_acceptable): Make verify-service - an asynchronous operation. - - * Makefile.am (noinst_PROGRAMS): Don't build test-thread - while mail-threads.c is in flux. - - * mail-threads.c (mail_operation_queue): Make the error - and query dialogs modal. - - * mail-local.c (update_progress): Don't use the - temporarily-disabled mail_op_set_percentage(). - -2000-08-11 Chris Toshok - - * mail-config.c (mail_config_get_default_news): use config->news - instead of config->sources. - -2000-08-11 Dan Winship - - * mail-format.c (destroy_part): Update this for CamelObject - (try_inline_pgp): Deal with decrypting here rather than trying to - pawn the data off to handle_multipart_encrypted, since it most - likely won't be correct (won't have the proper MIME headers inside - the encrypted part). - (handle_multipart_encrypted): Add code from Nathan Thompson-Amato - to re-MIME-parse the decrypted data after decrypting. - - * mail-crypto.c (mail_crypto_openpgp_{de,en}crypt): Get the - password here rather than having it passed in. Remove some dead - code. - - * session.c (mail_request_dialog): Allow this to work in either a - sync or an async context. - -2000-08-11 Peter Williams - - * mail-tools.c (mail_tool_fetch_mail_into_searchable): Don't - do the imap check here... it's a silly place. - - * mail-ops.c (do_fetch_mail): Do the imap check here. - -2000-08-11 JP Rosevear - - * mail-config-gui.c (service_page_new): Work around - gtk option menu bug. - (service_page_item_auth_fill): ditto - -2000-08-11 Peter Williams - - * mail-threads.c (read_msg): Fix the new FORWARD_EVENT handler - (didn't free msg, didn't write newline in the debug) - - * mail-local.c (local_reconfigure_folder): Make the dialog - modal. - - * mail-callbacks.c (select_first_unread): Fix some warnings. - - * mail-threads.c (mail_op_forward_event): New function that - writes a FORWARD_EVENT signal to the compipe, to allow Camel - events to be handled in the main thread. - (read_msg): Handle a FORWARD_EVENT. - - * mail-callbacks.c (select_first_unread): Forward the - event into the main thread to prevent the GTK calls in the - dispatcher thread. - (main_select_first_unread): New name of old select_first_unread. - - * message-list.c (folder_changed): Same as above. - (main_folder_changed): Same as above. - (message_changed): Same as above. - (main_message_changed): Same as above. - - * mail-format.c (free_byte_array): Note about using - mail_op_forward_event. (cmm_destroyed): Same. - -2000-08-11 Dan Winship - - * message-list.c (message_list_select): If the caller passes "-1" - for the model row, translate that to view row 0. - - * message-list.c (idle_select_row): - * mail-callbacks.c (select_first_unread): Use new - message_list_select kludge^H^H^H^H^H^Hfeature - -2000-08-11 JP Rosevear - - * mail-config-gui.c (source_dialog): Allow the window - to be growable - - * mail-config.c: use void in empty declarations - -2000-08-11 Peter Williams - - * mail-config.c (mail_config_get_news): Change () to (void) - if a function takes no arguments. - - * mail-config.h: Prototype mail_config_get_{sources,news}x - -2000-08-11 JP Rosevear - - * mail-config-gui.c (identity_dialog): iddialog, not sdialog - (news_edit_clicked): Kill leftover c-p crud - -2000-08-11 JP Rosevear - - * mail-config-gui.c (news_edit_clicked): Check nrow, not srow. - -2000-08-11 JP Rosevear - - * mail-config-gui.c (service_acceptable): Use camel_object_unref - instead of gtk_object_unref - (mail_druid_finish): Use new config accessors - (mail_config_druid): No need to call config functions - (news_add_clicked): Increments maxnrow, not maxsrow - (mail_config_apply_clicked): Use new config accessors - (mail_config): ditto - - * component-factory.c (create_imap_storage): Use new - config accessors - (create_news_storage): ditto - - * mail-config.glade: Set news clist name correctly - - * mail-config.c (config_read): Rename from mail_config_read and - made private - no one should need to do a read manually. - (mail_config_set_send_html): New accessor - (mail_config_add_identity): ditto - (mail_config_get_sources): ditto - (mail_config_add_source): ditto - (mail_config_get_default_news): ditto - (mail_config_get_news): ditto - (mail_config_add_news): ditto - - * mail-config.h: Prototype new accessors. Config struct is now - in mail-config.c and hidden from the world. - -2000-08-11 Dan Winship - - * mail-ops.c (describe_fetch_mail): Use camel_service_get_name - rather than showing the URL to the user. - -2000-08-11 Peter Williams - - * mail-ops.c (do_refile_messages): Freeze the folders while moving. - (do_flag_messages): Same. - - * mail-threads.c (get_password_clicked): Fix the case when the - user /doesn't/ use escape to cancel the dialog :-/ - (show_error_clicked): Same. - -2000-08-11 Dan Winship - - * mail-tools.c (mail_tool_get_folder_name): Add a function to - return a useful name for a folder (not just "mbox" or "mh" for - any local folder.) - - * mail-ops.c: Use mail_tool_get_folder_name rather than - folder->full_name when printing folder names. - -2000-08-11 Not Zed - - * mail-tools.c (mail_tool_get_local_inbox_url): Properly handle - different local file formats. The folder isn't always mbox. - (mail_tool_do_movemail): Movemail always uses an mbox format - however. - (mail_tool_get_local_movemail_url): What is the mbox url, it is - always the same type, mbox. - (mail_tool_fetch_mail_into_searchable): Same here. - - * mail-local.c (mail_local_map_uri): Map a local uri to the real uri. - -2000-08-10 Christopher James Lahey - - * folder-browser-factory.c, message-list.c, message-thread.c, - session.c: Fixed some warnings. - -2000-08-10 Dan Winship - - * session.c (session_init): Don't call e_setup_base_dir. It was - wrong and it doesn't exist any more. - - * component-factory.c (owner_set_cb): Update for changed - prototype, and record the evolution_homedir. Move call to - mail_config_init here from session.c so it happens after - evolution_dir is initialized. - - * mail.h: define "extern char *evolution_dir;" (formerly in - e-util/e-setup.h) - - * component-factory.c, mail-callbacks.c, mail-config-gui.c, - mail-config.c, mail-display.c, mail-format.c, mail-ops.c, - mail-tools.c, session.c: Remove "e-util/e-setup.h" include. - -2000-08-10 Peter Williams - - * test-thread.c (queue_ops): Use mail_operations_terminate() to - close the other thread nicely. - - * mail-threads.c (get_password_deleted): Handle the "close" event - as a cancel. - (show_error): Same. - -2000-08-10 Dan Winship - - * mail-tools.c (mail_tool_get_folder_from_urlname): Add a - "gboolean create" argument to pass to camel_store_get_folder. - - * mail-ops.c (do_create_folder, do_setup_draftbox): - * mail-local.c (mail_tool_local_uri_to_folder): - * mail-vfolder.c (vfolder_uri_to_folder): Add create flag to - mail_tool_get_folder_from_urlname calls. - -2000-08-10 Jeffrey Stedfast - - * mail-callbacks.c (composer_send_cb): Fix compile warning by - casting the object to a CamelObject - -2000-08-10 Peter Williams - - * mail-tools.c (mail_tool_filter_contents_into): Delete the source - folder if told to and if it's empty - (mail_tool_get_local_movemail_path): New function. - -2000-08-10 Dan Winship - - * mail-callbacks.c (reply_to_all): Fix a bug in the async changes. - (This was identical to reply_to_sender.) - -2000-08-10 Not Zed - - * mail-local.c (do_local_reconfigure_folder): Update for - append_message api change. - - * message-list.c (message_list_regenerate): Change for search api - change. - (ml_tree_value_at): Add a colour column, based on the colour - assigned in the summary. - (message_list_init_renderers): Init colour column. - -2000-08-09 Peter Williams - - * mail-display.c (part_for_url): Remove a gtk_object_get_data - -2000-08-09 Cody Russell - - * folder-browser-factory.c, mail-view.c: Make the toolbars - honor the user's gnomecc settings for detachable toolbars. - -2000-08-09 Jeffrey Stedfast - - * mail-ops.c (composer_send_cb): Get the from address set in the - composer, if that fails ONLY THEN get the default from mail config - - * mail-config.c (mail_config_get_identities): New convenience - function for getting a list of the configured identities - -2000-08-09 Dan Winship - - * mail-display.c (on_object_requested): Support controls as well - as embeddables. - -2000-08-09 Jeffrey Stedfast - - * mail-view.c (mail_view_create): Changed to only take a - FolderBrowser argument - - * mail-ops.c (real_view_msg): Create a new FolderBrowser for each - message being opened in a new window. Also set the - message_list->cursor_uid and mail_display->current_message to the - appropriate values. - (real_view_msg): Updated to reflect changes in the mail_view_create - - * message-list.c (on_right_click): Nicify a little, add in a menu - separator between VFolder and Filter stuff. - - * mail-ops.c (real_view_msg): Set the UID of the message that is - being displayed - -2000-08-09 Ettore Perazzoli - - * folder-browser-factory.c (control_activate): Use - `GNOME_STOCK_MENU_*' things instead of `GNOME_STOCK_PIXMAP_*' - things, that are too big and look bad. - -2000-08-09 Peter Williams - - * mail-view.c (mail_view_create): Save the top window so that on_close - can find it [with set_data]. - (on_close): Recover the top window. - - * mail-threads.c (read_msg): Destroy the window instead of hiding it. - -2000-08-09 Not Zed - - * mail-autofilter.c (filter_gui_add_from_message): Helper function - to add with confirm. - (rule_match_recipients): Dont set real name if its empty for the - filter name. - (rule_match_subject): was cutting ] off mailing list names. - - * message-list.c (on_right_click): Added menu to install - vfolders/filters from message. - -2000-08-09 Not Zed - - * mail-autofilter.c: New file to hold auto filter/vfolder stuff. - -2000-08-09 Christopher James Lahey - - * mail-display.c, mail-format.c, mail-ops.c: Fixed some warnings. - - * message-list.c: Fix the call to e_popup_menu_run to match the - new signature. - -2000-08-09 Ettore Perazzoli - - * folder-browser-factory.c (control_activate): Create a "print - message" menu item. - -2000-08-09 Jeffrey Stedfast - - * message-list.c (message_list_init): Attached a double_click - signal handler - (on_double_click): Our lovely new double_click callback. Will - display the current selected message in a new window - -2000-08-08 Jeremy Wise - * mail-config.[ch], folder-browser.c: Added configuration work to - save the size of the vpaned widget. It will be functional when the - e_paned widget emits a "resized" signal - -2000-08-08 Jeffrey Stedfast - - * mail-config.h: Added void as an argument to functions not - needing any parameters to avoid compile warnings. - -2000-08-08 Jeremy Wise - * mail-config.[ch], main.c, folder-browser-factory.c: State of the - threaded list toggle is now saved via gnome_config - -2000-08-08 Dan Winship - - * mail-config-gui.c (service_page_item_new): Attach a signal - handler to call the "changed" function when the user clicks the - "keep on server" checkbox. - -2000-08-08 Jeffrey Stedfast - - * mail-ops.c (view_msg): New convenience function with params of a - normal Gtk callback function. We also now create a new - FolderBrowser object so that the message-view window isn't tied to - the display in the main window - (view_message): Now calls view_msg (this function is a bonobo - callback and can't be used with gtk widgets) - (edit_msg): Same idea as view_msg() - (edit_message): Again, same as view_message() - - * message-list.c (on_right_click): Callback for creating an - e-popup-menu - (message_list_init): Added a right_click event to trigger a pop-up - menu to be displayed - -2000-08-08 Dan Winship - - * mail-config-gui.c: Add "Don't delete messages from server" - button to remote SOURCEs that aren't STORAGEs (ie, POP). - (provider_list): Only list SOURCEs. (ie, not mh) - - * mail-config.c: Save/load "keep_on_server" flag. - - * mail-ops.c (fetch_remote_mail): New function, split out of - real_fetch_mail. Deals with copying mail from a remote server into - a temporary mbox, possibly using a CamelUIDCache to leave the - messages on the server. - - * mail-crypto.c, mail-format.c, message-thread.c: Fix some - compiler warnings. - - * mail-format.c (mail_generate_reply): Fix up format of addresses. - (write_headers): Use CamelAddress functions to simplify this. - -2000-08-08 Jeffrey Stedfast - - * mail-view.c: Lets get rid of the last separator in the toolbar - until we add n/p - -2000-08-08 Ettore Perazzoli - - * mail-threads.c (queue_window_delete_event_cb): Callback for - "delete_event", just doing nothing. - (create_queue_window): Connect it to the "delete_event" signal of - the progress dialog. - -2000-08-08 Peter Williams - - * mail-threads.c (remove_next_pending): Sanity check for - job queue, which seems to have some issues. - (read_msg): Make sure that the next operation isn't started - before the last one is cleaned up. - - * mail-callbacks.c (fetch_mail): Fix erroneous free. - - * mail-config-gui.c (mail_config_druid): Wrap the gtk_main call. - - * mail-ops.c (do_flag_messages): Allow specification of whether - to set the flags unconditionally or toggle their current state. - - * message-list.c (ml_tree_set_value_at): Toggle the seen status; - don't set it unconditionally. - - * mail-callbacks.c (delete_msg): Toggle the deletion status; - don't set it unconditionally. - - * mail-tools.c (mail_tool_do_movemail): Fix for undeclared tmpfd. - - * mail-local.c (local_reconfigure_folder): Big rewrite; make into - an asynchronous operation. Use some mail tools to make life easy. - -2000-08-08 Dan Winship - - * main.c (main): Move mail_config_init after session_init, since - it depends on evolution_dir being set. - -2000-08-08 JP Rosevear - - * mail-ops.c (check_configured): Use config accessors - (fetch_mail): ditto - (composer_send_cb): ditto - (create_msg_composer): ditto - - * mail-config-gui.h: Update API - - * mail-config.h: Update API - - * mail-config.c: Add accessor functions - (mail_config_is_configured): accessor function - (mail_config_get_default_identity): ditto - (mail_config_get_default_source): ditto - (mail_config_get_transport): ditto - (mail_config_send_html): ditto - (identity_copy): Make public - (identity_destroy): ditto - (identity_destroy_each): ditto - (service_copy): ditto - (service_destroy): ditto - (service_destroy_each): ditto - (mail_config_init): Rename from init_config and make public - (mail_config_clear): Rename from clear_config and make public - (mail_config_read): Rename from read_config and make public - (mail_config_write): Reanme from write_config and make public - - * main.c (main): Call mail_config_init. - - * mail.h: Include mail-config-gui.h - - * mail-config-gui.c: Move config gui stuff here. - (source_dialog): Kill memory leak from debug leftovers. - Make sure returned source is NULL by default - -2000-08-07 Not Zed - - * mail-local.c (local_reconfigure_folder): Redone to show a - dialogue first, and show progress of whats happening as its done. - - * Makefile.am (glade_DATA): Added local-config.glade, for mailbox - reconfig dialogue. - -2000-08-04 Not Zed - - * folder-browser.c (mail_uri_to_folder): Use local_uri_to_folder() - for local uri's (file://). - - * mail-local.c (local_uri_to_folder): Handle looking up folder - storage type before opening the store/folder. - (local_reconfigure_folder): Function to reconfigure the format of - a local mailbox into another storage format. - - * Makefile.am (evolution_mail_SOURCES): Added mail-local.c and - missing mail-vfolder.h. - -2000-08-07 Jeffrey Stedfast - - * Makefile.am: Added mail-view.c - - * folder-browser-factory.c (control_activate): Adda menu item for - viewing the message - - * mail-view.c: New file containing methods for viewing messages in - separate windows - - * mail-ops.c (view_message): New callback for viewing messages in - a new window. - -2000-08-07 Jeffrey Stedfast - - * component-factory.c (real_create_generic_storage): New function - to replace real_create_imap_storage and real_create_news_storage - (create_imap_storage): Updated. - (create_news_storage): Updated. - -2000-08-07 Peter Williams - - * mail-ops.c (cleanup_edit_messages): New operation: edit_messages - For continuing draft messages. - (attach_messages): Fix accidental 0 datasize. - (do_setup_draftbox): New operation: setup_draftbox. Soooo hacky. - - * mail-callbacks.c: Move fejj's edit message to the async home. - - * component-factory.c (owner_set_cb): Use mail_do_setup_draftbox. - - -2000-08-07 Jeffrey Stedfast - - * mail-display.c: - * component-factory.c: s/strncasecmp/g_strncasecmp - - * mail-format.c (write_headers): Get rid of kludge around subject - beginning with spaces. - (mail_generate_reply): Get rid of kludge around subject beginning - with spaces and also use g_strncasecmp instead of strncasecmp for - portability - - * mail-ops.c (forward_msg): Get rid of kludges around subject - beginning with spaces. - -2000-08-07 Dan Winship - - * message-list.c (message_list_select): Clarify that the input row - is a model row, and swap it to a view row when finding the - next/previous row. - (idle_select_row): Select view row 0, not model row 0. - - * mail-ops.c (select_first_unread): Start from view row 0, not - model row 0. - -2000-08-07 Jeffrey Stedfast - - * mail-format.c (mail_get_message_body): Renamed from reply_body() - so other functions can use it - (mail_generate_reply): Updated to reflect function name changes - - * mail-ops.c (real_edit_msg): Attach a callback to the send signal - -2000-08-07 Jeffrey Stedfast - - * folder-browser-factory.c (control_activate): New menu item under - Actions to allow editing of messages. - - * mail-ops.c (edit_message): New function for editing messages. - - * component-factory.c (owner_set_cb): Create a global reference to - the Drafts mbox folder for the Composer to use - -2000-08-06 JP Rosevear - - * mail-config.c (ndialog_page_undone): Desensitize ok button - (sdialog_page_undone): ditto - (iddialog_page_undone): ditto - (news_page_new): Typo - news, not mail - (transport_page_new): Typo - transport, not source - (identity_dialog): Set undone callback - (source_dialog): ditto - (news_dialog): ditto - (mail_druid_identity_undone): Desensitize next button and - mark done flag as false - (mail_druid_source_undone): ditto - (mail_druid_transport_undone): ditto - (mail_druid_identity_done): Mark done flag as true - (mail_druid_source_done): ditto - (mail_druid_transport_done): ditto - (mail_druid_prepare): Use done flag to set next button - sensitivity, fixes #467 - -2000-08-06 Jeffrey Stedfast - - * mail-crypto.c (mail_crypto_openpgp_encrypt): Added support for - encrypting with GnuPG. Support for PGP5 and PGP2 are still in - progress. - -2000-08-05 Dan Winship - - * folder-browser-factory.c (control_activate): Remove bonobo 0.15 - vs 0.15-and-a-half ifdef, since we require post-0.16 now. - -2000-08-04 Dan Winship - - * mail-threads.c (mail_operation_wait_for_finish): Don't use - "while (gtk_events_pending ()) gtk_main_iteration ();" inside - another tight loop, because it makes the thread spin rather than - blocking and waiting like it should. - -2000-08-04 Peter Williams - - * message-thread.c (do_thread_messages): Uninitialized variable - fix. - - * mail-threads.c (read_msg): Small leak fix. - - * component-factory.c (owner_unset_cb): Use mail_operations_ - terminate() instead of wait_for_finish(). - - * mail-threads.c (mail_operation_queue): Centralize the clur - handling functions; fix a race condition where the dispatcher - would overwrite the closure before the main thread could - free the old one. - (mail_operations_terminate): New function, wait for ops to - finished and kill the other thread. - (dispatch): changes to die when terminate is called (abort - on NULL spec). - - * mail-ops.c (cleanup_display_message): Fix improper handling - of displaying a NULL message (which means clear the message - display). - -2000-08-04 Ettore Perazzoli - - * message-list.c (message_list_regenerate): Free the GPtrArray - correctly instead of using `g_strfreev()'. - -2000-08-04 Michael Meeks - - * folder-browser-factory.c (control_activate): release the ui_handler - after set_container. - -2000-08-03 Michael Meeks - - * mail-config.c (identity_page_new): only whack the sig in if the - file exists. - - * component-factory.c (factory_fn): count running instances, - attach destroy signal (factory_destroy): add. - - * main.c (main): pass orb around. - -2000-08-03 Jeffrey Stedfast - - * mail-ops.c (composer_send_cb): Yay, no more compiler warnings - - * mail-config.c: set config = NULL - (provider_list) Eek! Initialize news to NULL! Also, use - g_slist_prepend() for "performance" gains ;-) - (init_config): Set the config member data to NULL just to be on - the safe side - (clear_config): Don't bother freeing slist data if the slist is - NULL - -2000-08-03 Peter Williams - - * mail-ops.c (op_forward_messages): Use the new dynamic - operation naming. - - * message-thread.c (describe_thread_messages): Ditto. - - * message-list.c (describe_regenerate_messagelist): Ditto. - - * mail-threads.c (get_password_clicked): Dynamic generation - of descriptive text for mail operations. "Opening a folder" -> - "Opening INBOX". Supported only so far, will be implemented - quickly. - g_strdup() the old_message when changing the queue_window_label's - text. - - * main.c (main): One more gconf reference to take out... - - * mail-ops.c (composer_send_cb): Check for an identity before - sending. - -2000-08-03 JP Rosevear - - * mail-config.glade: Increase window size slightly, rename - "Transport" to "Mail Transport" - - * mail-config.c (init_config): Remove gconf references - (clear_config): ditto - (read_config): ditto - (write_config): ditto - (mail_config): Null provider lists before filling them - (mail_config_druid): ditto - (identity_page_new): Increase spacing of vbox - (service_page_new): ditto - - * Makefile.am: Remove gconf references. - -2000-08-02 Dan Winship - - * mail-config.c (service_page_item_new): Make the "test settings" - button FILL rather than SHRINK so it doesn't end up oddly-placed. - - * mail-config-druid.glade: Make the icon background dark blue - like the surrounding area. - -2000-08-02 Peter Williams - - * component-factory.c (owner_unset_cb): Wait for async operations - to finish before exiting. - -2000-08-02 Christopher James Lahey - - * mail-ops.c, message-list.c: Emit "model_pre_change" where - appropriate. - -2000-08-02 Peter Williams - - * mail-config.h: #ifdef _MAIL_CONFIG_H protect the header. - -2000-08-01 Peter Williams - - * mail-threads.c: Implement Solaris threads. Attempt - to join to the thread upon exit -- hopefully prevents - all those nasty zombie processes from popping up :-( - -2000-08-01 Dan Winship - - * mail-crypto.c: New code to spawn off GPG/PGP to do stuff. - Currently only deals with decryption. From Nathan Thompson-Amato - , with bunches of changes from me. - - * session.c (mail_request_dialog): Expose the password dialog to - the rest of the app (for use by the GPG/PGP code). - - * mail-format.c (handle_text_plain): Handle special inline data - types. (Currently uuencoding, BinHex, and PGP encryption.) This is - not the best way to deal with it, but it works for now. - (try_inline_pgp): Convert an inline PGP-encrypted message into a - multipart/encrypted part. - (try_inline_binhex): Convert an inline BinHex attachment into an - application/mac-binhex40 part (which we currently don't deal - with...) - (try_uudecoding): Convert a uuencoded attachment to an - application/octet-stream part. - (handle_multipart_encrypted): Deal with RFC2015 MIME-encoded PGP - encrypted messages. (From ndt.) - - * mail-display.c (mail_text_write, mail_error_write): New utility - functions. - - * Makefile.am (evolution_mail_SOURCES): add mail-crypto.c - -2000-07-31 Christopher James Lahey - - * component-factory.c, folder-browser.c: Fixed some warnings. - - * message-list.c: Made the icon column non sortable. - -2000-07-31 Dan Winship - - * mail-config.c (service_page_set_url): Fix a NULL-pointer strcmp - noticed by peterw. - -2000-07-31 Not Zed - - * mail-vfolder.h: Header for vfolder functions. - - * folder-browser.c (mail_uri_to_folder): Use new scheme to open - vfolders. - (search_save): New button/function to save a search as a vfolder. - - * mail-vfolder.c (vfolder_edit): Made asynchronous. - (vfolder_uri_to_folder): New function for loading vfolders and - setting up their source folders. - (vfolder_refresh): Change shell vfolder uri's to indirect - references rather than the real vfolder uri. - (vfolder_gui_add_rule): Add a rule with user confirmation. - (vfolder_create_part): Get a new part by name, for creating rules - in code. - - * message-thread.c (thread_messages): Check for uid lookup - failure, which indicates an error in the folder or calling code. - -2000-07-29 Not Zed - - * component-factory.c (create_view): Remove hack to pass the - storage around. - - * folder-browser-factory.c (control_activate): Changed to call - renamed vfolder editor. - - * mail-ops.c (vfolder_edit_vfolders): renamed from vfolder_edit, - call new edit function. - (vfolder_editor_clicked): Removed. - (filter_druid_clicked): - (filter_edit): Updated for api change. - (real_fetch_mail): Fixed up for api change and fucked up indent. - (filter_get_folder): callback for filter driver. - - * mail-vfolder.c: New file to manage virtual folders. - -2000-07-29 JP Rosevear - - * mail-format.c (mail_generate_reply): Use new mail config stuff - - * component-factory.c (create_imap_storage): Use new mail config - stuff - (create_news_storage): ditto - - * evolution-mail.schemas: Gconf schema for evolution mail - - * mail-config-druid.glade: Gladification of config druid - - * mail-config.h: New header with config structs. - - * mail-config.c: Rewrite of GUI configuration tools to use - new config structs. Stores multiple identities and sources now. - Still only uses the first one found. - (mail_config_fetch): Returns MailConfig struct to caller - for configuration queries. - (mail_config): Renamed function to show mail config dialog. - (mail_config_druid): Renamed function to show mail config druid. - - * mail-ops.c (create_msg_composer): Use - e_msg_composer_new_with_sig_file and new config stuff - (check_configured): Use new config stuff - (fetch_mail): ditto - (composer_send_cb): ditto - -2000-07-28 Cody Russell - * mail-ops.c, mail.h: Added mark_all_seen(), to mark every - message in the list with CAMEL_MESSAGE_SEEN. - - * folder-browser-factory.c: Added "Actions/Mark all seen". - -2000-07-27 Jeffrey Stedfast - - * mail-config.c: Lets fix Dan's kludge the Right Way (tm) - (set_service_url): Only strip off the leading "/" from the - url->path if url->host is NULL - (get_service_url): Only prepend a leading "/" to the path if the - host is NULL - -2000-07-27 Dan Winship - - * mail-config.c (get_service_url): toss in a kludge to deal with - the IMAP vs mbox path problem for now. - -2000-07-26 Christopher James Lahey - - * message-list.c, message-list.h: Removed counting of selected - messages. - -2000-07-26 Dan Winship - - * mail-ops.c (real_fetch_mail): Don't create the tmp_mbox before - calling movemail, because the external movemail requires it to not - exist. Contrariwise, delete it in the cleanup code if it's empty. - Update for camel_movemail interface change. Do the "No new - messages" dialog in the mbox case as well as the remote mail - issue. - -2000-07-26 Jeffrey Stedfast - - * mail-ops.c: s/struct refile_data/struct move_data - (real_move_msg): Renamed from real_refile_msg() - (move_msg): Renamed from refile_msg() - - * folder-browser-factory.c: Changed Refile to Move. - -2000-07-26 Dan Winship - - * mail-format.c (lookup_handler): Update for OAF and for external - apps as well as components. - (handle_via_external): Handler to set up for data that can be - displayed by an external application. - - * mail-display.c (on_link_clicked, etc): Refactor the save_data() - code and add launch_external() as a handler for - x-evolution-external URLs. - (embeddable_destroy_cb): Remove this, since it seems like it's all - wrong. - (on_object_requested): Update for OAF, and fix some bugs. - -2000-07-25 Jeffrey Stedfast - - * mail-config.c (get_service_url): Always prepend a leading "/" to - the url->path. - (set_service_url): Added more error checking and also strip the - leading '/' from the url->path - (create_identity_page): Set the signature file to the one specified in - the identity record, else set the default path to ~/.sugnature - -2000-07-25 Michael Meeks - - * mail-config.c (create_identity_page): set default signature to - ~/.signature - -2000-07-25 Peter Williams - - * mail-ops.c (reply): Check for the case of fb->mail_display-> - current_message = NULL, which shouldn't happen, but has happened - to me. - -2000-07-25 Dan Winship - - * message-thread.c (group_root_set): Don't group together messages - with the same non-Re: subject and no References/In-Reply-To. More - often than not, they're unrelated. (eg, "[No subject]".) - (thread_messages): Handle messages with no Message-Id. "This - shouldn't happen", but it does sometimes, and it's not much code - to make it just work. - -2000-07-25 Ettore Perazzoli - - * mail-config.c (create_service_page): Call - `gtk_option_menu_set_menu()' as the last thing, as `GtkOptionMenu' - is fscking broken. Also, `gtk_widget_show()' the individual menu - items. - -2000-07-24 Dan Winship - - * message-list.c (mark_msg_seen, ml_tree_set_value_at, - message_list_regenerate): Update for CamelFolder API changes. - (Certain functions no longer take a CamelException.) - - * mail-ops.c (real_fetch_mail, real_send_mail, real_delete_msg): - ditto - - * component-factory.c (real_create_imap_storage, - real_create_news_storage): ditto - -2000-07-24 Dan Winship - - * component-factory.c, folder-browser-factory.c, test-mail.c: - Remove GOAD support. - - * main.c: Remove GOAD support. - (main): More "guess the build mistake" fun, this time for the - failure to initialize Bonobo case. - -2000-07-24 Peter Williams - - * mail-tools.c (mail_tool_set_uid_flags): Change - function to faithfully pass parameters to - camel_folder_set_message_flags; this function is - somewhat useless now. Other files synced with - API change. - - * mail-ops.c (op_display_message): Change "display - a message" into "retrieve a messsage" in the - description of mail_op_display_message. - - * mail-threads.c (display_timeout): New function. - Only display the progress dialog if the operation - takes more than a second to perform. - (hide_queue_window): New function. Hide the queue - window as an idle function... I'm thinking maybe - the problem with hiding it was due to us not - being in a GTK event sequence? Perhaps it's only - the timeout, which was not being cancelled, which - is now. - - * message-list.c (get_message_uid): New function, - copy of get_message_info, except gets only the - UID, as that's all that most functions want, and - we avoid a Camel call. - -2000-07-23 Ettore Perazzoli - - * mail-ops.c (create_message_composer): New. - (compose_msg): Use it. - (send_to_url): Likewise. - (forward_msg): Likewise. - - * folder-browser-factory.c (control_activate): Use `_()' instead - of `N_()'. - -2000-07-21 Peter Williams - - * message-thread.c (setup_thread_messages): New - operation: thread_messages, simple wrapper around - thread_messages () and thread_messages_free(); - - * message-list.c (cleanup_regenerate_messagelist): - Use new thread_messages operation instead of just - calling ... thread_messages :-) - - * folder-browser.c (folder_browser_destroy): Use new - sync_folder operation instead of calling camel_folder_sync - directly. - - * component-factory.c (create_folder): Changed to use - new create_folder operation. - - * mail-ops.c (mail_do_create_folder): New operation: create - folder. New operation: sync folder. - - * mail-format.c (cmm_destroyed): Remove the url hashtable from - the larger hashtable when it gets destroyed. - - * mail-callbacks.c (fetch_mail): Pass a hook function and data - down the chain to pick up the folder_changed and change the view. - - * mail-ops.c: Rename from mail-ops-new.c now that it's a little more - solid. - (fetch_mail): Add new options to hook and unhook an event while the - filter driver runs. A hack, but all of the operations are to some - extent. - (cleanup_fetch_mail): Unref the destination folder if not NULL. - * mail-tools.c (mail_tool_filter_contents_into): Intermediate the - event hook/unhook hack here. - -2000-07-20 Peter Williams - - * mail-ops-new.c (setup_send_mail): Fix silly forgetting-to-ref - problem on some sends (when not replying). Note the early exit - path with a big comment. - - * message-list.c (message_list_set_folder): Don't call - folder_changed, call mail_do_regenerate_messagelist, as - the GDK_THREADS_ENTER in the former can deadlock us! - - * folder-browser.c (folder_browser_set_uri): Ah, screw it. - Make 'load folder' asynchronous and pretend that it always - succeeds. - - * mail-ops-new.c (mail_do_load_folder): New operation, loads - a folder into a FolderBrowser. - - * mail-threads.c (read_msg): Check if the exception is - a user cancel; don't complain if it is. - (mail_operation_queue): Same. - (dispatch_func): Same. - -2000-07-20 Peter Williams - - * mail-ops-new.c (cleanup_send_mail): Fix evil mistaken - unref. - - * test-thread.c: Fit the new mail_operation_spec prototype. - - * mail-callbacks.c (composer_send_cb): Hide the composer upon - start of send operation. - - * folder-browser.c: #include "mail-ops-new.h" - - * mail-threads.h: Change text fields of mail_operation_spec to - provide two forms of the name. - - * mail-threads.c: Use appropriate new string fields. - (dispatch_func): Hide the progressbar by default. - - * message-list.c (op_regenerate_messagelist): Fix the datasize from - 0 -> sizeof (regenerate_messagelist_data_t). Add the new gerund and - infinitive strings. - (do_regenerate_messagelist): Include some code that fell between the - cracks. - - * mail-ops-new.c (op_scan_subfolders): Same datasize fix for - scan_subfolders. - (op_forward_message): Same. - (all): Add new gerund and inifinitive strings for mail_operation_spec. - (cleanup_send_mail): Destroy the composer on success; re-show it on - error. I'm so clever! - -2000-07-20 Ettore Perazzoli - - * component-factory.c (factory_fn): Updated for the new - `evolution_shell_component_new()' arg. - -2000-07-19 Jeffrey Stedfast - - * message-thread.c (thread_messages): What if message info is NULL? - -2000-07-17 Peter Williams - - * component-factory.c (real_create_{imap,news}_storage): Instead of - directly calling evolution_storage_new_folder, queue up a list of - folders to register so that we don't do our CORBA in The Other Thread. - (create_{imap,news}_storage): Changes ancillary to the above. - (add_new_mailbox): New function to queue up a folder - (cleanup_create_info): New function to dequeue the folders and free mem. - - * test-thread.c: s,ENABLE_BROKEN_THREADS,USE_BROKEN_THREADS -- oops - - * mail-format.c: (mail_lookup_url_table): New function to get the url - table associated with a CamelMimeMessage because we can no longer - gtk_object_get_data on it. - - * mail-display.c: replace 'gtk_object_get_data( message, "urls" )' - with 'mail_lookup_url_table( message )' - -2000-07-16 Jeffrey Stedfast - - * folder-browser.c, component-factory.c: Initial code to support - IMAP folders that don't use "/" as a directory separator. - -2000-07-15 Ettore Perazzoli - - * mail-ops.c (set_x_mailer_header): New helper function to set the - `X-Mailer:' header to to `Evolution [Developer - Preview]". - (real_send_mail): Call it. - -2000-07-14 Peter Williams - - * message-list.c (message_list_set_folder): Ported to CamelObject: - GTK_OBJECT->CAMEL_OBJECT; gtk_signal_connect->camel_object_hook_event; - GDK_THREADS_ENTER/LEAVE around "changed" event hooks. - - * folder-browser.c (folder_browser_destroy): likewise. - (mail_uri_to_folder): likewise. - (folder_browser_load_folder): likewise. - -2000-07-14 Ettore Perazzoli - - * Makefile.am (evolution_mail_LDADD): Add `GCONF_LIBS'. - -2000-07-14 Dan Winship - - * mail-format.c (write_headers): put a

    at the end of the - header table. (I think there used to be whitespace after it, but - then some gtkhtml change got rid of it...) - (handle_text_plain): Don't do this 

    . Instead, CONVERT_NL and
-	CONVERT_SPACES and wrap it in . Now if the sender didn't
-	include any newlines, it will be wrapped to the width of the
-	window instead of extending off into infinity.
-
-2000-07-13  Dan Winship  
-
-	* message-list.c (message_list_destroy): Only unref the folder if
-	it's been set.
-
-	* folder-browser.c (folder_browser_destroy): Only sync the folder
-	if it's been set.
-
-2000-07-13  Jonathan Blandford  
-
-	* mail-config.c (create_transport):
-	s/CAMEL_SERVICE_NEED_HOST/CAMEL_SERVICE_URL_NEED_HOST.
-
-2000-07-13  Dan Winship  
-
-	* mail-config.c (add_row): Add a "gboolean required" argument, and
-	set its value on the entry.
-	(create_source, create_transport): Create rows for URL elements if
-	the URL ALLOWs them. Mark them required if it NEEDs them.
-	(service_note_doneness): Only require the required fields to be
-	filled in.
-
-	Now the IMAP config page allows the user to enter a path, but
-	doesn't require it.
-	
-2000-07-13  Jeffrey Stedfast  
-
-	* mail-ops.c (real_fetch_mail): Back to the old way to avoid
-	g_warnings, yay. Also fix append to send a flags argument (0)
-
-2000-07-12  Chris Toshok  
-
-	* mail-config.c (providers_config_new): fix some cut & paste bung.
-
-2000-07-12  Chris Toshok  
-	
-	* mail-format.c (setup_function_table): add "message/news" to the
-	mime_function_table using the same handler as message/rfc822.
-
-2000-07-12  Chris Toshok  
-
-	* mail-config.glade*: add news server tab to dialog.
-
-	* mail-config.c (on_NewsServerConfigDialogButton_clicked): new function.
-	(on_clistNewsServers_select_row): new function.
-	(on_cmdNewsServersAdd_clicked): new function.
-	(on_cmdNewsServersEdit_clicked): new function.
-	(on_cmdNewsServersDelete_clicked): new function.
-	(providers_config_new): mirror the source tab's code to fill in
-	the news server tab.
-	(write_config): save out the news server.
-	(create_news_server_config_dialog): new function.
-	(create_news_server_page): new function.
-
-2000-07-12  Peter Williams  
-
-	* mail-display.c (save_data): Change from evolution_dir to
-	g_get_home_dir() for default location of save file.
-
-2000-07-11  Dan Winship  
-
-	* Update for CamelFolder API changes
-
-2000-07-11  Jeffrey Stedfast  
-
-	* mail-ops.c (real_fetch_mail): Changed to use 
-	camel_folder_move_message_to () rather than get_message () and then
-	append_message (). This also makes it so we don't have to worry about
-	fetching message flags to pass to the new append_message () method.
-
-	* folder-browser.c (folder_browser_load_folder): Disable
-	Search capability menu/entry if folder doesn't support it.
-
-	* message-list.c (message_list_regenerate): Don't perform
-	a search if the folder doesn't support it.
-
-2000-07-11  Dan Winship  
-
-	* mail-ops.c (real_send_mail): Set the post_send_data flag rather
-	than toggling it. (Maybe we'll need more control over it later,
-	but for now, the only flag we set is "replied", and we want
-	that set, not toggled.)
-
-2000-07-10  Dan Winship  
-
-	* folder-browser-factory.c (control_activate): Work with both
-	current and 0.15 bonobo
-
-	* kill more debugging messages
-
-	* mail-ops.c (real_fetch_mail): Don't multiply free dest_url.
-
-	* message-list.c (message_list_select): Update
-	message_list_select_next to do either next or previous.
-
-	* folder-browser.c (etable_key): Make 'n' and 'p' do next and
-	previous unread message.
-
-	* mail-ops.c (select_first_unread): Update.
-	(real_fetch_mail): clean up a bit.
-
-2000-07-10  Ettore Perazzoli  
-
-	* mail-ops.c (forward_msg): Initialize `fwd_subj' to NULL if
-	`from' is NULL.
-
-2000-07-10  Jeffrey Stedfast  
-
-	* mail-ops.c (real_fetch_mail): Fixed broken POP fetching
-
-2000-07-10  Ettore Perazzoli  
-
-	* component-factory.c: Removed variable `browsers'.
-	(create_view): Don't update it.
-	(owner_unset_cb): Don't sync the folders here anymore, because at
-	this point the folder browser is dead already so we cannot get a
-	valid list of folders from it anymore.
-
-	* folder-browser.c (folder_browser_destroy): Sync the associated
-	mailbox first.
-
-2000-07-10  Christopher James Lahey  
-
-	* message-list.c, message-list.h: Switched from ETable to
-	ETableScrolled.
-
-2000-07-10  Jeffrey Stedfast  
-
-	* mail-ops.c (real_fetch_mail): Fixed movemail so that it too would
-	deliver to Inbox.
-
-2000-07-09  Dan Winship  
-
-	* message-list.c (get_message_info): Don't g_warn if the user
-	selects a fake tree parent.
-	(message_list_select_next): Ignore fake rows
-	(build_tree): Store the "root_subject" for fake rows
-	(ml_tree_value_at): Display the correct subject for fake rows.
-	(on_cursor_change_cmd): Update for the other changes and set
-	cursor_uid to NULL when the cursor is on a fake row.
-
-	* mail-ops.c (reply): Don't try to reply when no (real) message is
-	selected.
-	(forward_msg): Ditto.
-
-2000-07-09  Christopher James Lahey  
-
-	* message-list.c: Remove setting of dnd_code since that's handled
-	internally to ETable.
-
-2000-07-08  Dan Winship  
-
-	* folder-browser.c (etable_key): Fix up the pageup/pagedown
-	increment a bit.
-
-	* folder-browser-factory.c (control_activate): Add a "Threaded
-	Message List" item to the "View" menu.
-
-	* message-list.c (message_list_toggle_threads): Handler for that.
-	(build_flat): New function to build a "flat" message list using
-	the tree model.
-	(message_list_regenerate): Build tree or flat message list
-	depending on the global setting.
-
-	* message-thread.c (get_root_subject): fix a "Re:" parsing bug
-
-2000-07-08  Jeffrey Stedfast  
-
-	* mail-ops.c (real_fetch_mail): Always dump incoming messages to
-	Inbox (assuming not filtered to another location).
-
-2000-07-08  Ettore Perazzoli  
-
-	* folder-browser-factory.c (control_activate): Move the
-	"Expunge" item to the "Action" menu.
-	(control_deactivate): Accordingly.
-
-2000-07-08  Dan Winship  
-
-	* mail-ops.c (forward_msg): Deal with having multiple selected
-	messages.
-
-	* mail-format.c (mail_generate_forward): Removed. (Integrated into
-	forward_msg)
-
-2000-07-08  Jeffrey Stedfast  
-
-	* message-list.c (build_tree): Small fix to stop uid data from
-	being set on a message-list tree node when it didn't correspond
-	to an actual message.
-
-2000-07-08  Dan Winship  
-
-	* message-list.c (get_message_info): Fix Jeff's FIXME: This does
-	get called with out-of-range data sometimes, so we do need the
-	check. Use e_table_model_row_count to get the actual right answer.
-
-2000-07-07  Jeffrey Stedfast  
-
-	* message-list.c (get_message_info): This wasn't quite right, it
-	will now work but still isn't perfect. See FIXME comment.
-
-2000-07-07  Dan Winship  
-
-	* message-thread.c (remove_node): Add another argument "clast"
-	pointing to the container before the current one in the list,
-	which it can update if that turns out to be the one that it
-	removed.
-	(group_root_set): Update for remove_node change, and remove both
-	nodes in the "subjects are common" case. Fixes a bug that would
-	cause the message list to be truncated if this rule was invoked.
-
-	(sort_node): sort the tree by the original order of the messages
-	in the folder rather than by date.
-
-2000-07-07  Dan Winship  
-
-	* message-list.c: Lots of changes. Store uids as node data on the
-	tree nodes and use those rather than rows where possible. (The
-	concept of "row" is just getting too complicated.) Get rid of the
-	summary_table, because given a uid we can call
-	camel_folder_get_message_info, which makes more sense than keeping
-	a separate uid->row hash table ourselves.
-
-	(get_message_info): update
-	(get_message_row): removed
-	(ml_col_cound, ml_row_count, ml_value_at, ml_set_value_at,
-	ml_cell_is_editable, ml_duplicate_value, ml_free_value,
-	ml_initialize_value, ml_value_is_empty, ml_value_to_string):
-	Removed. We always use the tree model now.
-	(message_list_init): Remove the non-tree code.
-	(build_tree): store uids in the tree rather than row numbers,
-	and build the message_list->uid_rowmap to map from uids to rows
-	when needed.
-	(message_list_regenerate): Renamed from _set_search, since it's
-	used to redraw in non-search cases too.
-	(message_changed): Use the uid_rowmap to get a model row number.
-
-	* message-thread.c (thread_messages): Change the interface on this
-	to work with the new MessageList.
-
-	* folder-browser.c (search_set, folder_browser_clear_search): 
-	s/message_list_set_search/message_list_regenerate/
-
-2000-07-07  Christopher James Lahey  
-
-	* message-list.c (get_message_info): Handle a row number of -1
-	properly.
-
-2000-07-06  Dan Winship  
-
-	* message-list.c (get_message_info): Map tree model row numbers to
-	summary row numbers.
-	(ml_tree_value_at, ml_tree_set_value_at,
-	ml_tree_is_cell_editable): So don't do that here.
-
-2000-07-06  JP Rosevear  
-
-	* mail-config.glade*: Glade files for the configuration dialog.
-	
-	* mail-config.c (providers_config_new): Build the dialog with
-	glade.
-
-2000-07-06  Dan Winship  
-
-	* folder-browser-factory.c, folder-browser.c, mail-ops.c,
-	message-list.c: fix warnings.
-
-	* main.c (main): gtkhtmllib_init is no more. Call gconf_init
-	directly instead.
-
-	* message-list.c (message_list_select_next): New function to
-	select the first message on or after the given row that meets
-	certain flag criteria.
-
-	* mail-ops.c (real_fetch_mail): call message_list_select_next to
-	select first unread message in current folder if it changes.
-	(real_delete_msg): Remove the code to move the etable cursor. It
-	only makes sense really if you deleted the message with the
-	keyboard, so do it from etable_key.
-
-	* folder-browser.c (etable_key): call message_list_select_next to
-	select next non-deleted message after Delete.
-
-	* mail-identify.c: Add a workaround for a small gnome-vfs 0.2 bug
-	so we don't need to require CVS gnome-vfs.
-
-2000-07-06  Not Zed  
-
-	* message-thread.c (sort_thread): sort messages based on date for
-	the initial sort order.
-	(thread_messages_free): Implement.
-
-	* message-list.c (message_list_init_header): Setup the subject
-	renderer to a tree in tree mode.
-	(on_cursor_change_cmd): For a tree model, map the view row to the
-	data row.
-	(build_tree): Builds the tree data structure of all messages.
-	(message_list_set_search): For a tree model, build the tree here.
-	(ml_tree_icon_at): Icon callback, returns nothing.
-	(ml_tree_value_at):
-	(ml_tree_set_value_at): 
-	(ml_tree_is_cell_editable): Maps tree node to data row, and calls
-	the equivalent table callback
-	(message_list_init_renderers): Setup the tree renderer if needed.
-	(message_list_init): set the root node invisible afterall.
-	(message_list_set_search): Clear the old tree before putting in a
-	new one.
-
-	* message-list.h: Add a tree renderer to render list, and
-	tree_view indicator.
-
-	* message-thread.[ch]: Code for message threading. 
-
-2000-07-05  Dan Winship  
-
-	* mail-identify.c (mail_identify_mime_part): Oops. My gnome-vfs
-	was out-of-date. Update for changed function name.
-
-2000-07-05  Dan Winship  
-
-	* mail-identify.c (mail_identify_mime_part): Use the gnomevfs
-	sniff buffer interface to try to identify the MIME type when
-	everything else fails.
-
-	* mail-display.c (on_object_requested):
-	* mail-format.c (lookup_handler, handle_undisplayable,
-	handle_audio): s/gnome_mime/gnome_vfs_mime/
-
-	* Makefile.am: Add gnomevfs stuff
-
-2000-07-03  Ettore Perazzoli  
-
-	* component-factory.c (create_folder): Get rid of a compiler
-	warning by making sure `folder' is always initialized to some
-	value for any code path.
-
-2000-07-03  Dan Winship  
-
-	* message-list.c (select_msg): call mail_display_set_message with
-	NULL if the message we tried to select doesn't exist (probably
-	meaning we tried to selecte the first message and the folder is
-	empty.)
-
-	* mail-display.c (mail_display_set_message): deal with NULL as an
-	input (meaning "undisplay previous message and display nothing").
-
-2000-07-02  Dan Winship  
-
-	* mail-ops.c (real_fetch_mail): Remove hack to redisplay the
-	inbox, since folder_changed signals will now be emitted
-	appropriately.
-
-	* component-factory.c (create_vfolder_storage): Fix
-	filter_driver_new invocation.
-
-	* Makefile.am (bin_PROGRAMS): test-mail and test-thread should be
-	noinst.
-
-	* mail-ops.c (real_fetch_mail): 
-	(vfolder_editor_clicked): 
-	* component-factory.c (create_vfolder_storage):
-	Pass mail_uri_to_folder and rules to filter_driver_new.
-
-2000-07-02  Ettore Perazzoli  
-
-	* folder-browser.c (mail_uri_to_folder): Fix double freeing of the
-	local exception `ex'.
-
-2000-07-01  Ettore Perazzoli  
-
-	* mail-ops.c (refile_msg): Only allow type "mail" in the folder
-	selection dialog.
-
-2000-07-01  Dan Winship  
-
-	* pixmaps.h, pixmaps/*.xpm: Removed. These aren't being used any
-	more. (The real pixmaps are in ../art.)
-
-2000-07-01  Jeffrey Stedfast  
-
-	* message-list.c (get_message_info):
-	(select_msg): Updated to reflect camel-folder changes.
-
-	* mail-ops.c (real_fetch_mail): Modified to reflect camel-folder
-	changes.
-
-2000-06-30  Dan Winship  
-
-	* mail-ops.c (print_msg): Use gnome-print to do a print preview.
-
-	* folder-browser-factory.c: Hook up "Print" button.
-
-	* message-list.c (message_list_foreach): New function, a wrapper
-	around e_table_selected_row_foreach, which calls the callback
-	function with UIDs rather than row numbers.
-
-	* folder-browser-factory.c: Remove never-used "Find" button from
-	the toolbar and replace it with "Refile". (We need a better icon
-	for this...). Hook up "Refile" to "refile_msg".
-
-	* mail-ops.c (refile_msg): Call the shell's user_select_folder
-	routine, and then use message_list_foreach and real_refile_msg to
-	do the work.
-	(delete_msg): Update to use message_list_foreach.
-
-	* folder-browser.c (mail_uri_to_folder): new function, extracted
-	from folder_browser_load_folder, to turn a URI into a folder.
-	(folder_browser_load_folder): Use it.
-
-2000-06-30  Peter Williams  
-
-	* component-factory.c (create_news_storage, create_imap_storage):
-	Fixed to use new EvolutionShellClient proxy thingamajiggie.
-
-2000-06-30  Dan Winship  
-
-	* message-list.c (on_row_selection): use the ETable row_selection
-	signal to track how many rows are selected. Eventually we will use
-	this info to disable toolbar buttons when you have too few/too
-	many messages selected, but the current toolbar widget doesn't
-	allow that.
-
-	* message-list.h, message-list.c, mail-ops.c: Change selected_row
-	and selected_uid fields of MessageList to cursor_row and
-	cursor_uid to be more correct according to the new ETable
-	interfaces.
-
-2000-06-30  Ettore Perazzoli  
-
-	* component-factory.c: Eeek.  Fix typo: add missing star in the
-	declaration of `global_shell_client'.
-
-2000-06-29  Ettore Perazzoli  
-
-	* component-factory.c: Replace `global_shell_interface' with
-	`global_shell_client'.
-
-2000-06-29  Jeffrey Stedfast  
-
-	* mail-ops.c (delete_msg): Clean up compile warnings
-	(real_fetch_mail): Fetching from IMAP should do nothing
-
-2000-06-29  Christopher James Lahey  
-
-	* mail-ops.c: Handle multiple deletes (change by Peter Williams.)
-
-2000-06-29  Jeffrey Stedfast  
-
-	* folder-browser-factory.c: Changed "Send" to "Compose" to
-	avoid user confusion. Compose is a little more intuitive.
-	Also changed the pixmap to MAIL_NEW instead of MAIL_SND
-
-	* mail-ops.c (compose_msg): Renamed to avoid confusion
-
-2000-06-29  Dan Winship  
-
-	* component-factory.c (create_imap_storage, create_news_storage):
-	remove some code incorrectly copied and pasted from
-	create_vfolder_storage which caused vfolder creation to stop
-	working.
-
-2000-06-29  Christopher James Lahey  
-
-	* message-list.c, mail-ops.c: Changed the name of
-	e_table_select_row to e_table_set_cursor_row.
-
-2000-06-29  Peter Williams  
-
-	* message-list.c (message_list_init): Set the dnd_code of the
-	ETableHeader to something so that Solaris sprintf doesn't die
-	on a NULL string.
-
-	* mail-config.c (providers_config_new): Check for a null "transport"
-	string (not all OS' handle NULL strings well *cough* Solaris)
-
-2000-06-28  Dan Winship  
-
-	* mail-format.c (mail_generate_forward): add default subjects
-
-	* component-factory.c (create_folder): Refuse to create folders
-	not of type "mail", and correctly create an empty "mbox" folder
-	for new folders in /local.
-
-	* main.c (init_corba): Call od_assert_using_oaf() or
-	od_assert_using_goad() as appropriate to make sure people didn't
-	somehow trick the build system.
-
-2000-06-28  Jeffrey Stedfast  
-
-	* message-list.c: Added prototype for filter_date to make
-	it build cleanly
-
-2000-06-27  Christopher James Lahey  
-
-	* message-list.c: Made dates display grouping information
-	properly.
-
-2000-06-27  Peter Williams  
-
-	* message-list.c (mark_msg_seen): Need to return a value
-	on error.
-
-	* main.c (main): Don't start threads or enter threads if
-	there's no threading! Sigh.
-
-	* test-thread.c: Don't compile if no threads.
-
-	* session.c: Work without broken threads.
-
-	* message-list.c (filter_date): Solve the ctime_r problem the
-	correct way, with the magic of autoconf.
-
-2000-06-27  Christopher James Lahey  
-
-	* message-list.c: Work around mismatched ctime_r functions.  This
-	will be fixed.
-
-2000-06-27  Peter Williams  
-
-	* mail-threads.c: Don't compile this if we don't have
-	threads enabled. This should maybe be on the Makefile.am
-	level.
-
-2000-06-27  Michael Zucchi  
-
-	* component-factory.c (owner_set_cb): Put in a gross hack to
-	export the shell reference elsewhere.
-
-2000-06-26  Christopher James Lahey  
-
-	* message-list.c: Added a value_to_string handler.
-
-2000-06-26  Peter Williams  
-
-	* component-factory.c, mail-ops.c: #ifdef the threads stuff so
-	that if USE_BROKEN_THREADS is not defined we just call the functions
-	in the main thread.
-
-	* mail-threads.h: Don't declare funcs if USE_BROKEN_THREADS not
-	defined.
-
-	* mail-threads.c: Put the query and message boxes on top so that
-	you can see them.
-
-2000-06-26  Jeffrey Stedfast  
-
-	* mail-config.c (error_dialog): va_start() returns void, don't
-	assign it's retval to a variable.
-
-2000-06-26  Ettore Perazzoli  
-
-	* main.c (main): Call `GDK_THREADS_ENTER()' and
-	`GDK_THREADS_LEAVE()' around the main loop as in the examples from
-	the GTK+ FAQ.
-
-	* mail-threads.c (DEBUG): New macro for debugging.
-	(read_msg): Use it.
-
-2000-06-25  Peter Williams  
-
-	* Makefile.am: Clean up the various _LIBS and _CFLAGS
-	to work with simpler THREADS_LIBS and THREADS_CFLAGS scheme.
-
-2000-06-23  Jeffrey Stedfast  
-
-	* folder-browser.c (folder_browser_load_folder): Improved the
-	code to separate the imap namespace from the folder name.
-
-2000-06-23  Peter Williams  
-
-	* component-factory.c: Include e-util/e-setup.h for the
-	prototype of evolution_dir; prototype create_news_storage.
-	(real_create_imap_storage, real_create_news_storage): New
-	functions moving the camel stuff into the async callback.
-	(create_imap_storage, create_news_storage): Chopped in
-	half to move camel stuff as above.
-
-	* mail-ops.c: Include "mail-threads.h" for threading protos.
-	(real_fetch_mail, real_send_mail, real_expunge_folder): 
-	New functions moving the camel stuff into the async callback.
-	(async_mail_exception_dialog): A version of mail_exception_dialog
-	to be called from the async handlers (just calls mail_op_error())
-	(fetch_mail, expunge_folder, composer_send_cb): Cut in half to
-	move camel stuff as above.
-	(cleanup_send_mail): Clean up after the async real_send_mail
-	with the gtk_object_destroys et al.
-
-	* mail-threads.c: Instead of hiding the progress bar, make it
-	zip back and forth constantly.
-	(progress_timeout): New func. Timeout called to make the pbar
-	shimmy.
-	(timeout_toggle): New func. Turn on and off the shimmy effect.
-	(check_cond): New func. Make sure that the GCond for modal
-	operation is initialized before mail_op_{error,get_password}.
-	(show_error_clicked, read_msg, get_password_clicked): Move
-	over to timeout_toggle.
-	(mail_op_error,mail_op_get_password): Add check_cond() call.
-
-	* main.c: (main) Call g_thread_init.
-
-	* session.c: Change auth_callback stuff over to assume that it's
-	being called async. Note: no real good way to tell if this is
-	the case or not.
-	(request_callback): ifdef'ed out
-	(evolution_auth_callback): Use mail_op_get_password.
-	
-2000-06-22  Jeffrey Stedfast  
-
-	* folder-browser.c (folder_browser_load_folder): Now should
-	correctly get the selected folder from the given URL.
-
-2000-06-22  Chris Toshok  
-
-	* folder-browser.c (folder_browser_load_folder): add handling for
-	loading "news:" folders.
-
-	* component-factory.c (create_news_storage): add a root for news
-	source.
-	(owner_set_cb): call create_news_storage.
-
-2000-06-22  Jeffrey Stedfast  
-
-	* folder-browser.c (folder_browser_load_folder): Updated to
-	prepend url-> path if it exists for that imap store.
-
-	* component-factory.c (create_imap_storage): Modified to not
-	prepend a hard-coded namespace.
-
-2000-06-22  Chris Toshok  
-
-	* mail-ops.c (fetch_mail_cleanup): new function, passed as arg to
-	mail_operation_try.
-	(fetch_mail): add cleanup func arg.
-
-2000-06-22  Christopher James Lahey  
-
-	* message-list.c: Changed ml_value_at to return "" instead of NULL
-	in some cases.
-
-2000-06-22  Peter Williams  
-	* Makefile.am: Add GNOME_EXTRA_LIBS so that we get libgthread
-	in our LIBS for evolution-mail.
-	
-	* mail-threads.c: Make the dialog boxes for error and
-	question non-modal. They're modal relative to the dispatch
-	thread, but before they would also eg lock up the toolbar
-	buttons (while the menus, managed by another process, were
-	active -- a weird effect).
-	
-2000-06-22  Peter Williams  
-
-	* mail-threads.[ch]: Extra argument to mail_operation_try:
-	'cleanup', a function to be called in the main thread after
-	the dispatcher thread exits. gtk_object_destroy's et al may
-	attempt to unmap windows so we can't do them in the dispatcher
-	thread :-(
-
-	* test-thread.c: Updated with demo of new argument working.
-
-2000-06-22  Peter Williams  
-
-	* test-thread.c (op_5): New tests for the get_password
-	hook.
-
-	* mail-threads.[ch]: New hook, mail_op_get_password, for
-	getting a user response from an async operation. The operation
-	blocks while waiting for the response. A big whole mutex 
-	condition threading blocking dealie to make sure that it 
-	works.
-
-	Also the error hook creates a dialog again, which also needs
-	to block its caller while we wait for the user to press ok.
-
-2000-06-22  Peter Williams  
-
-	* mail-threads.c (various functions): Prettify the UI
-	so that the progress bar doesn't become all huge 'n stuff.
-	(mail_operation_try): Now save the operation's description,
-	so that we can display it later as the default message.
-	(read_msg): When the operation starts set the label to its
-	UI-friendly name.
-	(dispatch_func): Free the saved prettyname.
-
-2000-06-21  Christopher James Lahey  
-
-	* message-list.c: Removed an erroneous comment.
-
-2000-06-21  Dan Winship  
-
-	* mail-config.c (create_transport_page): Make this not crash if
-	you don't have a transport configured.
-	
-	* message-list.c: Update received date to work like sent date.
-
-2000-06-21  Peter Williams  
-
-	* mail-thread.{c,h}: New files -- a simple API for executing
-	the major mail ops (fetch_mail etc) asynchronously, allowing
-	the operations to send messages and update a progress bar.
-
-	* test-thread.{c,h}: Tests the mail-thread API.
-
-	* Makefile.am: add mail-thread.[ch] to evolution_mail_SOURCES
-	and declare the test_thread noinst_PROGRAM.
-
-2000-06-21  Peter Williams  
-
-	* mail-format.c (mail_generate_reply): Include "e-setup.h" to
-	get the prototype for evolution_dir.
-
-2000-06-20  Jeffrey Stedfast  
-
-	* component-factory.c (create_imap_storage): Oops. Should
-	have checked for a NULL sources.
-
-2000-06-20  Dan Winship  
-
-	* message-list.c (mark_msg_seen): Quick hack to prevent a NULL
-	pointer dereference. Things need to be cleaned up a bit more here
-	though.
-
-	* mail-sources.c: Oops. This should have been removed a long time
-	ago.
-
-2000-06-20  Jeffrey Stedfast  
-
-	* folder-browser.c (folder_browser_load_folder): Working on getting 
-	this to work :)
-
-	* component-factory.c (create_imap_storage): Should now correctly
-	construct the folder path allowing the selection of a folder.
-
-2000-06-20  Ettore Perazzoli  
-
-	* mail-format.c (mail_generate_reply): Declare `evolution_dir'.
-	Ugly, ugly, ugly, but I am not sure where it should go instead.
-
-2000-06-19  Ettore Perazzoli  
-
-	* mail-ops.c (ask_confirm_for_empty_subject): New function to ask
-	confirmation for an empty subject line.
-	(composer_send_cb): Use it if the subject is empty and only send
-	the message if the user confirms.
-
-2000-06-20  Jeffrey Stedfast  
-
-	* component-factory.c (create_imap_storage): Now creates the IMAP
-	storage (listing subfolders and such)
-
-2000-06-19  Dan Winship  
-
-	* mail-format.c (find_preferred_alternative): add an option to
-	prefer text/plain.
-	(reply_body): add an option to prefer text/plain
-	(mail_generate_reply): Check the mail sending preferences, and
-	generate a text/plain reply if the user prefers to send plain text
-	(and we have a text/plain part to generate a reply from).
-
-2000-06-19  Jeffrey Stedfast  
-
-	* mail-config.c (providers_config_new): Should now correctly display
-	the Transport page (made it set the optionmenu correctly, before it
-	would only set SMTP).
-	(create_transport_page): Updated to set the page info to sendmail/smtp
-	based on the url.
-	(create_service_page): Had to add some code to set data on some objects
-	so I could grab the objects I needed to modify in the above function.
-
-2000-06-18  Jeffrey Stedfast  
-
-	* folder-browser.c (folder_browser_load_folder): started to add
-	code to load an IMAP folder.
-	
-	* component-factory.c: Started to add a create_imap_storage 
-	method so that we can eventually have our IMAP store displayed 
-	in the tree view.
-	(create_vfolder_storage): Renamed from
-	create_test_storage().
-	(owner_set_cb): Updated.
-
-2000-06-17  Dan Winship  
-
-	* message-list.c (message_list_set_folder): Prevent double-freeing
-	action on summary_table and uid_rowmap.
-
-2000-06-16  Dan Winship  
-
-	* message-list.c (ml_set_value_at): Implement clicking on the
-	envelope icon to set read/unread. Based on a patch by clahey.
-	(select_msg): keep the timeout id for the "seen" flagging in the
-	message_list structure, so ml_set_value_at can clear it so it
-	doesn't re-mark a message seen after you click it unseen.
-
-2000-06-16  Dan Winship  
-
-	* message-list.c (get_message_row): new function to do a uid to
-	row mapping.
-	(mark_msg_seen, select_msg, message_changed,
-	message_list_set_folder): Update for Camel flag changes.
-	(on_cursor_change_cmd): Rename "row_to_select" to "selected_row",
-	and keep a "selected_uid" as well.
-
-	* mail-ops.c (composer_send_cb): Update for Camel flag changes,
-	and fix some memory-handling bugs. (Free the post_send_data when
-	the composer is destroyed, not when the user clicks "send", which
-	could happen never, or more than once.)
-	(delete_msg): Update for Camel flag changes, and fix the "holding
-	down the delete key skips some messages" bug.
-
-2000-06-15  Dan Winship  
-
-	* mail-ops.c (fetch_mail): 
-	* component-factory.c (owner_unset_cb): 
-	* message-list.c (message_list_set_folder): Update for CamelFolder
-	changes.
-
-	* folder-browser.c (folder_browser_clear_search): New function to
-	revert back to non-searching mode.
-
-	* mail-ops.c (fetch_mail): Use folder_browser_clear_search.
-
-	* mail-display.c (on_url_requested): if the document requests an
-	unknown URL, it's not an error; just ignore the URL.
-
-	* mail-ops.c (fetch_mail): If there's no new mail, tell the user.
-
-2000-06-14  Radek Doulik  
-
-	* main.c (main): call gtkhtmllib_init here
-
-2000-06-13  Jeffrey Stedfast  
-
-	* mail-config.c (on_SourceConfigDialogButton_clicked): Make sure source
-	is always pointing to something, so a blank is not written to the config file
-	on close.
-
-2000-06-13  Ettore Perazzoli  
-
-	* Makefile.am (SHELL_OBJS): Removed.
-	(evolution_mail_LDADD): Use `libeshell.a'.  Also use
-	`top_builddir' consistently.
-
-2000-06-12  Jeffrey Stedfast  
-
-	* mail-config.c: Got rid of sources_max_row and identities_max_row
-	as they are not really needed (just use clist->rows)
-	(on_cmdSourcesEdit_clicked): Modified to make 'source'
-	point to the data being edited.
-	(on_cmdSourcesAdd_clicked): Adds a new clist item and selects it so the
-	editor knows where to stick the data when it's done.
-
-2000-06-12  Federico Mena Quintero  
-
-	* message-list.c: Removed the ETableModel thaw handler.
-
-2000-06-12  Dan Winship  
-
-	* folder-browser.c (folder_browser_set_uri): Return the result of
-	folder_browser_load_folder.
-	(get_prop, set_prop, folder_browser_properties_init): Remove. No
-	longer needed.
-
-	* folder-browser-factory.c (folder_browser_factory_new_control):
-	Add a "uri" argument, return NULL if setting it fails.
-	(folder_browser_factory_new_control): Remove property bag stuff.
-	(folder_browser_factory_init, folder_browser_factory): Remove
-	this, since we're using the component factory now.
-
-	* component-factory.c (create_view): Update for
-	folder_browser_factory_new_control change and return NOTFOUND as
-	appropriate.
-
-	* main.c (main): Don't call folder_browser_factory_init.
-
-	* mail-format.c (mail_generate_reply): Fix the subject generation
-	so we don't get "Re:  Re:". This is working around something that
-	may later be declared a misfeature in Camel.
-
-2000-06-10  Ettore Perazzoli  
-
-	* component-factory.c (create_folder): New stub implementation for
-	the folder creation function in the EvolutionShellComponent we
-	expose [it simply returns success all the time].
-	(factory_fn): Pass this function to `evolution_shell_component_new'.
-
-2000-06-09  Dan Winship  
-
-	* folder-browser.c (folder_browser_new): Add a serial number to
-	FolderBrowser.
-
-	* folder-browser-factory.c (control_activate, control_deactivate):
-	Include fb serial number in the name of the Bonobo toolbar to
-	prevent problems with disappearing toolbars. This is a kludge and
-	should go away.
-
-
-	* mail-ops.c (expunge_folder): display error from
-	camel_folder_expunge if there is one.
-
-	* message-list.c (select_row): install an idle function to
-	select the row rather than doing it directly. Ugh. What a
-	kludge, but at least it works now.
-
-	* session.c (evolution_auth_callback): Update for
-	CamelAuthCallback changes. (Uncache passwords when asked to.)
-
-	* mail-ops.c (fetch_mail): close and expunge the source folder
-	after copying it to a local folder.
-
-2000-06-09  Ettore Perazzoli  
-
-	* component-factory.c (create_view): Updated to match the changes
-	to the definition of `EvolutionShellComponentCreateFn'.  If @type
-	is not "mail", return an "unsupported type" error.
-	(factory_fn): Pass NULL for the `remove_folder' and
-	`create_folder' functions.
-
-2000-06-09  Dan Winship  
-
-	* mail-format.c: Redo things a bit so that whitespace-only
-	text parts aren't displayed. (In particular, so that
-	whitespace-only subparts of multipart/mixed aren't displayed as
-	separate (empty) parts.)
-
-2000-06-06  Dan Winship  
-
-	* mail-ops.c (fetch_mail): 
-	* folder-browser.c (folder_browser_load_folder): Update for folder
-	creation/existence changes.
-
-	* message-list.c (message_list_set_folder): Remove the code to
-	create the folder if it doesn't exist, since we don't want to do
-	that.
-
-2000-06-05  Dan Winship  
-
-	* mail-ops.c (composer_send_cb): Leave the composer window around
-	if the message doesn't get sent.
-
-2000-06-05  Matt Loper  
-
-	* folder-browser.c (etable_key): Allow "GDK_KP_Delete", a keypad
-	delete key, to delete a message.
-
-2000-06-05  Dan Winship  
-
-	* session.c (evolution_auth_callback): Remember passwords between
-	calls.
-	(forget_passwords): Callback for "Forget Passwords" menu item.
-
-	* folder-browser-factory.c (control_activate): 
-	(control_deactivate): Add "Forget Passwords" menu item.
-
-	* mail.h, mail-ops.c: fix some function prototypes
-
-	* folder-browser.c (etable_key): Add "Delete" = delete message.
-
-	* mail-format.c (mail_generate_forward): Update for new composer
-	attachment interface.
-
-2000-06-02  Jeffrey Stedfast  
-
-	* mail-config.c (providers_config_new): Added a new notebook
-	page that allowed for mail format (text/plain or 
-	multipart/alternative)
-
-2000-06-02  Dan Winship  
-
-	* message-list.c (filter_date): If the date in the summary is 0,
-	output "?".
-
-	* component-factory.c (create_view): keep a GList of folder
-	browsers created
-	(owner_unset_cb): Go through the list and close each folder before
-	exiting so they sync their summary state, etc to disk.
-
-	* mail-ops.c (fetch_mail): Use camel_service_connect, not
-	connect_with_url, since we already passed the URL into
-	camel_session_get_store.
-
-2000-06-02  Christopher James Lahey  
-
-	* message-list.c: Use camel_folder_free_summary instead of
-	g_ptr_array_free.  Unref the folder when we're done with it.
-
-2000-06-02  Christopher James Lahey  
-
-	* session.c: Revert removal of e_setup_base_dir.
-
-2000-06-02  Dan Winship  
-
-	* folder-browser.c (my_folder_browser_init): Connect to ETable's
-	key_press signal.
-	(etable_key): scroll mail on space/backspace.
-
-2000-06-02  Christopher James Lahey  
-
-	* message-list.c: Made sent column as wide as from column.
-
-2000-06-02  Jeffrey Stedfast  
-
-	* mail-config.c (on_cmdSourcesAdd_clicked): Changed identity_row
-	to source_row as this is a Sources clist we are dealing with and
-	not an identity clist
-	(on_cmdSourcesEdit_clicked): same
-	(on_cmdSourcesDelete_clicked): again, same
-	(on_cmdSourcesEdit_clicked): Source editor now fills in data from
-	the clist
-
-2000-06-01  Dan Winship  
-
-	* message-list.c: Add a date column.	
-	(COL_SENT_WIDTH_MIN): Make this wider.
-	(ml_value_at): return the sent date (as a time_t) for COL_SENT.
-	(Fix COL_TO too while I'm here.) 
-	(ml_duplicate_value, ml_free_value, ml_initialize_value,
-	ml_value_is_empty): COL_SENT is numeric now.
-	(message_list_init_renderers): Create a date renderer (using
-	text_filter to translate the time_t into a string).
-	(message_list_init_header): Use render_date for COL_SENT.
-
-2000-06-01  Christopher James Lahey  
-
-	* session.c: Don't call e_setup_base_dir.
-
-2000-06-01  Dan Winship  
-
-	* mail-format.c (mail_generate_forward): Fix forwarding to work
-	for people other than me. :) [Although apparently it doesn't
-	really.]
-
-	* mail-ops.c (delete_msg): Add a quick hack to move the selection
-	down a row when you delete a message.
-
-	* mail-format.c (handle_message_rfc822): use 
     rather
-	than 
     to frame the embedded
-	message. If 
     text in the subtable won't fit in the 95% width,
-	GtkHTML will write past the border of the table (and
-	
     causes creeping updates so it's not
-	usable for now).
-	
-2000-06-01  Christopher James Lahey  
-
-	* message-list.c (message_list_init): Turn off the grid in our
-	ETable.
-
-2000-06-01  Dan Winship  
-
-	* mail-format.c (write_headers): Oops. This needs to take a
-	message argument because we might be writing headers for an
-	embedded message/rfc822 subpart rather than the root document.
-
-2000-06-01  Jeffrey Stedfast  
-
-	* mail-config.c: Config dialogs are completed.
-	(service_acceptable): Fixed a segfault caused by duplicate 
-	camel_exception_free()
-	(providers_config_new): Identity and Source clists are now filled in
-	when the dialog is created as well as the Transport page
-
-	* folder-browser-factory.c: Renamed Tool/ menu items
-	Vfolder was changed to Virtual Folder and
-	Configure Camel Providers was changed to Mail Configuration
-
-2000-06-01  Ettore Perazzoli  
-
-	* Makefile.am (evolution_mail_LDADD): Link with
-	`libemiscwidgets.a'.
-
-	* mail-display.c (mail_display_new): Use an EScrollFrame instead
-	of a GtkScrolledWindow.
-	(mail_display_set_message): Likewise.
-
-	* mail-display.h: Replace the GtkScrolledWindow with an
-	EScrollFrame.
-
-2000-06-01  Dan Winship  
-
-	* component-factory.c (owner_unset_cb): Quit when the shell exits.
-	This is a kludge, but a pretty necessary one until the refcounting
-	bugs that keep the component from exiting properly are fixed.
-
-2000-05-31  Jeffrey Stedfast  
-
-	* mail-config.c: Partially implemented the source
-	configuration, seems to segfault due to a destroyed
-	gnome dialog being destroyed again in the method
-	on_SourceConfigDialogButton_clicked()
-
-2000-05-31  Dan Winship  
-
-	* mail-format.c (free_url, handle_text_enriched,
-	get_url_for_icon): Fix up memory management of x-evolution-data
-	URLs so the URLs and/or their data don't get freed while there are
-	still references to them.
-
-	* message-list.c (message_list_init_header): redo the (unused)
-	online status column to no longer refer to pixmaps that no longer
-	exist.
-
-2000-06-01  Ettore Perazzoli  
-
-	* folder-browser-factory.c (control_activate): Put the toolbar
-	into a frame to make it look like standard GNOME toolbars.  Also,
-	set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not do
-	evil things when its moved to the left or the right of the window.
-
-2000-05-31  Jeffrey Stedfast  
-
-	* mail-config.c: Configuration dialog now allows 
-	adding/editing/deleting of Identities (which leaves
-	adding/editing/deleting of sources left to implement).
-	The data is also saved when the dialog is exited via 
-	the OK button.
-
-2000-05-31  Dan Winship  
-
-	* mail-format.c (mail_format_mime_message): Initialize the "urls"
-	hash table stored on the message and store cid and other URLs
-	there rather than as object data on the message.
-	(get_cid): rewrite this a bunch
-	(handle_text_enriched): move the code from write_iframe_string()
-	into here, since it's the only place that actually needs it.
-	(handle_text_html): simplify this a lot. We can use a cid: URL
-	here rather than x-evolution-data.
-	(get_url_for_icon): New routine to return URLs for icons, and
-	cache the results, so we don't have to keep re-reading the icon
-	files (and so we can't be spoofed into reading non-icon files).
-	(handle_mystery, handle_audio): use get_url_for_icon.
-
-	* mail-display.c (save_data): move the CamelMimePart filename
-	extracting code from get_cid to here.
-	(on_link_clicked, on_object_requested): Update for cid: changes.
-	(on_url_requested): Kill off the kludgy, exploitable x-gnome-icon
-	URL schema, update cid and x-evolution-data to match
-	mail-format.c.
-
-	It should now be easier to implement RFC 2557 (Content-Location,
-	etc), but that RFC still pretty much sucks.
-
-2000-05-30  Dan Winship  
-
-	* mail-format.c: Redo this back to the old way: a single GtkHTML
-	with various things inline in it. (Gets rid of flicker, simplifies
-	some scrolling, selecting, and printing issues.)
-	(handle_text_enriched, handle_text_html): Use ", xed, xed);
-	mail_display_add_url (md, "data_urls", xed, ba);
-	camel_stream_write ((CamelStream *) stream, iframe, strlen (iframe));
-	g_free (iframe);
-#endif
-}
-
-void
-mail_error_printf (MailDisplayStream *stream, const char *format, ...)
-{
-	/* FIXME: it'd be nice if camel-stream had a vprintf method... */
-	char *buf, *htmltext;
-	va_list ap;
-	
-	va_start (ap, format);
-	buf = g_strdup_vprintf (format, ap);
-	va_end (ap);
-	
-	htmltext = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL |
-				       CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
-	g_free (buf);
-	
-	camel_stream_printf ((CamelStream *) stream, "");
-	camel_stream_write ((CamelStream *) stream, htmltext, strlen (htmltext));
-	camel_stream_printf ((CamelStream *) stream, "");
-	
-	g_free (htmltext);
-}
-
-
-#define COLOR_IS_LIGHT(r, g, b)  ((r + g + b) > (128 * 3))
-
-#define HTML_HEADER "\n\n"  \
-                    "\n\n\n"
-
-void
-mail_display_render (MailDisplay *md, GtkHTML *html, gboolean reset_scroll)
-{
-	const char *flag, *completed;
-	GtkHTMLStream *html_stream;
-	MailDisplayStream *stream;
-	
-	g_return_if_fail (IS_MAIL_DISPLAY (md));
-	g_return_if_fail (GTK_IS_HTML (html));
-	
-	html_stream = gtk_html_begin (html);
-	if (!reset_scroll) {
-		/* This is a hack until there's a clean way to do this. */
-		GTK_HTML (md->html)->engine->newPage = FALSE;
-	}
-	
-	gtk_html_stream_write (html_stream, HTML_HEADER, sizeof (HTML_HEADER) - 1);
-	
-	if (md->current_message && md->display_style == MAIL_CONFIG_DISPLAY_SOURCE)
-		gtk_html_stream_write (html_stream, "\n", 7);
-	else
-		gtk_html_stream_write (html_stream, "\n", 36);
-	
-	flag = md->info ? camel_tag_get (&md->info->user_tags, "follow-up") : NULL;
-	completed = md->info ? camel_tag_get (&md->info->user_tags, "completed-on") : NULL;
-	if ((flag && *flag) && !(completed && *completed)) {
-		const char *due_by, *overdue = "";
-		char bgcolor[7], fontcolor[7];
-		time_t target_date, now;
-		GtkStyle *style = NULL;
-		char due_date[256];
-		struct tm due;
-		int offset;
-		
-		/* my favorite thing to do... muck around with colors so we respect people's stupid themes. */
-		/* FIXME: this is also in mail-format.c */
-		style = gtk_widget_get_style (GTK_WIDGET (html));
-		if (style && !md->printing) {
-			int state = GTK_WIDGET_STATE (GTK_WIDGET (html));
-			gushort r, g, b;
-			
-			r = style->base[state].red / 256;
-			g = style->base[state].green / 256;
-			b = style->base[state].blue / 256;
-			
-			if (COLOR_IS_LIGHT (r, g, b)) {
-				r *= 1.0;
-				g *= 0.97;
-				b *= 0.75;
-			} else {
-				r = 255 - (1.0 * (255 - r));
-				g = 255 - (0.97 * (255 - g));
-				b = 255 - (0.75 * (255 - b));
-			}
-			
-			sprintf (bgcolor, "%.2X%.2X%.2X", r, g, b);
-			
-			r = style->text[state].red / 256;
-			g = style->text[state].green / 256;
-			b = style->text[state].blue / 256;
-			
-			sprintf (fontcolor, "%.2X%.2X%.2X", r, g, b);
-		} else {
-			strcpy (bgcolor, "EEEEEE");
-			strcpy (fontcolor, "000000");
-		}
-		
-		due_by = camel_tag_get (&md->info->user_tags, "due-by");
-		if (due_by && *due_by) {
-			target_date = header_decode_date (due_by, &offset);
-			now = time (NULL);
-			if (now >= target_date)
-				overdue = _("Overdue:");
-			
-			localtime_r (&target_date, &due);
-			
-			e_strftime_fix_am_pm (due_date, sizeof (due_date), _("by %B %d, %Y, %l:%M %P"), &due);
-		} else {
-			due_date[0] = '\0';
-		}
-		
-		gtk_html_stream_printf (html_stream, ""
-					"
    "
-					"
    "
-					"
    "
-					""
-					""
-					"
    %s%s%s%s %s
    "
-					"
    ", fontcolor, bgcolor,
-					mail_display_get_url_for_icon (md, EVOLUTION_IMAGES "/flag-for-followup-16.png"),
-					overdue ? "" : "", overdue, overdue ? " " : "",
-					flag, due_date);
-	}
-	
-	if (md->current_message) {
-		stream = (MailDisplayStream *) mail_display_stream_new (html, html_stream);
-		
-		if (md->display_style == MAIL_CONFIG_DISPLAY_SOURCE)
-			mail_format_raw_message (md->current_message, md, stream);
-		else
-			mail_format_mime_message (md->current_message, md, stream);
-		
-		camel_object_unref (stream);
-	}
-	
-	gtk_html_stream_write (html_stream, "\n", 15);
-	gtk_html_end (html, html_stream, GTK_HTML_STREAM_OK);
-}
-
-/**
- * mail_display_redisplay:
- * @mail_display: the mail display object
- * @reset_scroll: specifies whether or not to reset current scroll
- *
- * Force a redraw of the message display.
- **/
-void
-mail_display_redisplay (MailDisplay *md, gboolean reset_scroll)
-{
-#if 0
-#warning "GTK_OBJECT_DESTROYED"
-	if (GTK_OBJECT_DESTROYED (md))
-		return;
-#endif
-	fetch_cancel(md);
-	
-	md->last_active = NULL;
-	md->redisplay_counter++;
-	/* printf ("md %p redisplay %d\n", md, md->redisplay_counter); */
-	
-	mail_display_render (md, md->html, reset_scroll);
-}
-
-
-/**
- * mail_display_set_message:
- * @mail_display: the mail display object
- * @medium: the input camel medium, or %NULL
- * @folder: CamelFolder
- * @info: message info
- *
- * Makes the mail_display object show the contents of the medium
- * param.
- **/
-void 
-mail_display_set_message (MailDisplay *md, CamelMedium *medium, CamelFolder *folder, CamelMessageInfo *info)
-{
-	/* For the moment, we deal only with CamelMimeMessage, but in
-	 * the future, we should be able to deal with any medium.
-	 */
-	if (medium && !CAMEL_IS_MIME_MESSAGE (medium))
-		return;
-	
-	/* Clean up from previous message. */
-	if (md->current_message) {
-		fetch_cancel (md);
-		camel_object_unref (md->current_message);
-		g_datalist_clear (md->data);
-	}
-	
-	if (medium) {
-		camel_object_ref (medium);
-		md->current_message = (CamelMimeMessage *) medium;
-	} else
-		md->current_message = NULL;
-	
-	if (md->folder && md->info) {
-		camel_folder_free_message_info (md->folder, md->info);
-		camel_object_unref (md->folder);
-	}
-	
-	if (folder && info) {
-		md->info = info;
-		md->folder = folder;
-		camel_object_ref (folder);
-		camel_folder_ref_message_info (folder, info);
-	} else {
-		md->info = NULL;
-		md->folder = NULL;
-	}
-	
-	g_datalist_init (md->data);
-	mail_display_redisplay (md, TRUE);
-}
-
-/**
- * mail_display_set_charset:
- * @mail_display: the mail display object
- * @charset: charset or %NULL
- *
- * Makes the mail_display object show the contents of the medium
- * param.
- **/
-void
-mail_display_set_charset (MailDisplay *mail_display, const char *charset)
-{
-	g_free (mail_display->charset);
-	mail_display->charset = g_strdup (charset);
-	
-	mail_display_queue_redisplay (mail_display);
-}
-
-/**
- * mail_display_load_images:
- * @md: the mail display object
- *
- * Load all HTTP images in the current message
- **/
-void
-mail_display_load_images (MailDisplay *md)
-{
-	g_datalist_set_data (md->data, "load_images", GINT_TO_POINTER (1));
-	mail_display_redisplay (md, FALSE);
-}
-
-/*----------------------------------------------------------------------*
- *                     Standard Gtk+ Class functions
- *----------------------------------------------------------------------*/
-
-static void
-mail_display_init (GObject *object)
-{
-	MailDisplay *mail_display = MAIL_DISPLAY (object);
-	GConfClient *gconf;
-	int style;
-	
-	mail_display->scroll            = NULL;
-	mail_display->html              = NULL;
-	mail_display->redisplay_counter = 0;
-	mail_display->last_active       = NULL;
-	mail_display->idle_id           = 0;
-	mail_display->selection         = NULL;
-	mail_display->charset           = NULL;
-	mail_display->current_message   = NULL;
-	mail_display->folder            = NULL;
-	mail_display->info              = NULL;
-	mail_display->data              = NULL;
-	
-	mail_display->invisible         = gtk_invisible_new ();
-	g_object_ref (mail_display->invisible);
-	gtk_object_sink ((GtkObject *) mail_display->invisible);
-	
-	gconf = gconf_client_get_default ();
-	style = gconf_client_get_int (gconf, "/apps/evolution/mail/format/message_display_style", NULL);
-	mail_display->display_style     = style;
-	
-	mail_display->printing          = FALSE;
-	
-	mail_display->priv = g_malloc0(sizeof(*mail_display->priv));
-	e_dlist_init(&mail_display->priv->fetch_active);
-	e_dlist_init(&mail_display->priv->fetch_queue);
-}
-
-static void
-mail_display_destroy (GtkObject *object)
-{
-	MailDisplay *mail_display = MAIL_DISPLAY (object);
-	
-	if (mail_display->html) {
-		g_object_unref (mail_display->html);
-		mail_display->html = NULL;
-	}
-	
-	if (mail_display->current_message) {
-		camel_object_unref (mail_display->current_message);
-		g_datalist_clear (mail_display->data);
-		fetch_cancel(mail_display);
-		mail_display->current_message = NULL;
-	}
-	
-	g_free (mail_display->charset);
-	mail_display->charset = NULL;
-	g_free (mail_display->selection);
-	mail_display->selection = NULL;
-	
-	if (mail_display->folder) {
-		if (mail_display->info)
-			camel_folder_free_message_info (mail_display->folder, mail_display->info);
-		camel_object_unref (mail_display->folder);
-		mail_display->folder = NULL;
-	}
-	
-	g_free (mail_display->data);
-	mail_display->data = NULL;
-	
-	if (mail_display->idle_id) {
-		gtk_timeout_remove (mail_display->idle_id);
-		mail_display->idle_id = 0;
-	}
-	
-	if (mail_display->invisible) {
-		g_object_unref (mail_display->invisible);
-		mail_display->invisible = NULL;
-	}
-	
-	g_free (mail_display->priv);
-	mail_display->priv = NULL;
-	
-	mail_display_parent_class->destroy (object);
-}
-
-static void
-invisible_selection_get_callback (GtkWidget *widget,
-				  GtkSelectionData *selection_data,
-				  guint info,
-				  guint time,
-				  void *data)
-{
-	MailDisplay *display;
-	
-	display = MAIL_DISPLAY (data);
-	
-	if (!display->selection)
-		return;
-	
-	g_assert (info == 1);
-	
-	gtk_selection_data_set (selection_data, GDK_SELECTION_TYPE_STRING, 8,
-				display->selection, strlen (display->selection));
-}
-
-static gint
-invisible_selection_clear_event_callback (GtkWidget *widget,
-					  GdkEventSelection *event,
-					  void *data)
-{
-	MailDisplay *display;
-	
-	display = MAIL_DISPLAY (data);
-	
-	g_free (display->selection);
-	display->selection = NULL;
-	
-	return TRUE;
-}
-
-static void
-mail_display_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = mail_display_destroy;
-	
-	if (mail_display_parent_class == NULL) {
-		/* blah, this is an unecessary dependency ... */
-		extern char *evolution_dir;
-		char *path;
-		
-		path = g_alloca (strlen (evolution_dir) + 16);
-		sprintf (path, "%s/cache", evolution_dir);
-		
-		/* cache expiry - 2 hour access, 1 day max */
-		fetch_cache = camel_data_cache_new(path, 0, NULL);
-		camel_data_cache_set_expire_age(fetch_cache, 24*60*60);
-		camel_data_cache_set_expire_access(fetch_cache, 2*60*60);
-		
-		mail_display_parent_class = g_type_class_ref (PARENT_TYPE);
-		thumbnail_cache = g_hash_table_new (g_str_hash, g_str_equal);
-	}
-}
-
-static void
-link_open_in_browser (GtkWidget *w, MailDisplay *mail_display)
-{
-	if (!mail_display->html->pointer_url)
-		return;
-	
-	on_link_clicked (mail_display->html, mail_display->html->pointer_url,
-			 mail_display);
-}
-
-#if 0
-static void
-link_save_as (GtkWidget *w, MailDisplay *mail_display)
-{
-	g_print ("FIXME save %s\n", mail_display->html->pointer_url);
-}
-#endif
-
-static void
-link_copy_location (GtkWidget *w, MailDisplay *mail_display)
-{
-	GdkAtom clipboard_atom;
-	
-	g_free (mail_display->selection);
-	mail_display->selection = g_strdup (mail_display->html->pointer_url);
-	
-	clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-	if (clipboard_atom == GDK_NONE)
-		return; /* failed */
-	
-	/* We don't check the return values of the following since there is not
-	 * much we can do if we cannot assert the selection.
-	 */
-	
-	gtk_selection_owner_set (GTK_WIDGET (mail_display->invisible),
-				 GDK_SELECTION_PRIMARY,
-				 GDK_CURRENT_TIME);
-	gtk_selection_owner_set (GTK_WIDGET (mail_display->invisible),
-				 clipboard_atom,
-				 GDK_CURRENT_TIME);
-}
-
-static void
-image_save_as (GtkWidget *w, MailDisplay *mail_display)
-{
-	const char *src;
-	
-	src = g_object_get_data ((GObject *) mail_display, "current_src_uri");
-	
-	g_warning ("loading uri=%s", src);
-	
-	save_url (mail_display, src);
-}
-
-enum {
-	/* 
-	 * This is used to mask the link specific menu items.
-	 */
-	MASK_URL = 1,
-
-	/*
-	 * This is used to mask src specific menu items.
-	 */
-	MASK_SRC = 2
-};
-
-#define SEPARATOR  { "", NULL, (NULL), NULL,  0 }
-#define TERMINATOR { NULL, NULL, (NULL), NULL,  0 }
-
-static EPopupMenu link_menu [] = {
-	E_POPUP_ITEM (N_("Open Link in Browser"), G_CALLBACK (link_open_in_browser),   MASK_URL),
-	E_POPUP_ITEM (N_("Copy Link Location"), G_CALLBACK (link_copy_location),  MASK_URL),
-#if 0
-	E_POPUP_ITEM (N_("Save Link as (FIXME)"), G_CALLBACK (link_save_as),  MASK_URL),
-#endif
-	E_POPUP_ITEM (N_("Save Image as..."), G_CALLBACK (image_save_as), MASK_SRC), 
-	
-	TERMINATOR
-};
-
-
-/*
- *  Create a window and popup our widget, with reasonable semantics for the popup
- *  disappearing, etc.
- */
-
-typedef struct _PopupInfo PopupInfo;
-struct _PopupInfo {
-	GtkWidget *w;
-	GtkWidget *win;
-	guint destroy_timeout;
-	guint widget_destroy_handle;
-	Bonobo_Listener listener;
-	gboolean hidden;
-};
-
-/* Aiieee!  Global Data! */
-static GtkWidget *the_popup = NULL;
-
-static void
-popup_info_free (PopupInfo *pop)
-{
-	if (pop) {
-		if (pop->destroy_timeout)
-			gtk_timeout_remove (pop->destroy_timeout);
-		
-		bonobo_event_source_client_remove_listener (bonobo_widget_get_objref (BONOBO_WIDGET (pop->w)),
-							    pop->listener,
-							    NULL);
-		CORBA_Object_release (pop->listener, NULL);
-		g_free (pop);
-	}
-}
-
-static void
-popup_window_destroy_cb (PopupInfo *pop, GObject *deadbeef)
-{
-	the_popup = NULL;
-	
-	popup_info_free (pop);
-}
-
-static int
-popup_timeout_cb (gpointer user_data)
-{
-	PopupInfo *pop = (PopupInfo *) user_data;
-	
-	pop->destroy_timeout = 0;
-	gtk_widget_destroy (pop->win);
-	
-	return 0;
-}
-
-static int
-popup_enter_cb (GtkWidget *w, GdkEventCrossing *ev, gpointer user_data)
-{
-	PopupInfo *pop = (PopupInfo *) user_data;
-	
-	if (pop->destroy_timeout)
-		gtk_timeout_remove (pop->destroy_timeout);
-	pop->destroy_timeout = 0;
-	
-	return 0;
-}
-
-static int
-popup_leave_cb (GtkWidget *w, GdkEventCrossing *ev, gpointer user_data)
-{
-	PopupInfo *pop = (PopupInfo *) user_data;
-	
-	if (pop->destroy_timeout)
-		gtk_timeout_remove (pop->destroy_timeout);
-	
-	if (!pop->hidden)
-		pop->destroy_timeout = gtk_timeout_add (500, popup_timeout_cb, pop);
-	
-	return 0;
-}
-
-static void
-popup_realize_cb (GtkWidget *widget, gpointer user_data)
-{
-	PopupInfo *pop = (PopupInfo *) user_data;
-	
-	gtk_widget_add_events (pop->win, GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK);
-	
-	if (pop->destroy_timeout == 0) {
-		if (!pop->hidden) {
-			pop->destroy_timeout = gtk_timeout_add (5000, popup_timeout_cb, pop);
-		} else {
-			pop->destroy_timeout = 0;
-		}
-	}
-}
-
-static void
-popup_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gpointer user_data)
-{
-	int x, y, w, h, xmax, ymax;
-	
-	xmax = gdk_screen_width ();
-	ymax = gdk_screen_height ();
-	
-	gdk_window_get_pointer (NULL, &x, &y, NULL);
-	w = alloc->width;
-	h = alloc->height;
-	x = CLAMP (x - w/2, 0, xmax - w);
-	y = CLAMP (y - h/2, 0, ymax - h);
-	gtk_widget_set_uposition (widget, x, y);
-
-}
-
-static PopupInfo *
-make_popup_window (GtkWidget *w)
-{
-	PopupInfo *pop = g_new0 (PopupInfo, 1);
-	GtkWidget *fr;
-	
-	/* Only allow for one popup at a time.  Ugly. */
-	if (the_popup)
-		gtk_widget_destroy (the_popup);
-	
-	pop->w = w;
-	the_popup = pop->win = gtk_window_new (GTK_WINDOW_POPUP);
-	fr = gtk_frame_new (NULL);
-	
-	gtk_container_add (GTK_CONTAINER (pop->win), fr);
-	gtk_container_add (GTK_CONTAINER (fr), w);
-	
-	gtk_window_set_policy (GTK_WINDOW (pop->win), FALSE, FALSE, FALSE);
-	
-	g_signal_connect (pop->win, "enter_notify_event", G_CALLBACK (popup_enter_cb), pop);
-	g_signal_connect (pop->win, "leave_notify_event", G_CALLBACK (popup_leave_cb), pop);
-	g_signal_connect_after (pop->win, "realize", G_CALLBACK (popup_realize_cb), pop);
-	g_signal_connect (pop->win, "size_allocate", G_CALLBACK (popup_size_allocate_cb), pop);
-	
-	g_object_weak_ref ((GObject *) pop->win, (GWeakNotify) popup_window_destroy_cb, pop);
-	
-	gtk_widget_show (w);
-	gtk_widget_show (fr);
-	gtk_widget_show (pop->win);
-	
-	return pop;
-}
-
-static void
-listener_cb (BonoboListener    *listener,
-	     char              *event_name,
-	     CORBA_any         *any,
-	     CORBA_Environment *ev,
-	     gpointer           user_data)
-{
-	PopupInfo *pop;
-	char *type;
-	
-	pop = user_data;
-	
-	if (pop->destroy_timeout)
-		gtk_timeout_remove (pop->destroy_timeout);
-	pop->destroy_timeout = 0;
-	
-	type = bonobo_event_subtype (event_name);
-	
-	if (!strcmp (type, "Destroy")) {
-		gtk_widget_destroy (GTK_WIDGET (pop->win));
-	} else if (!strcmp (type, "Hide")) {
-		pop->hidden = TRUE;
-		gtk_widget_hide (GTK_WIDGET (pop->win));
-	}
-	
-	g_free (type);
-}
-
-static int
-html_button_press_event (GtkWidget *widget, GdkEventButton *event, MailDisplay *mail_display)
-{
-	g_return_val_if_fail (widget != NULL, FALSE);
-	g_return_val_if_fail (event != NULL, FALSE);
-	
-	if (event->type == GDK_BUTTON_PRESS) {
-		if (event->button == 3) {
-			HTMLEngine *e;
-			HTMLPoint *point;
-			GtkWidget *popup_thing;
-			
-			e     = GTK_HTML (widget)->engine;
-			point = html_engine_get_point_at (e, event->x + e->x_offset, event->y + e->y_offset, FALSE);
-			
-			if (point) {
-				const char *url, *src;
-				
-				url = html_object_get_url (point->object);
-				src = html_object_get_src (point->object);
-				
-				if (url && !strncasecmp (url, "mailto:", 7)) {
-					PopupInfo *pop;
-					char *url_decoded;
-					
-					url_decoded = gtk_html_get_url_object_relative (GTK_HTML (widget),
-											point->object,
-											url);
-					camel_url_decode (url_decoded);
-					
-					popup_thing = bonobo_widget_new_control ("OAFIID:GNOME_Evolution_Addressbook_AddressPopup",
-										 CORBA_OBJECT_NIL);
-					
-					bonobo_widget_set_property (BONOBO_WIDGET (popup_thing),
-								    "email", TC_CORBA_string, url_decoded+7,
-								    NULL);
-					g_free (url_decoded);
-					
-					pop = make_popup_window (popup_thing);
-					
-					pop->listener = bonobo_event_source_client_add_listener_full(
-						bonobo_widget_get_objref (BONOBO_WIDGET (popup_thing)),
-						g_cclosure_new (G_CALLBACK (listener_cb), pop, NULL),
-						NULL, NULL);
-				} else if (url || src) {
-				        int hide_mask = 0;
-					
-					if (!url)
-						hide_mask |= MASK_URL;
-					
-					if (!src)
-						hide_mask |= MASK_SRC;
-					
-					g_free (g_object_get_data ((GObject *) mail_display, "current_src_uri"));
-					g_object_set_data ((GObject *) mail_display, "current_src_uri", 
-							  gtk_html_get_url_object_relative (GTK_HTML (widget),
-											    point->object,
-											    src));
-					
-					e_popup_menu_run (link_menu, (GdkEvent *) event, 0, hide_mask, mail_display);
-				}
-				
-				html_point_destroy (point);
-			}
-			
-			return TRUE;
-		}
-	}
-	
-	return FALSE;
-}
-
-static inline void
-set_underline (HTMLEngine *e, HTMLObject *o, gboolean underline)
-{
-	HTMLText *text = HTML_TEXT (o);
-	
-	html_text_set_font_style (text, e, underline
-				  ? html_text_get_font_style (text) | GTK_HTML_FONT_STYLE_UNDERLINE
-				  : html_text_get_font_style (text) & ~GTK_HTML_FONT_STYLE_UNDERLINE);
-	html_engine_queue_draw (e, o);
-}
-
-static void
-update_active (GtkWidget *widget, gint x, gint y, MailDisplay *mail_display)
-{
-	HTMLEngine *e;
-	HTMLPoint *point;
-	const gchar *email;
-	
-	e = GTK_HTML (widget)->engine;
-	
-	point = html_engine_get_point_at (e, x + e->x_offset, y + e->y_offset, FALSE);
-	if (mail_display->last_active && (!point || mail_display->last_active != point->object)) {
-		set_underline (e, HTML_OBJECT (mail_display->last_active), FALSE);
-		mail_display->last_active = NULL;
-	}
-	if (point) {
-		email = (const gchar *) html_object_get_data (point->object, "email");
-		if (email && html_object_is_text (point->object)) {
-			set_underline (e, point->object, TRUE);
-			mail_display->last_active = point->object;
-		}
-		html_point_destroy (point);
-	}
-}
-
-static int
-html_enter_notify_event (GtkWidget *widget, GdkEventCrossing *event, MailDisplay *mail_display)
-{
-	update_active (widget, event->x, event->y, mail_display);
-	
-	return TRUE;
-}
-
-static int
-html_motion_notify_event (GtkWidget *widget, GdkEventMotion *event, MailDisplay *mail_display)
-{
-	int x, y;
-	
-	g_return_val_if_fail (widget != NULL, 0);
-	g_return_val_if_fail (GTK_IS_HTML (widget), 0);
-	g_return_val_if_fail (event != NULL, 0);
-	
-	if (event->is_hint)
-		gdk_window_get_pointer (GTK_LAYOUT (widget)->bin_window, &x, &y, NULL);
-	else {
-		x = event->x;
-		y = event->y;
-	}
-	
-	update_active (widget, x, y, mail_display);
-	
-	return TRUE;
-}
-
-static void
-html_iframe_created (GtkWidget *w, GtkHTML *iframe, MailDisplay *mail_display)
-{
-	g_signal_connect (iframe, "button_press_event",
-			  G_CALLBACK (html_button_press_event), mail_display);
-	g_signal_connect (iframe, "motion_notify_event",
-			  G_CALLBACK (html_motion_notify_event), mail_display);
-	g_signal_connect (iframe, "enter_notify_event",
-			  G_CALLBACK (html_enter_notify_event), mail_display);
-}
-
-static GNOME_Evolution_ShellView
-retrieve_shell_view_interface_from_control (BonoboControl *control)
-{
-	Bonobo_ControlFrame control_frame;
-	GNOME_Evolution_ShellView shell_view_interface;
-	CORBA_Environment ev;
-	
-	control_frame = bonobo_control_get_control_frame (control, NULL);
-	
-	if (control_frame == NULL)
-		return CORBA_OBJECT_NIL;
-	
-	CORBA_exception_init (&ev);
-	shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,
-							      "IDL:GNOME/Evolution/ShellView:1.0",
-							      &ev);
-	CORBA_exception_free (&ev);
-	
-	if (shell_view_interface != CORBA_OBJECT_NIL)
-		g_object_set_data ((GObject *) control,
-				   "mail_threads_shell_view_interface",
-				   shell_view_interface);
-	else
-		g_warning ("Control frame doesn't have Evolution/ShellView.");
-	
-	return shell_view_interface;
-}
-
-static void
-set_status_message (const char *message, int busy)
-{
-	EList *controls;
-	EIterator *it;
-	
-	controls = folder_browser_factory_get_control_list ();
-	for (it = e_list_get_iterator (controls); e_iterator_is_valid (it); e_iterator_next (it)) {
-		BonoboControl *control;
-		GNOME_Evolution_ShellView shell_view_interface;
-		CORBA_Environment ev;
-		
-		control = BONOBO_CONTROL (e_iterator_get (it));
-		
-		shell_view_interface = g_object_get_data ((GObject *) control, "mail_threads_shell_view_interface");
-		
-		if (shell_view_interface == CORBA_OBJECT_NIL)
-			shell_view_interface = retrieve_shell_view_interface_from_control (control);
-		
-		CORBA_exception_init (&ev);
-		
-		if (shell_view_interface != CORBA_OBJECT_NIL) {
-			if (message != NULL)
-				GNOME_Evolution_ShellView_setMessage (shell_view_interface,
-								      message[0] ? message: "",
-								      busy,
-								      &ev);
-		}
-		
-		CORBA_exception_free (&ev);
-		
-		/* yeah we only set the first one.  Why?  Because it seems to leave
-		   random ones lying around otherwise.  Shrug. */
-		break;
-	}
-	
-	g_object_unref (it);
-}
-
-/* For now show every url but possibly limit it to showing only http:
-   or ftp: urls */
-static void
-html_on_url (GtkHTML *html, const char *url, MailDisplay *mail_display)
-{
-	static char *previous_url = NULL;
-	
-	/* This all looks silly but yes, this is the proper way to mix
-           GtkHTML's on_url with BonoboUIComponent statusbar */
-	if (!url || (previous_url && (strcmp (url, previous_url) != 0)))
-		set_status_message ("", FALSE);
-	if (url) {
-		set_status_message (url, FALSE);
-		g_free (previous_url);
-		previous_url = g_strdup (url);
-	}
-}
-
-GtkWidget *
-mail_display_new (void)
-{
-	MailDisplay *mail_display = g_object_new (mail_display_get_type (), NULL);
-	GtkWidget *scroll, *html;
-	GdkAtom clipboard_atom;
-	HTMLTokenizer *tok;
-	
-	gtk_box_set_homogeneous (GTK_BOX (mail_display), FALSE);
-	gtk_widget_show (GTK_WIDGET (mail_display));
-	
-	scroll = e_scroll_frame_new (NULL, NULL);
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scroll),
-				   GTK_POLICY_AUTOMATIC,
-				   GTK_POLICY_AUTOMATIC);
-	e_scroll_frame_set_shadow_type (E_SCROLL_FRAME (scroll), GTK_SHADOW_IN);
-	gtk_box_pack_start_defaults (GTK_BOX (mail_display), GTK_WIDGET (scroll));
-	gtk_widget_show (GTK_WIDGET (scroll));
-	
-	html = gtk_html_new ();
-	tok = e_searching_tokenizer_new ();
-	html_engine_set_tokenizer (GTK_HTML (html)->engine, tok);
-	g_object_unref (tok);
-	
-	mail_display_initialize_gtkhtml (mail_display, GTK_HTML (html));
-	
-	gtk_container_add (GTK_CONTAINER (scroll), html);
-	gtk_widget_show (GTK_WIDGET (html));
-	
-	g_signal_connect (mail_display->invisible, "selection_get",
-			  G_CALLBACK (invisible_selection_get_callback), mail_display);
-	g_signal_connect (mail_display->invisible, "selection_clear_event",
-			  G_CALLBACK (invisible_selection_clear_event_callback), mail_display);
-	
-	gtk_selection_add_target (mail_display->invisible,
-				  GDK_SELECTION_PRIMARY, GDK_SELECTION_TYPE_STRING, 1);
-	
-	clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE);
-	if (clipboard_atom != GDK_NONE)
-		gtk_selection_add_target (mail_display->invisible,
-					  clipboard_atom, GDK_SELECTION_TYPE_STRING, 1);
-	
-	mail_display->scroll = E_SCROLL_FRAME (scroll);
-	mail_display->html = GTK_HTML (html);
-	g_object_ref (mail_display->html);
-	mail_display->last_active = NULL;
-	mail_display->data = g_new0 (GData *, 1);
-	g_datalist_init (mail_display->data);
-	
-	return GTK_WIDGET (mail_display);
-}
-
-void
-mail_display_initialize_gtkhtml (MailDisplay *mail_display, GtkHTML *html)
-{
-	gtk_html_set_default_content_type (GTK_HTML (html), "text/html; charset=utf-8");
-	
-	gtk_html_set_editable (GTK_HTML (html), FALSE);
-	
-	g_signal_connect (html, "url_requested",
-			  G_CALLBACK (on_url_requested),
-			  mail_display);
-	g_signal_connect (html, "object_requested",
-			  G_CALLBACK (on_object_requested),
-			  mail_display);
-	g_signal_connect (html, "link_clicked",
-			  G_CALLBACK (on_link_clicked),
-			  mail_display);
-	g_signal_connect (html, "button_press_event",
-			  G_CALLBACK (html_button_press_event), mail_display);
-	g_signal_connect (html, "motion_notify_event",
-			  G_CALLBACK (html_motion_notify_event), mail_display);
-	g_signal_connect (html, "enter_notify_event",
-			  G_CALLBACK (html_enter_notify_event), mail_display);
-	g_signal_connect (html, "iframe_created",
-			  G_CALLBACK (html_iframe_created), mail_display);
-	g_signal_connect (html, "on_url",
-			  G_CALLBACK (html_on_url), mail_display);
-}
-
-static void
-free_url (gpointer key, gpointer value, gpointer data)
-{
-	g_free (key);
-	if (data)
-		g_byte_array_free (value, TRUE);
-}
-
-static void
-free_data_urls (gpointer urls)
-{
-	g_hash_table_foreach (urls, free_url, GINT_TO_POINTER (1));
-	g_hash_table_destroy (urls);
-}
-
-char *
-mail_display_add_url (MailDisplay *md, const char *kind, char *url, gpointer data)
-{
-	GHashTable *urls;
-	gpointer old_key, old_value;
-	
-	urls = g_datalist_get_data (md->data, kind);
-	if (!urls) {
-		urls =  g_hash_table_new (g_str_hash, g_str_equal);
-		g_datalist_set_data_full (md->data, "data_urls", urls,
-					  free_data_urls);
-	}
-	
-	if (g_hash_table_lookup_extended (urls, url, &old_key, &old_value)) {
-		g_free (url);
-		url = old_key;
-	}
-	
-	g_hash_table_insert (urls, url, data);
-	
-	return url;
-}
-
-const char *
-mail_display_get_url_for_icon (MailDisplay *md, const char *icon_name)
-{
-	char *icon_path, buf[1024], *url;
-	int fd, nread;
-	GByteArray *ba;
-	
-	/* FIXME: cache */
-	
-	if (*icon_name == '/')
-		icon_path = g_strdup (icon_name);
-	else {
-		icon_path = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP,
-						       icon_name, TRUE, NULL);
-		if (!icon_path)
-			return "file:///dev/null";
-	}
-	
-	fd = open (icon_path, O_RDONLY);
-	g_free (icon_path);
-	if (fd == -1)
-		return "file:///dev/null";
-	
-	ba = g_byte_array_new ();
-	while (1) {
-		nread = read (fd, buf, sizeof (buf));
-		if (nread < 1)
-			break;
-		g_byte_array_append (ba, buf, nread);
-	}
-	close (fd);
-	
-	url = g_strdup_printf ("x-evolution-data:%p", ba);
-	
-	return mail_display_add_url (md, "data_urls", url, ba);
-}
-
-
-struct _location_url_stack {
-	struct _location_url_stack *parent;
-	CamelURL *url;
-};
-
-void
-mail_display_push_content_location (MailDisplay *md, const char *location)
-{
-	struct _location_url_stack *node;
-	CamelURL *url;
-	
-	url = camel_url_new (location, NULL);
-	node = g_new (struct _location_url_stack, 1);
-	node->parent = md->urls;
-	node->url = url;
-	md->urls = node;
-}
-
-CamelURL *
-mail_display_get_content_location (MailDisplay *md)
-{
-	return md->urls ? md->urls->url : NULL;
-}
-
-void
-mail_display_pop_content_location (MailDisplay *md)
-{
-	struct _location_url_stack *node;
-	
-	if (!md->urls) {
-		g_warning ("content-location stack underflow!");
-		return;
-	}
-	
-	node = md->urls;
-	md->urls = node->parent;
-	
-	if (node->url)
-		camel_url_free (node->url);
-	
-	g_free (node);
-}
-
-E_MAKE_TYPE (mail_display, "MailDisplay", MailDisplay, mail_display_class_init, mail_display_init, PARENT_TYPE);
diff --git a/mail/mail-display.h b/mail/mail-display.h
deleted file mode 100644
index c9fefb7e6a..0000000000
--- a/mail/mail-display.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast 
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifndef _MAIL_DISPLAY_H_
-#define _MAIL_DISPLAY_H_
-
-#include 
-#include 
-#include 
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-#include "mail-types.h"
-#include "mail-config.h" /*display_style*/
-#include "mail-display-stream.h"
-
-#define MAIL_DISPLAY_TYPE        (mail_display_get_type ())
-#define MAIL_DISPLAY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), MAIL_DISPLAY_TYPE, MailDisplay))
-#define MAIL_DISPLAY_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), MAIL_DISPLAY_TYPE, MailDisplayClass))
-#define IS_MAIL_DISPLAY(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), MAIL_DISPLAY_TYPE))
-#define IS_MAIL_DISPLAY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MAIL_DISPLAY_TYPE))
-
-struct _MailDisplay {
-	GtkVBox parent;
-	
-	struct _MailDisplayPrivate *priv;
-	
-	EScrollFrame *scroll;
-	GtkHTML *html;
-	/* GtkHTMLStream *stream; */
-	gint redisplay_counter;
-	gpointer last_active;
-	guint idle_id;
-	
-	char *charset;
-	
-	char *selection;
-	
-	CamelMimeMessage *current_message;
-	CamelMessageInfo *info;
-	CamelFolder *folder;
-	GData **data;
-	
-	/* stack of Content-Location URLs used for combining with a
-           relative URL Content-Location on a leaf part in order to
-           construct the full URL */
-	struct _location_url_stack *urls;
-	
-	GHashTable *related;	/* related parts not displayed yet */
-	
-	/* Sigh.  This shouldn't be needed.  I haven't figured out why it is
-	   though.  */
-	GtkWidget *invisible;
-	
-	MailConfigDisplayStyle display_style;
-	
-	guint printing : 1;
-};
-
-typedef struct {
-	GtkVBoxClass parent_class;
-} MailDisplayClass;
-
-GtkType        mail_display_get_type    (void);
-GtkWidget *    mail_display_new         (void);
-
-void           mail_display_initialize_gtkhtml (MailDisplay *mail_display, GtkHTML *html);
-
-void           mail_display_queue_redisplay (MailDisplay *mail_display);
-void           mail_display_render (MailDisplay *mail_display, GtkHTML *html, gboolean reset_scroll);
-void           mail_display_redisplay (MailDisplay *mail_display, gboolean reset_scroll);
-void           mail_display_redisplay_when_loaded (MailDisplay *md,
-						   gconstpointer key,
-						   void (*callback)(MailDisplay *, gpointer),
-						   GtkHTML *html,
-						   gpointer data);
-void           mail_display_stream_write_when_loaded (MailDisplay *md,
-						      gconstpointer key,
-						      const gchar *url,
-						      void (*callback)(MailDisplay *, gpointer),
-						      GtkHTML *html,
-						      GtkHTMLStream *handle,
-						      gpointer data);
-
-void           mail_display_set_message (MailDisplay *mail_display, 
-					 CamelMedium *medium,
-					 CamelFolder *folder,
-					 CamelMessageInfo *info);
-
-void           mail_display_set_charset (MailDisplay *mail_display,
-					 const char *charset);
-
-void           mail_display_load_images (MailDisplay *mail_display);
-
-void           mail_text_write          (MailDisplayStream *stream,
-					 MailDisplay *md,
-					 CamelMimePart *part,
-					 gint idx,
-					 gboolean printing,
-					 const char *text);
-void           mail_error_printf        (MailDisplayStream *stream,
-					 const char *format, ...);
-
-char *mail_display_add_url (MailDisplay *md, const char *kind, char *url, gpointer data);
-
-const char *mail_display_get_url_for_icon (MailDisplay *md, const char *icon_name);
-
-void mail_display_push_content_location (MailDisplay *md, const char *location);
-CamelURL *mail_display_get_content_location (MailDisplay *md);
-void mail_display_pop_content_location (MailDisplay *md);
-
-#endif /* _MAIL_DISPLAY_H_ */
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
deleted file mode 100644
index 2ec4e72912..0000000000
--- a/mail/mail-folder-cache.c
+++ /dev/null
@@ -1,901 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- * 
- * Authors: Peter Williams 
- *	    Michael Zucchi 
- *
- * Copyright 2000,2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef G_LOG_DOMAIN
-#undef G_LOG_DOMAIN
-#endif
-#define G_LOG_DOMAIN "folder tree"
-
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "mail-mt.h"
-#include "mail-folder-cache.h"
-#include "mail-ops.h"
-
-/* For notifications of changes */
-#include "mail-vfolder.h"
-#include "mail-autofilter.h"
-#include "mail-config.h"
-
-#define w(x) 
-#define d(x) /*(printf("%s(%d):%s: ",  __FILE__, __LINE__, __PRETTY_FUNCTION__), (x))*/
-
-/* note that many things are effectively serialised by having them run in
-   the main loop thread which they need to do because of corba/gtk calls */
-#define LOCK(x) pthread_mutex_lock(&x)
-#define UNLOCK(x) pthread_mutex_unlock(&x)
-
-static pthread_mutex_t info_lock = PTHREAD_MUTEX_INITIALIZER;
-
-struct _folder_info {
-	struct _store_info *store_info;	/* 'parent' link */
-
-	char *path;		/* shell path */
-	char *full_name;	/* full name of folder/folderinfo */
-	char *uri;		/* uri of folder */
-
-	CamelFolder *folder;	/* if known */
-};
-
-/* pending list of updates */
-struct _folder_update {
-	struct _folder_update *next;
-	struct _folder_update *prev;
-
-	unsigned int remove:1;	/* removing from vfolders */
-	unsigned int delete:1;	/* deleting as well? */
-	unsigned int add:1;	/* add to vfolder */
-	unsigned int unsub:1;   /* unsubcribing? */
-
-	char *path;
-	char *name;
-	char *uri;
-	char *oldpath;
-	char *olduri;
-
-	int unread;
-	CamelStore *store;
-};
-
-struct _store_info {
-	GHashTable *folders;	/* by full_name */
-	GHashTable *folders_uri; /* by uri */
-
-	CamelStore *store;	/* the store for these folders */
-
-	/* only 1 should be set */
-	EvolutionStorage *storage;
-	GNOME_Evolution_Storage corba_storage;
-
-	/* Outstanding folderinfo requests */
-	EDList folderinfo_updates;
-};
-
-static void folder_changed(CamelObject *o, gpointer event_data, gpointer user_data);
-static void folder_renamed(CamelObject *o, gpointer event_data, gpointer user_data);
-static void folder_finalised(CamelObject *o, gpointer event_data, gpointer user_data);
-
-
-static guint ping_id = 0;
-static gboolean ping_cb (gpointer user_data);
-
-
-/* Store to storeinfo table, active stores */
-static GHashTable *stores = NULL;
-
-/* List of folder changes to be executed in gui thread */
-static EDList updates = E_DLIST_INITIALISER(updates);
-static int update_id = -1;
-
-/* hack for people who LIKE to have unsent count */
-static int count_sent = FALSE;
-static int count_trash = FALSE;
-
-static void
-free_update(struct _folder_update *up)
-{
-	g_free(up->path);
-	g_free(up->name);
-	g_free(up->uri);
-	if (up->store)
-		camel_object_unref((CamelObject *)up->store);
-	g_free(up->oldpath);
-	g_free(up->olduri);
-	g_free(up);
-}
-
-static void
-real_flush_updates(void *o, void *event_data, void *data)
-{
-	struct _folder_update *up;
-	struct _store_info *si;
-	EvolutionStorage *storage;
-	GNOME_Evolution_Storage corba_storage;
-	CORBA_Environment ev;
-
-	LOCK(info_lock);
-	while ((up = (struct _folder_update *)e_dlist_remhead(&updates))) {
-
-		si = g_hash_table_lookup(stores, up->store);
-		if (si) {
-			storage = si->storage;
-			if (storage)
-				bonobo_object_ref((BonoboObject *)storage);
-			corba_storage = si->corba_storage;
-		} else {
-			storage = NULL;
-			corba_storage = CORBA_OBJECT_NIL;
-		}
-
-		UNLOCK(info_lock);
-
-		if (up->remove) {
-			if (up->delete) {
-				mail_vfolder_delete_uri(up->store, up->uri);
-				mail_filter_delete_uri(up->store, up->uri);
-				mail_config_uri_deleted(CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(up->store))->compare_folder_name, up->uri);
-				if (up->unsub)
-					evolution_storage_removed_folder (storage, up->path);
-			} else
-				mail_vfolder_add_uri(up->store, up->uri, TRUE);
-		} else {
-			/* Its really a rename, but we have no way of telling the shell that, so remove it */
-			if (up->oldpath) {
-				if (storage != NULL) {
-					d(printf("Removing old folder (rename?) '%s'\n", up->oldpath));
-					evolution_storage_removed_folder(storage, up->oldpath);
-				}
-				/* ELSE? Shell supposed to handle the local snot case */
-			}
-
-			/* We can tell the vfolder code though */
-			if (up->olduri && up->add) {
-				d(printf("renaming folder '%s' to '%s'\n", up->olduri, up->uri));
-				mail_vfolder_rename_uri(up->store, up->olduri, up->uri);
-				mail_filter_rename_uri(up->store, up->olduri, up->uri);
-				mail_config_uri_renamed(CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(up->store))->compare_folder_name, up->olduri, up->uri);
-			}
-				
-			if (up->name == NULL) {
-				if (storage != NULL) {
-					d(printf("Updating existing folder: %s (%d unread)\n", up->path, up->unread));
-					evolution_storage_update_folder(storage, up->path, up->unread);
-				} else if (corba_storage != CORBA_OBJECT_NIL) {
-					d(printf("Updating existing (local) folder: %s (%d unread)\n", up->path, up->unread));
-					CORBA_exception_init(&ev);
-					GNOME_Evolution_Storage_updateFolder(corba_storage, up->path, up->unread, &ev);
-					CORBA_exception_free(&ev);
-				}
-			} else if (storage != NULL) {
-				char *type = (strncmp(up->uri, "vtrash:", 7)==0)?"vtrash":"mail";
-			
-				d(printf("Adding new folder: %s\n", up->path));
-				evolution_storage_new_folder(storage,
-							     up->path, up->name, type, up->uri, up->name, NULL,
-							     up->unread,
-							     TRUE, 0);
-			}
-
-			if (!up->olduri && up->add)
-				mail_vfolder_add_uri(up->store, up->uri, FALSE);
-		}
-
-		free_update(up);
-
-		if (storage)
-			bonobo_object_unref((BonoboObject *)storage);
-		
-		LOCK(info_lock);
-	}
-	update_id = -1;
-	UNLOCK(info_lock);
-}
-
-static void
-flush_updates(void)
-{
-	if (update_id == -1 && !e_dlist_empty(&updates))
-		update_id = mail_async_event_emit(mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc)real_flush_updates, 0, 0, 0);
-}
-
-static void
-unset_folder_info(struct _folder_info *mfi, int delete, int unsub)
-{
-	struct _folder_update *up;
-
-	d(printf("unset folderinfo '%s'\n", mfi->uri));
-
-	if (mfi->folder) {
-		CamelFolder *folder = mfi->folder;
-
-		camel_object_unhook_event(folder, "folder_changed", folder_changed, mfi);
-		camel_object_unhook_event(folder, "message_changed", folder_changed, mfi);
-		camel_object_unhook_event(folder, "renamed", folder_renamed, mfi);
-		camel_object_unhook_event(folder, "finalize", folder_finalised, mfi);
-	}
-
-	if (strstr(mfi->uri, ";noselect") == NULL) {
-		up = g_malloc0(sizeof(*up));
-
-		up->remove = TRUE;
-		up->delete = delete;
-		up->unsub = unsub;
-		up->store = mfi->store_info->store;
-		up->path = g_strdup (mfi->path);
-		camel_object_ref(up->store);
-		up->uri = g_strdup(mfi->uri);
-
-		e_dlist_addtail(&updates, (EDListNode *)up);
-		flush_updates();
-	}
-}
-
-static void
-free_folder_info(struct _folder_info *mfi)
-{
-	g_free(mfi->path);
-	g_free(mfi->full_name);
-	g_free(mfi->uri);
-	g_free(mfi);
-}
-
-/* This is how unread counts work (and don't work):
- *
- * camel_folder_unread_message_count() only gives a correct answer if
- * the store is paying attention to the folder. (Some stores always
- * pay attention to all folders, but IMAP can only pay attention to
- * one folder at a time.) But it doesn't have any way to know when
- * it's lying, so it's only safe to call it when you know for sure
- * that the store is paying attention to the folder, such as when it's
- * just been created, or you get a folder_changed or message_changed
- * signal on it.
- *
- * camel_store_get_folder_info() always gives correct answers for the
- * folders it checks, but it can also return -1 for a folder, meaning
- * it didn't check, and so you should stick with your previous answer.
- *
- * update_1folder is called from three places: with info != NULL when
- * the folder is created (or get_folder_info), with info == NULL when
- * a folder changed event is emitted.
- *
- * So if info is NULL, camel_folder_unread_message_count is correct,
- * and if it's not NULL and its unread_message_count isn't -1, then
- * it's correct.  */
-
-static void
-update_1folder(struct _folder_info *mfi, CamelFolderInfo *info)
-{
-	struct _store_info *si;
-	struct _folder_update *up;
-	CamelFolder *folder;
-	int unread = -1;
-	extern CamelFolder *outbox_folder, *sent_folder;
-
-	si  = mfi->store_info;
-
-	folder = mfi->folder;
-	if (folder) {
-		if ((count_trash && CAMEL_IS_VTRASH_FOLDER (folder))
-		    || folder == outbox_folder
-		    || (count_sent && folder == sent_folder)) {
-			unread = camel_folder_get_message_count(folder);
-		} else {
-			if (info)
-				unread = info->unread_message_count;
-			else
-				unread = camel_folder_get_unread_message_count (folder);
-		}
-	} else if (info)
-		unread = info->unread_message_count;
-
-	d(printf("folder updated: unread %d: '%s'\n", unread, mfi->full_name));
-
-	if (unread == -1)
-		return;
-
-	up = g_malloc0(sizeof(*up));
-	up->path = g_strdup(mfi->path);
-	up->unread = unread;
-	up->store = mfi->store_info->store;
-	camel_object_ref(up->store);
-	e_dlist_addtail(&updates, (EDListNode *)up);
-	flush_updates();
-}
-
-static void
-setup_folder(CamelFolderInfo *fi, struct _store_info *si)
-{
-	struct _folder_info *mfi;
-	struct _folder_update *up;
-
-	mfi = g_hash_table_lookup(si->folders, fi->full_name);
-	if (mfi) {
-		update_1folder(mfi, fi);
-	} else {
-		/* always 'add it', but only 'add it' to non-local stores */
-		/*d(printf("Adding new folder: %s (%s) %d unread\n", fi->path, fi->url, fi->unread_message_count));*/
-		mfi = g_malloc0(sizeof(*mfi));
-		mfi->path = g_strdup(fi->path);
-		mfi->full_name = g_strdup(fi->full_name);
-		mfi->uri = g_strdup(fi->url);
-		mfi->store_info = si;
-		g_hash_table_insert(si->folders, mfi->full_name, mfi);
-		g_hash_table_insert(si->folders_uri, mfi->uri, mfi);
-
-		up = g_malloc0(sizeof(*up));
-		up->path = g_strdup(mfi->path);
-		if (si->storage != NULL) {
-			up->name = g_strdup(fi->name);
-		}
-		up->uri = g_strdup(fi->url);
-		up->unread = (fi->unread_message_count==-1)?0:fi->unread_message_count;
-		up->store = si->store;
-		camel_object_ref(up->store);
-		if (strstr(fi->url, ";noselect") == NULL)
-			up->add = TRUE;
-
-		e_dlist_addtail(&updates, (EDListNode *)up);
-		flush_updates();
-	}
-}
-
-static void
-create_folders(CamelFolderInfo *fi, struct _store_info *si)
-{
-	d(printf("Setup new folder: %s\n  %s\n", fi->url, fi->full_name));
-
-	setup_folder(fi, si);
-
-	if (fi->child)
-		create_folders(fi->child, si);
-	if (fi->sibling)
-		create_folders(fi->sibling, si);
-}
-
-static void
-folder_changed(CamelObject *o, gpointer event_data, gpointer user_data)
-{
-	struct _folder_info *mfi = user_data;
-
-	if (mfi->folder != CAMEL_FOLDER(o))
-		return;
-
-	LOCK(info_lock);
-	update_1folder(mfi, NULL);
-	UNLOCK(info_lock);
-}
-
-static void
-folder_finalised(CamelObject *o, gpointer event_data, gpointer user_data)
-{
-	struct _folder_info *mfi = user_data;
-
-	d(printf("Folder finalised '%s'!\n", ((CamelFolder *)o)->full_name));
-	LOCK(info_lock);
-	mfi->folder = NULL;
-	UNLOCK(info_lock);
-}
-
-static void
-folder_renamed(CamelObject *o, gpointer event_data, gpointer user_data)
-{
-	struct _folder_info *mfi = user_data;
-	CamelFolder *folder = (CamelFolder *)o;
-	char *old = event_data;
-
-	d(printf("Folder renamed from '%s' to '%s'\n", old, folder->full_name));
-
-	mfi = mfi;
-	old = old;
-	folder = folder;
-	/* Dont do anything, do it from the store rename event? */
-}
-
-void mail_note_folder(CamelFolder *folder)
-{
-	CamelStore *store = folder->parent_store;
-	struct _store_info *si;
-	struct _folder_info *mfi;
-
-	if (stores == NULL) {
-		g_warning("Adding a folder `%s' to a store which hasn't been added yet?\n", folder->full_name);
-		return;
-	}
-
-	LOCK(info_lock);
-	si = g_hash_table_lookup(stores, store);
-	if (si == NULL) {
-		/*g_warning("Adding a folder `%s' to a store %p which hasn't been added yet?", folder->full_name, store);*/
-		UNLOCK(info_lock);
-		return;
-	}
-
-	mfi = g_hash_table_lookup(si->folders, folder->full_name);
-	if (mfi == NULL) {
-		w(g_warning("Adding a folder `%s' that I dont know about yet?", folder->full_name));
-		UNLOCK(info_lock);
-		return;
-	}
-
-	/* dont do anything if we already have this */
-	if (mfi->folder == folder) {
-		UNLOCK(info_lock);
-		return;
-	}
-
-	mfi->folder = folder;
-
-	camel_object_hook_event(folder, "folder_changed", folder_changed, mfi);
-	camel_object_hook_event(folder, "message_changed", folder_changed, mfi);
-	camel_object_hook_event(folder, "renamed", folder_renamed, mfi);
-	camel_object_hook_event(folder, "finalize", folder_finalised, mfi);
-
-	update_1folder(mfi, NULL);
-
-	UNLOCK(info_lock);
-}
-
-static void
-store_folder_subscribed(CamelObject *o, void *event_data, void *data)
-{
-	struct _store_info *si;
-	CamelFolderInfo *fi = event_data;
-
-	d(printf("Store folder subscribed '%s' store '%s' \n", fi->full_name, camel_url_to_string(((CamelService *)o)->url, 0)));
-
-	LOCK(info_lock);
-	si = g_hash_table_lookup(stores, o);
-	if (si)
-		setup_folder(fi, si);
-	UNLOCK(info_lock);
-}
-
-static void
-store_folder_created(CamelObject *o, void *event_data, void *data)
-{
-	/* we only want created events to do more work if we dont support subscriptions */
-	if (!camel_store_supports_subscriptions(CAMEL_STORE(o)))
-		store_folder_subscribed(o, event_data, data);
-}
-
-static void
-store_folder_unsubscribed(CamelObject *o, void *event_data, void *data)
-{
-	struct _store_info *si;
-	CamelFolderInfo *fi = event_data;
-	struct _folder_info *mfi;
-	CamelStore *store = (CamelStore *)o;
-
-	d(printf("Store Folder deleted: %s\n", fi->full_name));
-
-	LOCK(info_lock);
-	si = g_hash_table_lookup(stores, store);
-	if (si) {
-		mfi = g_hash_table_lookup(si->folders, fi->full_name);
-		if (mfi) {
-			g_hash_table_remove(si->folders, mfi->full_name);
-			g_hash_table_remove(si->folders_uri, mfi->uri);
-			unset_folder_info(mfi, TRUE, TRUE);
-			free_folder_info(mfi);
-		}
-	}
-	UNLOCK(info_lock);
-}
-
-static void
-store_folder_deleted(CamelObject *o, void *event_data, void *data)
-{
-	/* we only want deleted events to do more work if we dont support subscriptions */
-	if (!camel_store_supports_subscriptions(CAMEL_STORE(o)))
-		store_folder_unsubscribed(o, event_data, data);
-}
-
-static void
-rename_folders(struct _store_info *si, const char *oldbase, const char *newbase, CamelFolderInfo *fi)
-{
-	char *old;
-	struct _folder_info *mfi;
-	struct _folder_update *up;
-
-	up = g_malloc0(sizeof(*up));
-
-	d(printf("oldbase '%s' newbase '%s' new '%s'\n", oldbase, newbase, fi->full_name));
-
-	/* Form what was the old name, and try and look it up */
-	old = g_strdup_printf("%s%s", oldbase, fi->full_name + strlen(newbase));
-	mfi = g_hash_table_lookup(si->folders, old);
-	if (mfi) {
-		d(printf("Found old folder '%s' renaming to '%s'\n", mfi->full_name, fi->full_name));
-
-		up->oldpath = mfi->path;
-		up->olduri = mfi->uri;
-
-		/* Its a rename op */
-		g_hash_table_remove(si->folders, mfi->full_name);
-		g_hash_table_remove(si->folders, mfi->uri);
-		g_free(mfi->full_name);
-		mfi->path = g_strdup(fi->path);
-		mfi->full_name = g_strdup(fi->full_name);
-		mfi->uri = g_strdup(fi->url);
-		g_hash_table_insert(si->folders, mfi->full_name, mfi);
-		g_hash_table_insert(si->folders_uri, mfi->uri, mfi);
-	} else {
-		d(printf("Rename found a new folder? old '%s' new '%s'\n", old, fi->full_name));
-		/* Its a new op */
-		mfi = g_malloc0(sizeof(*mfi));
-		mfi->path = g_strdup(fi->path);
-		mfi->full_name = g_strdup(fi->full_name);
-		mfi->uri = g_strdup(fi->url);
-		mfi->store_info = si;
-		g_hash_table_insert(si->folders, mfi->full_name, mfi);
-		g_hash_table_insert(si->folders_uri, mfi->uri, mfi);
-	}
-
-	g_free(old);
-
-	up->path = g_strdup(mfi->path);
-	if (si->storage)
-		up->name = g_strdup(fi->name);
-	up->uri = g_strdup(mfi->uri);
-	up->unread = fi->unread_message_count==-1?0:fi->unread_message_count;
-	up->store = si->store;
-	camel_object_ref(up->store);
-	/* FIXME: use fi->flags */
-	if (strstr(fi->url, ";noselect") == NULL)
-		up->add = TRUE;
-
-	e_dlist_addtail(&updates, (EDListNode *)up);
-	flush_updates();
-#if 0
-	if (fi->sibling)
-		rename_folders(si, oldbase, newbase, fi->sibling, folders);
-	if (fi->child)
-		rename_folders(si, oldbase, newbase, fi->child, folders);
-#endif
-}
-
-static void
-get_folders(CamelFolderInfo *fi, GPtrArray *folders)
-{
-	g_ptr_array_add(folders, fi);
-
-	if (fi->child)
-		get_folders(fi->child, folders);
-	if (fi->sibling)
-		get_folders(fi->sibling, folders);
-}
-
-static int
-folder_cmp(const void *ap, const void *bp)
-{
-	const CamelFolderInfo *a = ((CamelFolderInfo **)ap)[0];
-	const CamelFolderInfo *b = ((CamelFolderInfo **)bp)[0];
-
-	return strcmp(a->path, b->path);
-}
-
-static void
-store_folder_renamed(CamelObject *o, void *event_data, void *data)
-{
-	CamelStore *store = (CamelStore *)o;
-	CamelRenameInfo *info = event_data;
-	struct _store_info *si;
-
-	d(printf("Folder renamed: oldbase = '%s' new->full = '%s'\n", info->old_base, info->new->full_name));
-
-	LOCK(info_lock);
-	si = g_hash_table_lookup(stores, store);
-	if (si) {
-		GPtrArray *folders = g_ptr_array_new();
-		CamelFolderInfo *top;
-		int i;
-
-		/* Ok, so for some reason the folderinfo we have comes in all messed up from
-		   imap, should find out why ... this makes it workable */
-		get_folders(info->new, folders);
-		qsort(folders->pdata, folders->len, sizeof(folders->pdata[0]), folder_cmp);
-
-		top = folders->pdata[0];
-		for (i=0;ilen;i++) {
-			rename_folders(si, info->old_base, top->full_name, folders->pdata[i]);
-		}
-
-		g_ptr_array_free(folders, TRUE);
-
-	}
-	UNLOCK(info_lock);
-}
-
-struct _update_data {
-	struct _update_data *next;
-	struct _update_data *prev;
-
-	int id;			/* id for cancellation */
-
-	void (*done)(CamelStore *store, CamelFolderInfo *info, void *data);
-	void *data;
-};
-
-static void
-unset_folder_info_hash(char *path, struct _folder_info *mfi, void *data)
-{
-	unset_folder_info(mfi, FALSE, FALSE);
-}
-
-static void
-free_folder_info_hash(char *path, struct _folder_info *mfi, void *data)
-{
-	free_folder_info(mfi);
-}
-
-void
-mail_note_store_remove(CamelStore *store)
-{
-	struct _update_data *ud;
-	struct _store_info *si;
-
-	g_assert(CAMEL_IS_STORE(store));
-
-	if (stores == NULL)
-		return;
-
-	d(printf("store removed!!\n"));
-	LOCK(info_lock);
-	si = g_hash_table_lookup(stores, store);
-	if (si) {
-		g_hash_table_remove(stores, store);
-
-		camel_object_unhook_event(store, "folder_created", store_folder_created, NULL);
-		camel_object_unhook_event(store, "folder_deleted", store_folder_deleted, NULL);
-		camel_object_unhook_event(store, "folder_renamed", store_folder_renamed, NULL);
-		camel_object_unhook_event(store, "folder_subscribed", store_folder_subscribed, NULL);
-		camel_object_unhook_event(store, "folder_unsubscribed", store_folder_unsubscribed, NULL);
-		g_hash_table_foreach(si->folders, (GHFunc)unset_folder_info_hash, NULL);
-
-		ud = (struct _update_data *)si->folderinfo_updates.head;
-		while (ud->next) {
-			d(printf("Cancelling outstanding folderinfo update %d\n", ud->id));
-			mail_msg_cancel(ud->id);
-			ud = ud->next;
-		}
-
-		/* This is the only gtk object we need to unref */
-		mail_async_event_emit(mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc)bonobo_object_unref, si->storage, 0, 0);
-
-		camel_object_unref(si->store);
-		g_hash_table_foreach(si->folders, (GHFunc)free_folder_info_hash, NULL);
-		g_hash_table_destroy(si->folders);
-		g_hash_table_destroy(si->folders_uri);
-		g_free(si);
-	}
-	UNLOCK(info_lock);
-}
-
-static void
-update_folders(CamelStore *store, CamelFolderInfo *fi, void *data)
-{
-	struct _update_data *ud = data;
-	struct _store_info *si;
-
-	d(printf("Got folderinfo for store\n"));
-
-	LOCK(info_lock);
-	si = g_hash_table_lookup(stores, store);
-	if (si) {
-		/* the 'si' is still there, so we can remove ourselves from its list */
-		/* otherwise its not, and we're on our own and free anyway */
-		e_dlist_remove((EDListNode *)ud);
-
-		if (fi)
-			create_folders(fi, si);
-	}
-	UNLOCK(info_lock);
-
-	if (ud->done)
-		ud->done(store, fi, ud->data);
-	g_free(ud);
-}
-
-
-struct _ping_store_msg {
-	struct _mail_msg msg;
-	
-	CamelStore *store;
-};
-
-static char *
-ping_store_desc (struct _mail_msg *mm, int done)
-{
-	struct _ping_store_msg *m = (struct _ping_store_msg *) mm;
-	char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE);
-	char *msg;
-	
-	msg = g_strdup_printf (_("Pinging %s"), service_name);
-	g_free (service_name);
-	
-	return msg;
-}
-
-static void
-ping_store_ping (struct _mail_msg *mm)
-{
-	struct _ping_store_msg *m = (struct _ping_store_msg *) mm;
-	
-	if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED)
-		camel_store_noop (m->store, &mm->ex);
-}
-
-static void
-ping_store_free (struct _mail_msg *mm)
-{
-	struct _ping_store_msg *m = (struct _ping_store_msg *) mm;
-	
-	camel_object_unref (m->store);
-}
-
-static struct _mail_msg_op ping_store_op = {
-	ping_store_desc,
-	ping_store_ping,
-	NULL,
-	ping_store_free
-};
-
-static void
-ping_store (gpointer key, gpointer val, gpointer user_data)
-{
-	CamelStore *store = (CamelStore *) key;
-	struct _ping_store_msg *m;
-	
-	if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED)
-		return;
-	
-	m = mail_msg_new (&ping_store_op, NULL, sizeof (struct _ping_store_msg));
-	m->store = store;
-	camel_object_ref (store);
-	
-	e_thread_put (mail_thread_queued, (EMsg *) m);
-}
-
-static gboolean
-ping_cb (gpointer user_data)
-{
-	LOCK (info_lock);
-	
-	g_hash_table_foreach (stores, ping_store, NULL);
-	
-	UNLOCK (info_lock);
-	
-	return TRUE;
-}
-
-void
-mail_note_store(CamelStore *store, EvolutionStorage *storage, GNOME_Evolution_Storage corba_storage,
-		void (*done)(CamelStore *store, CamelFolderInfo *info, void *data), void *data)
-{
-	struct _store_info *si;
-	struct _update_data *ud;
-	const char *buf;
-	guint timeout;
-	
-	g_assert(CAMEL_IS_STORE(store));
-	g_assert(pthread_self() == mail_gui_thread);
-	g_assert(storage == NULL || corba_storage == CORBA_OBJECT_NIL);
-
-	LOCK(info_lock);
-
-	if (stores == NULL) {
-		stores = g_hash_table_new(NULL, NULL);
-		count_sent = getenv("EVOLUTION_COUNT_SENT") != NULL;
-		count_trash = getenv("EVOLUTION_COUNT_TRASH") != NULL;
-		buf = getenv ("EVOLUTION_PING_TIMEOUT");
-		timeout = buf ? strtoul (buf, NULL, 10) * 1000 : 600000;
-		ping_id = g_timeout_add (timeout, ping_cb, NULL);
-	}
-
-	si = g_hash_table_lookup(stores, store);
-	if (si == NULL) {
-		d(printf("Noting a new store: %p: %s\n", store, camel_url_to_string(((CamelService *)store)->url, 0)));
-
-		/* FIXME: Need to ref the storages & store or something?? */
-
-		si = g_malloc0(sizeof(*si));
-		si->folders = g_hash_table_new(g_str_hash, g_str_equal);
-		si->folders_uri = g_hash_table_new(CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(store))->hash_folder_name,
-						   CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(store))->compare_folder_name);
-		si->storage = storage;
-		if (storage != NULL)
-			bonobo_object_ref((BonoboObject *)storage);
-		si->corba_storage = corba_storage;
-		si->store = store;
-		camel_object_ref((CamelObject *)store);
-		g_hash_table_insert(stores, store, si);
-		e_dlist_init(&si->folderinfo_updates);
-
-		camel_object_hook_event(store, "folder_created", store_folder_created, NULL);
-		camel_object_hook_event(store, "folder_deleted", store_folder_deleted, NULL);
-		camel_object_hook_event(store, "folder_renamed", store_folder_renamed, NULL);
-		camel_object_hook_event(store, "folder_subscribed", store_folder_subscribed, NULL);
-		camel_object_hook_event(store, "folder_unsubscribed", store_folder_unsubscribed, NULL);
-	}
-
-
-	if (!CAMEL_IS_DISCO_STORE (store) ||
-	    camel_disco_store_status (CAMEL_DISCO_STORE (store)) == CAMEL_DISCO_STORE_ONLINE ||
-	    camel_disco_store_can_work_offline (CAMEL_DISCO_STORE (store))) {
-		ud = g_malloc(sizeof(*ud));
-		ud->done = done;
-		ud->data = data;
-		ud->id = mail_get_folderinfo(store, update_folders, ud);
-		
-		e_dlist_addtail(&si->folderinfo_updates, (EDListNode *)ud);
-	}
-
-	UNLOCK(info_lock);
-}
-
-struct _find_info {
-	const char *uri;
-	struct _folder_info *fi;
-};
-
-/* look up on each storeinfo using proper hash function for that stores uri's */
-static void storeinfo_find_folder_info(CamelStore *store, struct _store_info *si, struct _find_info *fi)
-{
-	if (fi->fi == NULL)
-		fi->fi = g_hash_table_lookup(si->folders_uri, fi->uri);
-}
-
-/* returns TRUE if the uri is available, folderp is set to a
-   reffed folder if the folder has also already been opened */
-int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp)
-{
-	struct _find_info fi = { uri, NULL };
-
-	if (stores == NULL)
-		return FALSE;
-
-	LOCK(info_lock);
-	g_hash_table_foreach(stores, (GHFunc)storeinfo_find_folder_info, &fi);
-	if (folderp) {
-		if (fi.fi && fi.fi->folder) {
-			*folderp = fi.fi->folder;
-			camel_object_ref(*folderp);
-		} else {
-			*folderp = NULL;
-		}
-	}
-	UNLOCK(info_lock);
-
-	return fi.fi != NULL;
-}
diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h
deleted file mode 100644
index 8f3309e74f..0000000000
--- a/mail/mail-folder-cache.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-folder-cache.h: Stores information about open folders */
-
-/* 
- * Authors: Peter Williams 
- *	    Michael Zucchi 
- *
- * Copyright 2000,2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _MAIL_FOLDER_CACHE_H
-#define _MAIL_FOLDER_CACHE_H
-
-#include 
-
-/* Add a store whose folders should appear in the shell
-   The folders are scanned from the store, and/or added at
-   runtime via the folder_created event */
-void
-mail_note_store(CamelStore *store, EvolutionStorage *storage, GNOME_Evolution_Storage corba_storage,
-		void (*done)(CamelStore *store, CamelFolderInfo *info, void *data), void *data);
-
-/* de-note a store */
-void mail_note_store_remove(CamelStore *store);
-
-/* When a folder has been opened, notify it for watching.
-   The folder must have already been created on the store (which has already been noted)
-   before the folder can be opened
- */
-void mail_note_folder(struct _CamelFolder *folder);
-
-/* Returns true if a folder is available (yet), and also sets *folderp (if supplied)
-   to a (referenced) copy of the folder if it has already been opened */
-int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp);
-
-#endif
diff --git a/mail/mail-font-prefs.c b/mail/mail-font-prefs.c
deleted file mode 100644
index 0d26f1ccbd..0000000000
--- a/mail/mail-font-prefs.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Larry Ewing 
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-
-#include "mail-font-prefs.h"
-
-static GtkVBoxClass *parent_class = NULL;
-
-GtkWidget *
-mail_font_prefs_new (void)
-{
-	MailFontPrefs *new;
-	
-	new = MAIL_FONT_PREFS (g_object_new (mail_font_prefs_get_type ()), NULL);
-	
-	return GTK_WIDGET (new);
-}
-
-void
-mail_font_prefs_apply (MailFontPrefs *prefs)
-{
-	gtk_html_propmanager_apply (prefs->pman);
-}
-
-static void
-font_prefs_changed (GtkHTMLPropmanager *pman, MailFontPrefs *prefs)
-{
-	if (prefs->control)
-		evolution_config_control_changed (prefs->control);
-}
-
-static void
-mail_font_prefs_destroy (GtkObject *object)
-{
-	MailFontPrefs *prefs = (MailFontPrefs *) object;
-
-	if (prefs->pman) {
-		g_object_unref(prefs->pman);
-		g_object_unref(prefs->gui);
-		prefs->pman = NULL;
-	}
-
-	if (GTK_OBJECT_CLASS (parent_class)->finalize)
-		(* GTK_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-static void
-mail_font_prefs_init (MailFontPrefs *prefs)
-{
-	GtkWidget *toplevel;
-	GladeXML *gui;
-
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "font_tab", NULL);
-	prefs->gui = gui;
-
-	prefs->pman = GTK_HTML_PROPMANAGER (gtk_html_propmanager_new (NULL));
-	gtk_html_propmanager_set_gui (prefs->pman, gui, NULL);
-	g_object_ref(prefs->pman);
-	gtk_object_sink (GTK_OBJECT (prefs->pman));
-
-	g_signal_connect(prefs->pman, "changed", font_prefs_changed, prefs);
-
-	/* get our toplevel widget */
-	toplevel = glade_xml_get_widget (gui, "toplevel");
-	
-	/* reparent */
-	g_object_ref (toplevel);
-	gtk_container_remove (GTK_CONTAINER (toplevel->parent), toplevel);
-	gtk_container_add (GTK_CONTAINER (prefs), toplevel);
-	g_object_unref (toplevel);
-}
-
-static void
-mail_font_prefs_class_init (MailFontPrefsClass *klass)
-{
-	GtkObjectClass *object_class;
-
-	object_class = (GtkObjectClass *) klass;
-	parent_class = g_type_class_ref(gtk_vbox_get_type ());
-
-	object_class->destroy = mail_font_prefs_destroy;
-}
-
-GtkType
-mail_font_prefs_get_type (void)
-{
-	static GType type = 0;
-	
-	if (!type) {
-		GTypeInfo type_info = {
-			sizeof (MailFontPrefsClass),
-			NULL, NULL,
-			(GClassInitFunc) mail_font_prefs_class_init,
-			NULL, NULL,
-			sizeof (MailFontPrefs),
-			0,
-			(GInstanceInitFunc) mail_font_prefs_init,
-		};
-		
-		type = g_type_register_static (gtk_vbox_get_type (), "MailFontPrefs", &type_info, 0);
-	}
-
-	return type;
-}
-
-
diff --git a/mail/mail-font-prefs.h b/mail/mail-font-prefs.h
deleted file mode 100644
index 14a1d20b40..0000000000
--- a/mail/mail-font-prefs.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast 
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-#ifndef __MAIL_FONT_PREFS_H__
-#define __MAIL_FONT_PREFS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif
-
-#include 
-#include 
-
-#include 
-#include "evolution-config-control.h"
-
-#define MAIL_FONT_PREFS_TYPE          (mail_font_prefs_get_type())
-#define MAIL_FONT_PREFS(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), MAIL_FONT_PREFS_TYPE, MailFontPrefs))
-#define MAIL_FONT_PREFS_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST ((k), MAIL_FONT_PREFS_TYPE, MailFontPrefsClass))
-#define IS_MAIL_FONT_PREFS(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), MAIL_FONT_PREFS_TYPE))
-#define IS_MAIL_FONT_PREFS_CLASS(k)   (G_TYPE_CHECK_CLASS_TYPE ((k), MAIL_FONT_PREFS_TYPE))
-
-typedef struct _MailFontPrefs MailFontPrefs;
-typedef struct _MailFontPrefsClass MailFontPrefsClass;
-
-struct _MailFontPrefs {
-	GtkVBox parent_object;
-
-	GtkHTMLPropmanager *pman;
-	GladeXML *gui;
-	EvolutionConfigControl *control;
-};
-	
-struct _MailFontPrefsClass {
-	GtkVBoxClass parent_object;
-};
-
-GtkType      mail_font_prefs_get_type (void);
-GtkWidget *  mail_font_prefs_new (void);
-void         mail_font_prefs_apply (MailFontPrefs *prefs);
-
-#define MAIL_FONT_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_FontPrefs_ConfigControl"
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __MAIL_FONT_PREFS_H__ */
diff --git a/mail/mail-format.c b/mail/mail-format.c
deleted file mode 100644
index d1583db0fb..0000000000
--- a/mail/mail-format.c
+++ /dev/null
@@ -1,2080 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Authors: Dan Winship 
- *          Jeffrey Stedfast 
- *
- *  Copyright 2000, 2001 Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include    /* for strstr  */
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-
-#include "mail.h"
-#include "mail-tools.h"
-#include "mail-display.h"
-#include "mail-format.h"
-#include "mail-mt.h"
-#include "mail-crypto.h"
-
-
-#define STANDARD_ISSUE_TABLE_OPEN ""
-
-static ssize_t mail_format_data_wrapper_write_to_stream (CamelDataWrapper *wrapper,
-							 MailDisplay *mail_display,
-							 CamelStream *stream);
-
-
-static gboolean handle_text_plain            (CamelMimePart *part, const char *mime_type,
-					      MailDisplay *md, MailDisplayStream *stream);
-static gboolean handle_text_enriched         (CamelMimePart *part, const char *mime_type,
-					      MailDisplay *md, MailDisplayStream *stream);
-static gboolean handle_text_html             (CamelMimePart *part, const char *mime_type,
-					      MailDisplay *md, MailDisplayStream *stream);
-static gboolean handle_image                 (CamelMimePart *part, const char *mime_type,
-					      MailDisplay *md, MailDisplayStream *stream);
-static gboolean handle_multipart_mixed       (CamelMimePart *part, const char *mime_type,
-					      MailDisplay *md, MailDisplayStream *stream);
-static gboolean handle_multipart_related     (CamelMimePart *part, const char *mime_type,
-					      MailDisplay *md, MailDisplayStream *stream);
-static gboolean handle_multipart_alternative (CamelMimePart *part, const char *mime_type,
-					      MailDisplay *md, MailDisplayStream *stream);
-static gboolean handle_multipart_appledouble (CamelMimePart *part, const char *mime_type,
-					      MailDisplay *md, MailDisplayStream *stream);
-static gboolean handle_multipart_encrypted   (CamelMimePart *part, const char *mime_type,
-					      MailDisplay *md, MailDisplayStream *stream);
-static gboolean handle_multipart_signed      (CamelMimePart *part, const char *mime_type,
-					      MailDisplay *md, MailDisplayStream *stream);
-static gboolean handle_message_rfc822        (CamelMimePart *part, const char *mime_type,
-					      MailDisplay *md, MailDisplayStream *stream);
-static gboolean handle_message_external_body (CamelMimePart *part, const char *mime_type,
-					      MailDisplay *md, MailDisplayStream *stream);
-
-static gboolean handle_via_bonobo            (CamelMimePart *part, const char *mime_type,
-					      MailDisplay *md, MailDisplayStream *stream);
-
-/* writes the header info for a mime message into an html stream */
-static void write_headers (MailDisplayStream *stream, MailDisplay *md, CamelMimeMessage *message);
-
-/* dispatch html printing via mimetype */
-static gboolean format_mime_part (CamelMimePart *part, MailDisplay *md, MailDisplayStream *stream);
-
-static void
-free_url (gpointer key, gpointer value, gpointer data)
-{
-	g_free (key);
-	if (data)
-		g_byte_array_free (value, TRUE);
-}
-
-static void
-free_part_urls (gpointer urls)
-{
-	g_hash_table_foreach (urls, free_url, NULL);
-	g_hash_table_destroy (urls);
-}
-
-static void
-free_data_urls (gpointer urls)
-{
-	g_hash_table_foreach (urls, free_url, GINT_TO_POINTER (1));
-	g_hash_table_destroy (urls);
-}
-
-/**
- * mail_format_mime_message: 
- * @mime_message: the input mime message
- * @md: the MailDisplay to render into
- *
- * Writes a CamelMimeMessage out into a MailDisplay
- **/
-void
-mail_format_mime_message (CamelMimeMessage *mime_message, MailDisplay *md,
-			  MailDisplayStream *stream)
-{
-	GHashTable *hash;
-	
-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (mime_message));
-	
-	hash = g_datalist_get_data (md->data, "part_urls");
-	if (!hash) {
-		hash = g_hash_table_new (g_str_hash, g_str_equal);
-		g_datalist_set_data_full (md->data, "part_urls", hash,
-					  free_part_urls);
-	}
-	hash = g_datalist_get_data (md->data, "data_urls");
-	if (!hash) {
-		hash = g_hash_table_new (g_str_hash, g_str_equal);
-		g_datalist_set_data_full (md->data, "data_urls", hash,
-					  free_data_urls);
-	}
-	
-	hash = g_datalist_get_data (md->data, "attachment_states");
-	if (!hash) {
-		hash = g_hash_table_new (NULL, NULL);
-		g_datalist_set_data_full (md->data, "attachment_states", hash,
-					  (GDestroyNotify) g_hash_table_destroy);
-	}
-	hash = g_datalist_get_data (md->data, "fake_parts");
-	if (!hash) {
-		hash = g_hash_table_new (NULL, NULL);
-		g_datalist_set_data_full (md->data, "fake_parts", hash,
-					  (GDestroyNotify) g_hash_table_destroy);
-	}
-	
-	write_headers (stream, md, mime_message);
-	format_mime_part (CAMEL_MIME_PART (mime_message), md, stream);
-}
-
-
-/**
- * mail_format_raw_message: 
- * @mime_message: the input mime message
- * @md: the MailDisplay to render into
- *
- * Writes a CamelMimeMessage source out into a MailDisplay
- **/
-void
-mail_format_raw_message (CamelMimeMessage *mime_message, MailDisplay *md,
-			 MailDisplayStream *stream)
-{
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilter *html_filter;
-	CamelDataWrapper *wrapper;
-	guint32 flags;
-	
-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (mime_message));
-	
-	wrapper = CAMEL_DATA_WRAPPER (mime_message);
-	if (!mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
-		return;
-	
-	filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) stream);
-	
-	flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES |
-		CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT;
-	html_filter = camel_mime_filter_tohtml_new (flags, 0);
-	camel_stream_filter_add (filtered_stream, html_filter);
-	camel_object_unref (html_filter);
-	
-	camel_stream_write_string ((CamelStream *) stream, STANDARD_ISSUE_TABLE_OPEN "
    ");
-	
-	mail_format_data_wrapper_write_to_stream (wrapper, md, (CamelStream *) filtered_stream);
-	camel_object_unref (filtered_stream);
-	
-	camel_stream_write_string ((CamelStream *) stream, "
    ");
-}
-
-static const char *
-get_cid (CamelMimePart *part, MailDisplay *md)
-{
-	static int fake_cid_counter = 0;
-	char *cid;
-	
-	/* If we have a real Content-ID, use it. If we don't,
-	 * make a (syntactically invalid, unique) fake one.
-	 */
-	if (camel_mime_part_get_content_id (part)) {
-		cid = g_strdup_printf ("cid:%s",
-				       camel_mime_part_get_content_id (part));
-	} else
-		cid = g_strdup_printf ("cid:@@@%d", fake_cid_counter++);
-	
-	return mail_display_add_url (md, "part_urls", cid, part);
-}
-
-static const char *
-get_location (CamelMimePart *part, MailDisplay *md)
-{
-	CamelURL *base;
-	const char *loc;
-	char *location;
-	
-	base = mail_display_get_content_location (md);
-	
-	loc = camel_mime_part_get_content_location (part);
-	if (!loc) {
-		if (!base)
-			return NULL;
-		
-		location = camel_url_to_string (base, 0);
-		return mail_display_add_url (md, "part_urls", location, part);
-	}
-	
-	/* kludge: If the multipart/related does not have a
-           Content-Location header and the HTML part doesn't contain a
-           Content-Location header either, then we will end up
-           generating a invalid unique identifier in the form of
-           "cid:@@@%d" for use in GtkHTML's iframe src url. This means
-           that when GtkHTML requests a relative URL, it will request
-           "cid:/%s" */
-	mail_display_add_url (md, "part_urls", g_strdup_printf ("cid:/%s", loc), part);
-	
-	if (!strchr (loc, ':') && base) {
-		CamelURL *url;
-		
-		mail_display_add_url (md, "part_urls", g_strdup (loc), part);
-		
-		url = camel_url_new_with_base (base, loc);
-		location = camel_url_to_string (url, 0);
-		camel_url_free (url);
-	} else {
-		location = g_strdup (loc);
-	}
-	
-	return mail_display_add_url (md, "part_urls", location, part);
-}
-
-
-static GHashTable *mime_handler_table, *mime_function_table;
-
-static void
-setup_mime_tables (void)
-{
-	mime_handler_table = g_hash_table_new (g_str_hash, g_str_equal);
-	mime_function_table = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	g_hash_table_insert (mime_function_table, "text/plain",
-			     handle_text_plain);
-	g_hash_table_insert (mime_function_table, "text/richtext",
-			     handle_text_enriched);
-	g_hash_table_insert (mime_function_table, "text/enriched",
-			     handle_text_enriched);
-	g_hash_table_insert (mime_function_table, "text/html",
-			     handle_text_html);
-	
-	g_hash_table_insert (mime_function_table, "image/gif",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/jpeg",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/png",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-png",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/tiff",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-bmp",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/bmp",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-cmu-raster",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-ico",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-portable-anymap",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-portable-bitmap",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-portable-graymap",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-portable-pixmap",
-			     handle_image);
-	g_hash_table_insert (mime_function_table, "image/x-xpixmap",
-			     handle_image);
-	
-	g_hash_table_insert (mime_function_table, "message/rfc822",
-			     handle_message_rfc822);
-	g_hash_table_insert (mime_function_table, "message/news",
-			     handle_message_rfc822);
-	g_hash_table_insert (mime_function_table, "message/external-body",
-			     handle_message_external_body);
-	
-	g_hash_table_insert (mime_function_table, "multipart/alternative",
-			     handle_multipart_alternative);
-	g_hash_table_insert (mime_function_table, "multipart/related",
-			     handle_multipart_related);
-	g_hash_table_insert (mime_function_table, "multipart/mixed",
-			     handle_multipart_mixed);
-	g_hash_table_insert (mime_function_table, "multipart/appledouble",
-			     handle_multipart_appledouble);
-	g_hash_table_insert (mime_function_table, "multipart/encrypted",
-			     handle_multipart_encrypted);
-	g_hash_table_insert (mime_function_table, "multipart/signed",
-			     handle_multipart_signed);
-	
-	/* RFC 2046 says unrecognized text subtypes can be treated
-	 * as text/plain (as long as you recognize the character set),
-	 * and unrecognized multipart subtypes as multipart/mixed.  */
-	g_hash_table_insert (mime_function_table, "text/*",
-			     handle_text_plain);
-	g_hash_table_insert (mime_function_table, "multipart/*",
-			     handle_multipart_mixed);
-}
-
-static gboolean
-component_supports (Bonobo_ServerInfo *component, const char *mime_type)
-{
-	Bonobo_ActivationProperty *prop;
-	CORBA_sequence_CORBA_string stringv;
-	int i;
-	
-	prop = bonobo_server_info_prop_find (component, "repo_ids");
-	if (!prop || prop->v._d != Bonobo_ACTIVATION_P_STRINGV)
-		return FALSE;
-	
-	stringv = prop->v._u.value_stringv;
-	for (i = 0; i < stringv._length; i++) {
-		if (!strcasecmp ("IDL:Bonobo/PersistStream:1.0", stringv._buffer[i]))
-			break;
-	}
-	
-	/* got to end of list with no persist stream? */
-	
-	if (i >= stringv._length)
-		return FALSE;
-	
-	prop = bonobo_server_info_prop_find (component,
-					     "bonobo:supported_mime_types");
-	if (!prop || prop->v._d != Bonobo_ACTIVATION_P_STRINGV)
-		return FALSE;
-	
-	stringv = prop->v._u.value_stringv;
-	for (i = 0; i < stringv._length; i++) {
-		if (!strcasecmp (mime_type, stringv._buffer[i]))
-			return TRUE;
-	}
-	
-	return FALSE;
-}
-
-/**
- * mail_lookup_handler:
- * @mime_type: a MIME type
- *
- * Looks up the MIME type in its own tables and GNOME-VFS's and returns
- * a MailMimeHandler structure detailing the component, application,
- * and built-in handlers (if any) for that MIME type. (If the component
- * is non-%NULL, the built-in handler will always be handle_via_bonobo().)
- * The MailMimeHandler's @generic field is set if the match was for the
- * MIME supertype rather than the exact type.
- *
- * Return value: a MailMimeHandler (which should not be freed), or %NULL
- * if no handlers are available.
- **/
-MailMimeHandler *
-mail_lookup_handler (const char *mime_type)
-{
-	MailMimeHandler *handler;
-	char *mime_type_main;
-	const char *p;
-	GList *components, *iter;
-	
-	if (mime_handler_table == NULL)
-		setup_mime_tables ();
-	
-	/* See if we've already found it. */
-	handler = g_hash_table_lookup (mime_handler_table, mime_type);
-	if (handler)
-		return handler;
-	
-	/* Special case MIME type: application/octet-stream
-	 * The point of this type is that there isn't a handler. 
-	 */
-	if (strcmp (mime_type, "application/octet-stream") == 0)
-		return NULL;
-	
-	/* No. Create a new one and look up application and full type
-	 * handler. If we find a builtin, create the handler and
-	 * register it.
-	 */
-	handler = g_new0 (MailMimeHandler, 1);
-	handler->applications =
-		gnome_vfs_mime_get_short_list_applications (mime_type);
-	handler->builtin =
-		g_hash_table_lookup (mime_function_table, mime_type);
-	
-	if (handler->builtin) {
-		handler->generic = FALSE;
-		goto reg;
-	}
-	
-	/* Try for the first matching component. (we don't use get_short_list_comps
-	 * as that will return NULL if the oaf files don't have the short_list properties
-	 * defined). */
-	components = gnome_vfs_mime_get_all_components (mime_type);
-	for (iter = components; iter; iter = iter->next) {
-		if (component_supports (iter->data, mime_type)) {
-			handler->generic = FALSE;
-			handler->builtin = handle_via_bonobo;
-			handler->component = Bonobo_ServerInfo_duplicate (iter->data);
-			gnome_vfs_mime_component_list_free (components);
-			goto reg;
-		}
-	}
-	
-	gnome_vfs_mime_component_list_free (components);
-	
-	/* Try for a generic builtin match. */
-	p = strchr (mime_type, '/');
-	if (p == NULL)
-		p = mime_type + strlen (mime_type);
-	mime_type_main = g_alloca ((p - mime_type) + 3);
-	memcpy (mime_type_main, mime_type, p - mime_type);
-	memcpy (mime_type_main + (p - mime_type), "/*", 3);
-	
-	handler->builtin = g_hash_table_lookup (mime_function_table,
-						mime_type_main);
-	
-	if (handler->builtin) {
-		handler->generic = TRUE;
-		if (handler->component) {
-			CORBA_free (handler->component);
-			handler->component = NULL;
-		}
-		goto reg;
-	}
-	
-	/* Try for a generic component match. */
-	if (handler->component) {
-		handler->generic = TRUE;
-		handler->builtin = handle_via_bonobo;
-		goto reg;
-	}
-	
-	/* If we at least got an application, use that. */
-	if (handler->applications) {
-		handler->generic = TRUE;
-		goto reg;
-	}
-	
-	/* Nada. */
-	g_free (handler);
-	return NULL;
-	
- reg:
-	g_hash_table_insert (mime_handler_table, g_strdup (mime_type), handler);
-	
-	return handler;
-}
-
-/* An "anonymous" MIME part is one that we shouldn't call attention
- * to the existence of, but simply display.
- */
-static gboolean
-is_anonymous (CamelMimePart *part, const char *mime_type)
-{
-	/* FIXME: should use CamelContentType stuff */
-	if (!strncasecmp (mime_type, "multipart/", 10) ||
-	    !strncasecmp (mime_type, "message/", 8))
-		return TRUE;
-	
-	if (!strncasecmp (mime_type, "text/", 5) &&
-	    !camel_mime_part_get_filename (part))
-		return TRUE;
-	
-	return FALSE;
-}
-
-/**
- * mail_part_is_inline:
- * @part: a CamelMimePart
- *
- * Return value: whether or not the part should/will be displayed inline.
- **/
-gboolean
-mail_part_is_inline (CamelMimePart *part)
-{
-	const char *disposition;
-	CamelContentType *content_type;
-	gboolean anon;
-	char *type;
-	
-	/* If it has an explicit disposition, return that. */
-	disposition = camel_mime_part_get_disposition (part);
-	if (disposition)
-		return strcasecmp (disposition, "inline") == 0;
-	
-	/* Certain types should default to inline. FIXME: this should
-	 * be customizable.
-	 */
-	content_type = camel_mime_part_get_content_type (part);
-	if (!header_content_type_is (content_type, "message", "*"))
-		return TRUE;
-	
-	/* Otherwise, display it inline if it's "anonymous", and
-	 * as an attachment otherwise.
-	 */
-	type = header_content_type_simple (content_type);
-	anon = is_anonymous (part, type);
-	g_free (type);
-	
-	return anon;
-}
-
-enum inline_states {
-	I_VALID     = (1 << 0),
-	I_ACTUALLY  = (1 << 1),
-	I_DISPLAYED = (1 << 2)
-};
-
-static int
-get_inline_flags (CamelMimePart *part, MailDisplay *md)
-{
-	GHashTable *asht;
-	int val;
-	
-	/* check if we already know. */
-	
-	asht = g_datalist_get_data (md->data, "attachment_states");
-	val = GPOINTER_TO_INT (g_hash_table_lookup (asht, part));
-	if (val)
-		return val;
-	
-	/* ok, we don't know. Figure it out. */
-	
-	if (mail_part_is_inline (part))
-		val = (I_VALID | I_ACTUALLY | I_DISPLAYED);
-	else
-		val = (I_VALID);
-	
-	g_hash_table_insert (asht, part, GINT_TO_POINTER (val));
-	
-	return val;
-}
-
-gboolean
-mail_part_is_displayed_inline (CamelMimePart *part, MailDisplay *md)
-{
-	return (gboolean) (get_inline_flags (part, md) & I_DISPLAYED);
-}
-
-void
-mail_part_toggle_displayed (CamelMimePart *part, MailDisplay *md)
-{
-	GHashTable *asht = g_datalist_get_data (md->data, "attachment_states");
-	gpointer ostate, opart;
-	int state;
-	
-	if (g_hash_table_lookup_extended (asht, part, &opart, &ostate)) {
-		g_hash_table_remove (asht, part);
-		
-		state = GPOINTER_TO_INT (ostate);
-		
-		if (state & I_DISPLAYED)
-			state &= ~I_DISPLAYED;
-		else
-			state |= I_DISPLAYED;
-	} else {
-		state = I_VALID | I_DISPLAYED;
-	}
-	
-	g_hash_table_insert (asht, part, GINT_TO_POINTER (state));
-}
-
-static void
-mail_part_set_default_displayed_inline (CamelMimePart *part, MailDisplay *md,
-					gboolean displayed)
-{
-	GHashTable *asht = g_datalist_get_data (md->data, "attachment_states");
-	int state;
-	
-	if (g_hash_table_lookup (asht, part))
-		return;
-	
-	state = I_VALID | (displayed ? I_DISPLAYED : 0);
-	g_hash_table_insert (asht, part, GINT_TO_POINTER (state));
-}
-
-static void
-attachment_header (CamelMimePart *part, const char *mime_type, MailDisplay *md,
-		   MailDisplayStream *stream)
-{
-	char *htmlinfo;
-	const char *info;
-	
-	/* Start the table, create the pop-up object. */
-	camel_stream_write_string ((CamelStream *) stream, "");
-	
-	if (!md->printing) {
-		camel_stream_printf ((CamelStream *) stream, "", get_cid (part, md), mime_type);
-	}
-	
-	camel_stream_write_string ((CamelStream *) stream, "
    "
-				   ""
-				   "
    		"
-				  "
    		");
-	
-	/* Write the MIME type */
-	info = gnome_vfs_mime_get_description (mime_type);
-	htmlinfo = camel_text_to_html (info ? info : mime_type, 0, 0);
-	camel_stream_printf ((CamelStream *) stream, _("%s attachment"), htmlinfo);
-	g_free (htmlinfo);
-	
-	/* Write the name, if we have it. */
-	info = camel_mime_part_get_filename (part);
-	if (info) {
-		htmlinfo = camel_text_to_html (info, 0, 0);
-		camel_stream_printf ((CamelStream *) stream, " (%s)", htmlinfo);
-		g_free (htmlinfo);
-	}
-	
-	/* Write a description, if we have one. */
-	info = camel_mime_part_get_description (part);
-	if (info) {
-		htmlinfo = camel_text_to_html (info, md->printing ? 0 : CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
-		camel_stream_printf ((CamelStream *) stream, ", \"%s\"", htmlinfo);
-		g_free (htmlinfo);
-	}
-	
-	camel_stream_write_string ((CamelStream *) stream, "
    "
-				   "
    "
-				   "
    \n");
-}
-
-static gboolean
-format_mime_part (CamelMimePart *part, MailDisplay *md,
-		  MailDisplayStream *stream)
-{
-	CamelDataWrapper *wrapper;
-	char *mime_type, *tmp;
-	MailMimeHandler *handler;
-	gboolean output;
-	int inline_flags;
-	
-	/* Record URLs associated with this part */
-	get_cid (part, md);
-	get_location (part, md);
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	
-	if (CAMEL_IS_MULTIPART (wrapper) &&
-	    camel_multipart_get_number (CAMEL_MULTIPART (wrapper)) == 0) {
-		mail_error_printf (stream, "\n%s\n", _("Could not parse MIME message. Displaying as source."));
-		if (mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
-			handle_text_plain (part, "text/plain", md, stream);
-		return TRUE;
-	}
-	
-	tmp = camel_data_wrapper_get_mime_type (wrapper);
-	mime_type = g_ascii_strdown (tmp, strlen (tmp));
-	g_free (tmp);
-	
-	handler = mail_lookup_handler (mime_type);
-	if (!handler) {
-		char *id_type;
-		
-		/* Special case MIME types that we know that we can't
-		 * display but are some kind of plain text to prevent
-		 * evil infinite recursion.
-		 */
-		
-		if (!strcmp (mime_type, "application/mac-binhex40")) {
-			handler = NULL;
-		} else {
-			id_type = mail_identify_mime_part (part, md);
-			if (id_type) {
-				g_free (mime_type);
-				mime_type = id_type;
-				handler = mail_lookup_handler (id_type);
-			}
-		}
-	}
-	
-	inline_flags = get_inline_flags (part, md);
-	
-	/* No header for anonymous inline parts. */
-	if (!((inline_flags & I_ACTUALLY) && is_anonymous (part, mime_type)))
-		attachment_header (part, mime_type, md, stream);
-	
-	if (handler && handler->builtin && inline_flags & I_DISPLAYED &&
-	    mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
-		output = (*handler->builtin) (part, mime_type, md, stream);
-	else
-		output = TRUE;
-	
-	g_free (mime_type);
-	return output;
-}
-
-/* flags for write_field_to_stream */
-enum {
-	WRITE_BOLD=1,
-	WRITE_NOCOLUMNS=2,
-};
-
-static void
-write_field_row_begin (MailDisplayStream *stream, const char *name, int flags)
-{
-	gboolean bold = (flags & WRITE_BOLD);
-	gboolean nocolumns = (flags & WRITE_NOCOLUMNS);
-	
-	if (nocolumns) {
-		camel_stream_printf ((CamelStream *) stream, "%s%s:%s ",
-				     bold ? "" : "", name, bold ? "" : "");
-	} else {
-		camel_stream_printf ((CamelStream *) stream,
-				     "<%s align=\"right\" valign=\"top\">%s:"
-				     " ", bold ? "th" : "td",
-				     name, bold ? "th" : "td");
-	}
-}
-
-static void
-write_date (MailDisplayStream *stream, CamelMimeMessage *message, int flags)
-{
-	const char *datestr;
-	
-	datestr = camel_medium_get_header (CAMEL_MEDIUM (message), "Date");
-	
-	if (datestr) {
-		write_field_row_begin (stream, _("Date"), flags);
-		camel_stream_printf ((CamelStream *) stream, "%s ", datestr);
-	}
-}
-
-static void
-write_text_header (MailDisplayStream *stream, const char *name, const char *value, int flags)
-{
-	char *encoded;
-	
-	if (value && *value)
-		encoded = camel_text_to_html (value, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
-	else
-		encoded = "";
-	
-	write_field_row_begin (stream, name, flags);
-	
-	camel_stream_printf ((CamelStream *) stream, "%s", encoded);
-	
-	if (value && *value)
-		g_free (encoded);
-}
-
-static void
-write_address (MailDisplay *md, MailDisplayStream *stream,
-	       const CamelInternetAddress *addr, const char *field_name, int flags)
-{
-	const char *name, *email;
-	int i;
-	
-	if (addr == NULL || !camel_internet_address_get (addr, 0, NULL, NULL))
-		return;
-	
-	write_field_row_begin (stream, field_name, flags);
-	
-	i = 0;
-	while (camel_internet_address_get (addr, i, &name, &email)) {
-		CamelInternetAddress *subaddr;
-		char *addr_txt, *addr_url;
-		gboolean have_name = name && *name;
-		gboolean have_email = email && *email;
-		char *name_disp = NULL;
-		char *email_disp = NULL;
-		
-		subaddr = camel_internet_address_new ();
-		camel_internet_address_add (subaddr, name, email);
-		addr_txt = camel_address_format (CAMEL_ADDRESS (subaddr));
-		addr_url = camel_url_encode (addr_txt, TRUE, NULL);
-		camel_object_unref (subaddr);
-		
-		if (have_name) {
-			name_disp = camel_text_to_html (name, 0, 0);
-		}
-		
-		if (have_email) {
-			email_disp = camel_text_to_html (email, 0, 0);
-		}
-		
-		if (i)
-			camel_stream_write_string ((CamelStream *) stream, ", ");
-		
-		if (have_email || have_name) {
-			if (!have_email)
-				email_disp = g_strdup ("???");
-			
-			if (have_name) {
-				if (md->printing) {
-					camel_stream_printf ((CamelStream *) stream,
-							     "%s <%s>", name_disp, email_disp);
-				} else {
-					camel_stream_printf ((CamelStream *) stream,
-							     "%s <%s>",
-							     name_disp, addr_url, email_disp);
-				}
-			} else {
-				if (md->printing) {
-					camel_stream_write_string ((CamelStream *) stream, email_disp);
-				} else {
-					camel_stream_printf ((CamelStream *) stream,
-							     "%s",
-							     addr_url, email_disp);
-				}
-			}
-		} else {
-			camel_stream_printf ((CamelStream *) stream, "%s", _("Bad Address"));
-		}
-		
-		g_free (name_disp);
-		g_free (email_disp);
-		g_free (addr_txt);
-		g_free (addr_url);
-		
-		i++;
-	}
-	
-	camel_stream_write_string ((CamelStream *) stream, "");
-}
-
-/* order of these must match write_header code */
-static char *default_headers[] = {
-	"From", "Reply-To", "To", "Cc", "Bcc", "Subject", "Date",
-};
-
-/* return index of header in default_headers array */
-static int
-default_header_index (const char *name)
-{
-	int i;
-	
-	for (i = 0; i < sizeof (default_headers) / sizeof (default_headers[0]); i++)
-		if (!strcasecmp (name, default_headers[i]))
-			return i;
-	
-	return -1;
-}
-
-/* index is index of header in default_headers array */
-static void
-write_default_header (CamelMimeMessage *message, MailDisplay *md, 
-		      MailDisplayStream *stream,
-		      int index, int flags)
-{
-	switch (index) {
-	case 0:
-		write_address (md, stream,
-			       camel_mime_message_get_from (message), _("From"), flags | WRITE_BOLD);
-		break;
-	case 1:
-		write_address (md, stream, 
-			       camel_mime_message_get_reply_to (message), _("Reply-To"), flags | WRITE_BOLD);
-		break;
-	case 2:
-		write_address (md, stream,
-			       camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO),
-			      _("To"), flags | WRITE_BOLD);
-		break;
-	case 3:
-		write_address (md, stream,
-			       camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC),
-			       _("Cc"), flags | WRITE_BOLD);
-		break;
-	case 4:
-		write_address (md, stream,
-			       camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_BCC),
-			       _("Bcc"), flags | WRITE_BOLD);
-		break;
-	case 5:
-		write_text_header (stream, _("Subject"), camel_mime_message_get_subject (message),
-				   flags | WRITE_BOLD);
-		break;
-	case 6:
-		write_date (stream, message, flags | WRITE_BOLD);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static gboolean
-write_xmailer_header (CamelMimeMessage *message, MailDisplay *md,
-		      MailDisplayStream *stream, int xmask)
-{
-	const char *xmailer, *evolution;
-	
-	xmailer = camel_medium_get_header (CAMEL_MEDIUM (message), "X-Mailer");
-	if (!xmailer) {
-		xmailer = camel_medium_get_header (CAMEL_MEDIUM (message), "User-Agent");
-		if (!xmailer)
-			return FALSE;
-	}
-	
-	evolution = strstr (xmailer, "Evolution");
-	if ((xmask & MAIL_CONFIG_XMAILER_OTHER) ||
-	    (evolution && (xmask & MAIL_CONFIG_XMAILER_EVO)))
-		write_text_header (stream, _("Mailer"), xmailer, WRITE_BOLD);
-	
-	return evolution != NULL && (xmask & MAIL_CONFIG_XMAILER_RUPERT_APPROVED);
-}
-
-#define COLOR_IS_LIGHT(r, g, b)  ((r + g + b) > (128 * 3))
-
-static void
-write_headers (MailDisplayStream *stream, MailDisplay *md, CamelMimeMessage *message)
-{
-	gboolean full = (md->display_style == MAIL_CONFIG_DISPLAY_FULL_HEADERS);
-	char bgcolor[7], fontcolor[7];
-	GtkStyle *style = NULL;
-	gboolean evo_icon = FALSE;
-	GConfClient *gconf;
-	int xmask, i;
-	
-	gconf = gconf_client_get_default ();
-	xmask = gconf_client_get_int (gconf, "/apps/evolution/mail/display/xmailer_mask", NULL);
-	
-	/* My favorite thing to do... muck around with colors so we respect people's stupid themes.
-	   However, we only do this if we are rendering to the screen -- we ignore the theme
-	   when we are printing. */
-	style = gtk_widget_get_style (GTK_WIDGET (md->html));
-	if (style && !md->printing) {
-		int state = GTK_WIDGET_STATE (GTK_WIDGET (md->html));
-		gushort r, g, b;
-		
-		r = style->base[state].red / 256;
-		g = style->base[state].green / 256;
-		b = style->base[state].blue / 256;
-		
-		if (COLOR_IS_LIGHT (r, g, b)) {
-			r *= 0.92;
-			g *= 0.92;
-			b *= 0.92;
-		} else {
-			r = 255 - (0.92 * (255 - r));
-			g = 255 - (0.92 * (255 - g));
-			b = 255 - (0.92 * (255 - b));
-		}
-		
-		sprintf (bgcolor, "%.2X%.2X%.2X", r, g, b);
-		
-		r = style->text[state].red / 256;
-		g = style->text[state].green / 256;
-		b = style->text[state].blue / 256;
-		
-		sprintf (fontcolor, "%.2X%.2X%.2X", r, g, b);
-	} else {
-		strcpy (bgcolor, "EEEEEE");
-		strcpy (fontcolor, "000000");
-	}
-	
-	camel_stream_write_string ((CamelStream *) stream,
-				   "");
-	
-	/* Top margin */
-	camel_stream_write_string ((CamelStream *) stream, "");
-	
-	/* Left margin */
-	camel_stream_write_string ((CamelStream *) stream, "");
-	
-	/* Black border */
-	camel_stream_write_string ((CamelStream *) stream, ""
-				   /* Right margin */
-				   ""
-				   "
    "
-				   "
    "
-				   "
    		");
-	
-	/* Main header box */
-	camel_stream_printf ((CamelStream *) stream, "
    "
-			     /* Internal header table */
-			     "");
-	
-	if (!md->printing && evo_icon) {
-		camel_stream_printf ((CamelStream *) stream, "",
-				     mail_display_get_url_for_icon (md, EVOLUTION_ICONSDIR "/monkey-16.png"));
-	}
-	
-	camel_stream_write_string ((CamelStream *) stream,
-				   /* Main header box */
-				   "
    \n",
-			     bgcolor, fontcolor);
-	
-	if (full) {
-		struct _header_raw *header;
-		const char *charset;
-		CamelContentType *ct;
-		char *value;
-		
-		ct = camel_mime_part_get_content_type (CAMEL_MIME_PART (message));
-		charset = header_content_type_param (ct, "charset");
-		charset = e_iconv_charset_name (charset);
-		
-		header = CAMEL_MIME_PART (message)->headers;
-		while (header) {
-			i = default_header_index (header->name);
-			if (i == -1) {
-				value = header_decode_string (header->value, charset);
-				write_text_header (stream, header->name, value, WRITE_NOCOLUMNS);
-				g_free (value);
-			} else
-				write_default_header (message, md, stream, i, WRITE_NOCOLUMNS);
-			header = header->next;
-		}
-	} else {
-		for (i = 0; i < sizeof (default_headers) / sizeof (default_headers[0]); i++)
-			write_default_header (message, md, stream, i, 0);
-		if (xmask != MAIL_CONFIG_XMAILER_NONE)
-			evo_icon = write_xmailer_header (message, md, stream, xmask);
-	}
-	
-	/* Close off the internal header table */
-	camel_stream_write_string ((CamelStream *) stream, "
    "
-				     "
    "
-				   /* Black border */
-				   "
    		"
-				   "
    \n");
-}
-
-static void
-load_offline_content (MailDisplay *md, gpointer data)
-{
-	CamelDataWrapper *wrapper = data;
-	CamelStream *stream;
-	
-	stream = camel_stream_null_new ();
-	camel_data_wrapper_write_to_stream (wrapper, stream);
-	camel_object_unref (stream);
-	camel_object_unref (wrapper);
-}
-
-gboolean
-mail_content_loaded (CamelDataWrapper *wrapper, MailDisplay *md, gboolean redisplay, const char *url,
-		     GtkHTML *html, GtkHTMLStream *stream)
-{
-	if (!camel_data_wrapper_is_offline (wrapper))
-		return TRUE;
-	
-	camel_object_ref (wrapper);
-	if (redisplay) {
-		mail_display_redisplay_when_loaded (md, wrapper, load_offline_content,
-						    html, wrapper);
-	} else {
-		mail_display_stream_write_when_loaded (md, wrapper, url, load_offline_content,
-						       html, stream, wrapper);
-	}
-	
-	return FALSE;
-}
-
-
-static ssize_t
-mail_format_data_wrapper_write_to_stream (CamelDataWrapper *wrapper, MailDisplay *mail_display, CamelStream *stream)
-{
-	CamelStreamFilter *filtered_stream;
-	ssize_t written;
-	
-	filtered_stream = camel_stream_filter_new_with_stream (stream);
-	
-	if (wrapper->rawtext || (mail_display && mail_display->charset)) {
-		CamelMimeFilterCharset *filter;
-		GConfClient *gconf;
-		char *charset;
-		
-		gconf = gconf_client_get_default ();
-		
-		if (!wrapper->rawtext) {
-			/* data wrapper had been successfully converted to UTF-8 using the mime
-			   part's charset, but the user thinks he knows best so we'll let him
-			   shoot himself in the foot here... */
-			CamelContentType *content_type;
-			
-			/* get the original charset of the mime part */
-			content_type = camel_data_wrapper_get_mime_type_field (wrapper);
-			charset = (char *) (content_type ? header_content_type_param (content_type, "charset") : NULL);
-			if (!charset)
-				charset = gconf_client_get_string (gconf, "/apps/evolution/mail/format/charset", NULL);
-			else
-				charset = g_strdup (charset);
-			
-			/* since the content is already in UTF-8, we need to decode into the
-			   original charset before we can convert back to UTF-8 using the charset
-			   the user is overriding with... */
-			if ((filter = camel_mime_filter_charset_new_convert ("utf-8", charset))) {
-				camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (filter));
-				camel_object_unref (filter);
-			}
-			
-			g_free (charset);
-		}
-		
-		/* find out the charset the user wants to override to */
-		if (mail_display && mail_display->charset)
-			charset = mail_display->charset;
-		else
-			charset = gconf_client_get_string (gconf, "/apps/evolution/mail/format/charset", NULL);
-		
-		if ((filter = camel_mime_filter_charset_new_convert (charset, "utf-8"))) {
-			camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (filter));
-			camel_object_unref (filter);
-		}
-		
-		g_free (charset);
-	}
-	
-	written = camel_data_wrapper_write_to_stream (wrapper, CAMEL_STREAM (filtered_stream));
-	camel_stream_flush (CAMEL_STREAM (filtered_stream));
-	camel_object_unref (filtered_stream);
-	
-	return written;
-}
-
-/* Return the contents of a data wrapper, or %NULL if it contains only
- * whitespace.
- */
-GByteArray *
-mail_format_get_data_wrapper_text (CamelDataWrapper *wrapper, MailDisplay *mail_display)
-{
-	CamelStream *memstream;
-	GByteArray *ba;
-	char *text, *end;
-	
-	memstream = camel_stream_mem_new ();
-	ba = g_byte_array_new ();
-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (memstream), ba);
-	
-	mail_format_data_wrapper_write_to_stream (wrapper, mail_display, memstream);
-	camel_object_unref (memstream);
-	
-	for (text = ba->data, end = text + ba->len; text < end; text++) {
-		if (!isspace ((unsigned char) *text))
-			break;
-	}
-	
-	if (text >= end) {
-		g_byte_array_free (ba, TRUE);
-		return NULL;
-	}
-	
-	return ba;
-}
-
-static void
-write_hr (MailDisplayStream *stream)
-{
-	camel_stream_write_string ((CamelStream *) stream, STANDARD_ISSUE_TABLE_OPEN
-				   "
    "
-				   "\n");
-}
-
-/*----------------------------------------------------------------------*
- *                     Mime handling functions
- *----------------------------------------------------------------------*/
-
-static gboolean
-handle_text_plain (CamelMimePart *part, const char *mime_type,
-		   MailDisplay *md, MailDisplayStream *stream)
-{
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilter *html_filter;
-	CamelDataWrapper *wrapper;
-	CamelContentType *type;
-	const char *format;
-	GConfClient *gconf;
-	guint32 flags, rgb = 0;
-	GdkColor colour;
-	char *buf;
-	
-	gconf = gconf_client_get_default ();
-	
-	flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES;
-	if (!md->printing) {
-		flags |= CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES;
-		if (gconf_client_get_bool (gconf, "/apps/evolution/mail/display/mark_citations", NULL)) {
-			flags |= CAMEL_MIME_FILTER_TOHTML_MARK_CITATION;
-			
-			buf = gconf_client_get_string (gconf, "/apps/evolution/mail/display/citation_colour", NULL);
-			gdk_color_parse (buf ? buf : "#737373", &colour);
-			g_free (buf);
-			
-			rgb = ((colour.red & 0xff00) << 8) | (colour.green & 0xff00) | ((colour.blue & 0xff00) >> 8);
-		}
-	}
-	
-	/* Check for RFC 2646 flowed text. */
-	type = camel_mime_part_get_content_type (part);
-	format = header_content_type_param (type, "format");
-	if (format && !strcasecmp (format, "flowed"))
-		flags |= CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED;
-	
-	html_filter = camel_mime_filter_tohtml_new (flags, rgb);
-	filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) stream);
-	camel_stream_filter_add (filtered_stream, html_filter);
-	camel_object_unref (html_filter);
-	
-	camel_stream_write_string ((CamelStream *) stream, STANDARD_ISSUE_TABLE_OPEN "\n");
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	mail_format_data_wrapper_write_to_stream (wrapper, md, (CamelStream *) filtered_stream);
-	
-	camel_stream_write_string ((CamelStream *) stream, "\n");
-	
-	camel_object_unref (filtered_stream);
-	
-	return TRUE;
-}
-
-static CamelMimePart *
-fake_mime_part_from_data (const char *data, int len, const char *type,
-			  guint offset, MailDisplay *md)
-{
-	GHashTable *fake_parts = g_datalist_get_data (md->data, "fake_parts");
-	CamelStream *memstream;
-	CamelDataWrapper *wrapper;
-	CamelMimePart *part;
-	
-	part = g_hash_table_lookup (fake_parts, GUINT_TO_POINTER (offset));
-	if (part)
-		return part;
-	
-	memstream = camel_stream_mem_new_with_buffer (data, len);
-	wrapper = camel_data_wrapper_new ();
-	camel_data_wrapper_construct_from_stream (wrapper, memstream);
-	camel_data_wrapper_set_mime_type (wrapper, type);
-	camel_object_unref (memstream);
-	part = camel_mime_part_new ();
-	camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);
-	camel_object_unref (wrapper);
-	camel_mime_part_set_disposition (part, "inline");
-	
-	g_hash_table_insert (fake_parts, GUINT_TO_POINTER (offset), part);
-	return part;
-}
-
-static void
-destroy_part (CamelObject *root, gpointer event_data, gpointer user_data)
-{
-	camel_object_unref (user_data);
-}
-
-/* text/enriched (RFC 1896) or text/richtext (included in RFC 1341) */
-static gboolean
-handle_text_enriched (CamelMimePart *part, const char *mime_type,
-		      MailDisplay *md, MailDisplayStream *stream)
-{
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilter *enriched;
-	CamelDataWrapper *wrapper;
-	guint32 flags = 0;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	
-	if (!strcasecmp (mime_type, "text/richtext")) {
-		flags = CAMEL_MIME_FILTER_ENRICHED_IS_RICHTEXT;
-		camel_stream_write_string ((CamelStream *) stream, "\n\n");
-	} else {
-		camel_stream_write_string ((CamelStream *) stream, "\n\n");
-	}
-	
-	enriched = camel_mime_filter_enriched_new (flags);
-	filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) stream);
-	camel_stream_filter_add (filtered_stream, enriched);
-	camel_object_unref (enriched);
-	
-	camel_stream_write ((CamelStream *) stream, "\n", 5);
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	mail_format_data_wrapper_write_to_stream (wrapper, md, (CamelStream *) filtered_stream);
-	
-	camel_stream_write ((CamelStream *) stream, "\n", 6);
-	camel_object_unref (filtered_stream);
-	
-	return TRUE;
-}
-
-static gboolean
-handle_text_html (CamelMimePart *part, const char *mime_type,
-		  MailDisplay *md, MailDisplayStream *stream)
-{
-	const char *location, *base;
-	
-	camel_stream_write_string ((CamelStream *) stream, "\n\n");
-	
-	if ((base = camel_medium_get_header (CAMEL_MEDIUM (part), "Content-Base"))) {
-		char *base_url;
-		size_t len;
-		
-		len = strlen (base);
-		
-		if (*base == '"' && *(base + len - 1) == '"') {
-			len -= 2;
-			base_url = g_alloca (len + 1);
-			memcpy (base_url, base + 1, len);
-			base_url[len] = '\0';
-			base = base_url;
-		}
-		
-		gtk_html_set_base (md->html, base);
-	}
-	
-	location = get_location (part, md);
-	if (!location)
-		location = get_cid (part, md);
-	
-	camel_stream_printf ((CamelStream *) stream, "", location, location);
-	
-	return TRUE;
-}
-
-static gboolean
-handle_image (CamelMimePart *part, const char *mime_type, MailDisplay *md, MailDisplayStream *stream)
-{
-	camel_stream_printf ((CamelStream *) stream, "",
-			     get_cid (part, md));
-	return TRUE;
-}
-
-static gboolean
-handle_multipart_mixed (CamelMimePart *part, const char *mime_type,
-			MailDisplay *md, MailDisplayStream *stream)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	CamelMultipart *mp;
-	int i, nparts;
-	gboolean output = FALSE;
-	
-	if (!CAMEL_IS_MULTIPART (wrapper)) {
-		mail_error_printf (stream, "\n%s\n", _("Could not parse MIME message. Displaying as source."));
-		if (mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
-			handle_text_plain (part, "text/plain", md, stream);
-		return TRUE;
-	}
-	
-	mp = CAMEL_MULTIPART (wrapper);
-	
-	nparts = camel_multipart_get_number (mp);	
-	for (i = 0; i < nparts; i++) {
-		if (i != 0 && output)
-			write_hr (stream);
-		
-		part = camel_multipart_get_part (mp, i);
-		
-		output = format_mime_part (part, md, stream);
-	}
-	
-	return TRUE;
-}
-
-static gboolean
-handle_multipart_encrypted (CamelMimePart *part, const char *mime_type,
-			    MailDisplay *md, MailDisplayStream *stream)
-{
-	CamelMultipartEncrypted *mpe;
-	CamelMimePart *mime_part;
-	CamelCipherContext *cipher;
-	CamelDataWrapper *wrapper;
-	CamelException ex;
-	gboolean handled;
-	
-	/* Currently we only handle RFC2015-style PGP encryption. */
-	if (!camel_pgp_mime_is_rfc2015_encrypted (part))
-		return handle_multipart_mixed (part, mime_type, md, stream);
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	
-	mpe = CAMEL_MULTIPART_ENCRYPTED (wrapper);
-	
-	camel_exception_init (&ex);
-	cipher = camel_gpg_context_new (session);
-	mime_part = camel_multipart_encrypted_decrypt (mpe, cipher, &ex);
-	camel_object_unref (cipher);
-	
-	if (camel_exception_is_set (&ex)) {
-		mail_error_printf (stream, "\n%s\n", camel_exception_get_description (&ex));
-		camel_exception_clear (&ex);
-		return TRUE;
-	}
-	
-	handled = format_mime_part (mime_part, md, stream);
-	camel_object_unref (mime_part);
-	
-	return handled;
-}
-
-static gboolean
-handle_multipart_signed (CamelMimePart *part, const char *mime_type,
-			 MailDisplay *md, MailDisplayStream *stream)
-{
-	CamelMimePart *subpart;
-	CamelDataWrapper *wrapper;
-	CamelMultipartSigned *mps;
-	gboolean output = FALSE;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	
-	if (!CAMEL_IS_MULTIPART_SIGNED (wrapper)) {
-		mail_error_printf (stream, "\n%s\n", _("Could not parse MIME message. Displaying as source."));
-		if (mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
-			handle_text_plain (part, "text/plain", md, stream);
-		return TRUE;
-	}
-	
-	mps = CAMEL_MULTIPART_SIGNED (wrapper);
-	
-	/* if subpart & signature is null, what do we do?  just write it out raw?
-	   multipart_signed will, if it cannot parse properly, put everything in the first part
-	   this includes: more or less than 2 parts */
-	
-	/* output the content */
-	subpart = camel_multipart_get_part ((CamelMultipart *) mps, CAMEL_MULTIPART_SIGNED_CONTENT);
-	if (subpart == NULL)
-		return FALSE;
-	
-	output = format_mime_part (subpart, md, stream);
-	
-	/* now handle the signature */
-	subpart = camel_multipart_get_part ((CamelMultipart *) mps, CAMEL_MULTIPART_SIGNED_SIGNATURE);
-	if (subpart == NULL)
-		return FALSE;
-	
-	mail_part_set_default_displayed_inline (subpart, md, FALSE);
-	
-	if (!mail_part_is_displayed_inline (subpart, md) && !md->printing) {
-		char *url;
-		
-		/* Write out the click-for-info object */
-		url = g_strdup_printf ("signature:%p/%lu", subpart,
-				       (unsigned long)time (NULL));
-		camel_stream_printf ((CamelStream *) stream,
-				     "
    "
-				     ""
-				     ""
-				     ""
-				     "
    "
-				     "
    		"
-				     "
    		", url);
-		mail_display_add_url (md, "part_urls", url, subpart);
-		
-		camel_stream_write_string ((CamelStream *) stream,
-					   _("This message is digitally signed. "
-					     "Click the lock icon for more information."));
-		
-		camel_stream_write_string ((CamelStream *) stream, "
    "
-					   ""
-					   ""
-					   "
    \n");
-	} else {
-		CamelCipherValidity *valid = NULL;
-		CamelException ex;
-		const char *message = NULL;
-		gboolean good = FALSE;
-		CamelCipherContext *cipher;
-		
-		/* Write out the verification results */
-		/* TODO: use the right context for the right message ... */
-		camel_exception_init (&ex);
-		cipher = camel_gpg_context_new (session);
-		if (cipher) {
-			valid = camel_multipart_signed_verify (mps, cipher, &ex);
-			camel_object_unref (cipher);
-			if (valid) {
-				good = camel_cipher_validity_get_valid (valid);
-				message = camel_cipher_validity_get_description (valid);
-			} else {
-				message = camel_exception_get_description (&ex);
-			}
-		} else {
-			message = _("Could not create a PGP verfication context");
-		}
-		
-		if (good) {
-			camel_stream_printf ((CamelStream *) stream, "
    "
-					     "%s

    ",
-					     mail_display_get_url_for_icon (md, EVOLUTION_ICONSDIR
-									    "/pgp-signature-ok.png"),
-					     _("This message is digitally signed and "
-					       "has been found to be authentic."));
-		} else {
-			camel_stream_printf ((CamelStream *) stream, "
    "
-					     "%s

    ",
-					     mail_display_get_url_for_icon (md, EVOLUTION_ICONSDIR
-									    "/pgp-signature-bad.png"),
-					     _("This message is digitally signed but can "
-					       "not be proven to be authentic."));
-		}
-		
-		if (message) {
-			camel_stream_printf ((CamelStream *) stream, "", good ||
-					     md->printing ? "" : " color=red");
-			mail_text_write (stream, md, part, 0, md->printing, message);
-			camel_stream_write_string ((CamelStream *) stream, "");
-		}
-		
-		camel_stream_write_string ((CamelStream *) stream, "
    ");
-		camel_exception_clear (&ex);
-		camel_cipher_validity_free (valid);
-	}
-	
-	return TRUE;
-}
-
-/* As seen in RFC 2387! */
-static gboolean
-handle_multipart_related (CamelMimePart *part, const char *mime_type,
-			  MailDisplay *md, MailDisplayStream *stream)
-{
-	CamelDataWrapper *wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	CamelMultipart *mp;
-	CamelMimePart *body_part, *display_part = NULL;
-	CamelContentType *content_type;
-	const char *location, *start;
-	int i, nparts;
-	GHashTable *related_save;
-	int ret;
-	
-	if (!CAMEL_IS_MULTIPART (wrapper)) {
-		mail_error_printf (stream, "\n%s\n", _("Could not parse MIME message. Displaying as source."));
-		if (mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
-			handle_text_plain (part, "text/plain", md, stream);
-		return TRUE;
-	}
-	
-	mp = CAMEL_MULTIPART (wrapper);
-	nparts = camel_multipart_get_number (mp);	
-	
-	content_type = camel_mime_part_get_content_type (part);
-	start = header_content_type_param (content_type, "start");
-	if (start) {
-		int len;
-		
-		/* The "start" parameter includes <>s, which Content-Id
-		 * does not.
-		 */
-		len = strlen (start) - 2;
-		
-		for (i = 0; i < nparts; i++) {
-			const char *cid;
-			
-			body_part = camel_multipart_get_part (mp, i);
-			cid = camel_mime_part_get_content_id (body_part);
-			
-			if (cid && !strncmp (cid, start + 1, len) && strlen (cid) == len) {
-				display_part = body_part;
-				break;
-			}
-		}
-	} else {
-		/* No start parameter, so it defaults to the first part. */
-		display_part = camel_multipart_get_part (mp, 0);
-	}
-	
-	if (!display_part) {
-		/* Oops. Hrmph. */
-		return handle_multipart_mixed (part, mime_type, md, stream);
-	}
-	
-	/* setup a 'stack' of related parts */
-	related_save = md->related;
-	md->related = g_hash_table_new(NULL, NULL);
-	
-	location = camel_mime_part_get_content_location (part);
-	if (location)
-		mail_display_push_content_location (md, location);
-	
-	/* Record the Content-ID/Content-Location of any non-displayed parts. */
-	for (i = 0; i < nparts; i++) {
-		body_part = camel_multipart_get_part (mp, i);
-		if (body_part == display_part)
-			continue;
-		
-		get_cid (body_part, md);
-		get_location (body_part, md);
-		g_hash_table_insert (md->related, body_part, body_part);
-	}
-	
-	/* Now, display the displayed part. */
-	ret = format_mime_part (display_part, md, stream);
-	
-	/* FIXME: flush html stream via gtkhtml_stream_flush which doens't exist yet ... */
-	while (gtk_events_pending ())
-		gtk_main_iteration ();
-	
-	/* Now check for related parts which didn't display, display them as attachments */
-	for (i = 0; i < nparts; i++) {
-		body_part = camel_multipart_get_part (mp, i);
-		if (body_part == display_part)
-			continue;
-		
-		if (g_hash_table_lookup (md->related, body_part)) {
-			if (ret)
-				write_hr (stream);
-			ret |= format_mime_part (body_part, md, stream);
-		}
-	}
-	
-	g_hash_table_destroy (md->related);
-	md->related = related_save;
-	
-	if (location)
-		mail_display_pop_content_location (md);
-	
-	return ret;
-}
-
-/* RFC 2046 says "display the last part that you are able to display". */
-static CamelMimePart *
-find_preferred_alternative (CamelMultipart *multipart, gboolean want_plain)
-{
-	int i, nparts;
-	CamelMimePart *preferred_part = NULL;
-	MailMimeHandler *handler;
-	
-	nparts = camel_multipart_get_number (multipart);
-	for (i = 0; i < nparts; i++) {
-		CamelMimePart *part = camel_multipart_get_part (multipart, i);
-		CamelContentType *type = camel_mime_part_get_content_type (part);
-		char *mime_type = header_content_type_simple (type);
-		
-		g_strdown (mime_type);
-		if (want_plain && !strcmp (mime_type, "text/plain"))
-			return part;
-		handler = mail_lookup_handler (mime_type);
-		if (handler && (!preferred_part || !handler->generic))
-			preferred_part = part;
-		g_free (mime_type);
-	}
-	
-	return preferred_part;
-}
-
-static gboolean
-handle_multipart_alternative (CamelMimePart *part, const char *mime_type,
-			      MailDisplay *md, MailDisplayStream *stream)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	CamelMultipart *multipart;
-	CamelMimePart *mime_part;
-	
-	if (!CAMEL_IS_MULTIPART (wrapper)) {
-		mail_error_printf (stream, "\n%s\n", _("Could not parse MIME message. Displaying as source."));
-		if (mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
-			handle_text_plain (part, "text/plain", md, stream);
-		return TRUE;
-	}
-	
-	multipart = CAMEL_MULTIPART (wrapper);
-	
-	mime_part = find_preferred_alternative (multipart, FALSE);
-	if (mime_part)
-		return format_mime_part (mime_part, md, stream);
-	else
-		return handle_multipart_mixed (part, mime_type, md, stream);
-}
-
-/* RFC 1740 */
-static gboolean
-handle_multipart_appledouble (CamelMimePart *part, const char *mime_type,
-			      MailDisplay *md, MailDisplayStream *stream)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	CamelMultipart *multipart;
-	
-	if (!CAMEL_IS_MULTIPART (wrapper)) {
-		mail_error_printf (stream, "\n%s\n", _("Could not parse MIME message. Displaying as source."));
-		if (mail_content_loaded (wrapper, md, TRUE, NULL, md->html, NULL))
-			handle_text_plain (part, "text/plain", md, stream);
-		return TRUE;
-	}
-	
-	multipart = CAMEL_MULTIPART (wrapper);
-	
-	/* The first part is application/applefile and is not useful
-	 * to us. The second part _may_ be displayable data. Most
-	 * likely it's application/octet-stream though.
-	 */
-	part = camel_multipart_get_part (multipart, 1);
-	return format_mime_part (part, md, stream);
-}
-
-static gboolean
-handle_message_rfc822 (CamelMimePart *part, const char *mime_type,
-		       MailDisplay *md, MailDisplayStream *stream)
-{
-	CamelDataWrapper *wrapper =
-		camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (wrapper), FALSE);
-	
-	camel_stream_write_string ((CamelStream *) stream, "
    ");
-	mail_format_mime_message (CAMEL_MIME_MESSAGE (wrapper), md, stream);
-	camel_stream_write_string ((CamelStream *) stream, "
    ");
-	
-	return TRUE;
-}
-
-static gboolean
-handle_message_external_body (CamelMimePart *part, const char *mime_type,
-			      MailDisplay *md, MailDisplayStream *stream)
-{
-	CamelContentType *type;
-	const char *access_type;
-	char *url = NULL, *desc = NULL;
-	
-	type = camel_mime_part_get_content_type (part);
-	access_type = header_content_type_param (type, "access-type");
-	if (!access_type)
-		goto fallback;
-	
-	if (!strcasecmp (access_type, "ftp") ||
-	    !strcasecmp (access_type, "anon-ftp")) {
-		const char *name, *site, *dir, *mode, *ftype;
-		char *path;
-		
-		name = header_content_type_param (type, "name");
-		site = header_content_type_param (type, "site");
-		if (name == NULL || site == NULL)
-			goto fallback;
-		dir = header_content_type_param (type, "directory");
-		mode = header_content_type_param (type, "mode");
-		
-		/* Generate the path. */
-		if (dir) {
-			const char *p = dir + strlen (dir);
-			
-			path = g_strdup_printf ("%s%s%s%s",
-						*dir == '/' ? "" : "/",
-						dir,
-						*p == '/' ? "" : "/",
-						name);
-		} else {
-			path = g_strdup_printf ("%s%s",
-						*name == '/' ? "" : "/",
-						name);
-		}
-		
-		if (mode && *mode == 'A')
-			ftype = ";type=A";
-		else if (mode && *mode == 'I')
-			ftype = ";type=I";
-		else
-			ftype = "";
-		
-		url = g_strdup_printf ("ftp://%s%s%s", site, path, ftype);
-		g_free (path);
-		desc = g_strdup_printf (_("Pointer to FTP site (%s)"), url);
-	} else if (!g_ascii_strcasecmp (access_type, "local-file")) {
-		const char *name, *site;
-		
-		name = header_content_type_param (type, "name");
-		if (name == NULL)
-			goto fallback;
-		site = header_content_type_param (type, "site");
-		
-		url = g_strdup_printf ("file://%s%s", *name == '/' ? "" : "/", name);
-		if (site) {
-			desc = g_strdup_printf(_("Pointer to local file (%s) "
-						 "valid at site \"%s\""), name, site);
-		} else {
-			desc = g_strdup_printf(_("Pointer to local file (%s)"), name);
-		}
-	} else if (!strcasecmp (access_type, "URL")) {
-		const char *urlparam;
-		char *s, *d;
-		
-		/* RFC 2017 */
-		
-		urlparam = header_content_type_param (type, "url");
-		if (urlparam == NULL)
-			goto fallback;
-		
-		/* For obscure MIMEy reasons, the URL may be split into
-		 * multiple words, and needs to be rejoined. (The URL
-		 * must have any real whitespace %-encoded, so we just
-		 * get rid of all of it.
-		 */
-		url = g_strdup (urlparam);
-		s = d = url;
-		
-		while (*s) {
-			if (!isspace ((unsigned char)*s))
-				*d++ = *s;
-			s++;
-		}
-		*d = *s;
-		
-		desc = g_strdup_printf (_("Pointer to remote data (%s)"), url);
-	}
-	
- fallback:
-	if (!desc) {
-		if (access_type)
-			desc = g_strdup_printf (_("Pointer to unknown external data (\"%s\" type)"), access_type);
-		else
-			desc = g_strdup (_("Malformed external-body part."));
-	}
-	
-#if 0 /* FIXME */
-	handle_mystery (part, md, url, "gnome-globe.png", desc,
-			url ? "open it in a browser" : NULL);
-#endif
-	
-	g_free (desc);
-	g_free (url);
-	
-	return TRUE;
-}
-
-static gboolean
-handle_via_bonobo (CamelMimePart *part, const char *mime_type,
-		   MailDisplay *md, MailDisplayStream *stream)
-{
-	if (!md->printing) {
-		camel_stream_printf ((CamelStream *) stream,
-				     "",
-				     get_cid (part, md), mime_type);
-	}
-	
-	return TRUE;
-}
-
-/**
- * mail_get_message_rfc822:
- * @message: the message
- * @want_plain: whether the caller prefers plain to html
- * @cite: whether or not to cite the message text
- *
- * See mail_get_message_body() below for more details.
- *
- * Return value: an HTML string representing the text parts of @message.
- **/
-static char *
-mail_get_message_rfc822 (CamelMimeMessage *message, gboolean want_plain, gboolean cite)
-{
-	CamelDataWrapper *contents;
-	GString *retval;
-	const CamelInternetAddress *cia;
-	char *text, *citation, *buf, *html;
-	time_t date_val;
-	int offset;
-	
-	contents = camel_medium_get_content_object (CAMEL_MEDIUM (message));
-	text = mail_get_message_body (contents, want_plain, cite);
-	if (!text)
-		text = g_strdup ("");
-	citation = cite ? "> " : "";
-	retval = g_string_new (NULL);
-	
-	/* Kludge: if text starts with "
    ", wrap it around the
-	 * headers too so we won't get a blank line between them for the
-	 * 
     to 
     switch.
-	 */
-	if (!strncasecmp (text, "
    ", 5))
-		g_string_append_printf (retval, "
    ");
-	
-	/* create credits */
-	cia = camel_mime_message_get_from (message);
-	buf = camel_address_format (CAMEL_ADDRESS (cia));
-	if (buf) {
-		html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
-		g_string_append_printf (retval, "%sFrom: %s
    ",
-					citation, html);
-		g_free (html);
-		g_free (buf);
-	}
-	
-	cia = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
-	buf = camel_address_format (CAMEL_ADDRESS (cia));
-	if (buf) {
-		html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
-		g_string_append_printf (retval, "%sTo: %s
    ",
-					citation, html);
-		g_free (html);
-		g_free (buf);
-	}
-	
-	cia = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);
-	buf = camel_address_format (CAMEL_ADDRESS (cia));
-	if (buf) {
-		html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
-		g_string_append_printf (retval, "%sCc: %s
    ",
-					citation, html);
-		g_free (html);
-		g_free (buf);
-	}
-	
-	buf = (char *) camel_mime_message_get_subject (message);
-	if (buf) {
-		html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL |
-					   CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS, 0);
-		g_string_append_printf (retval, "%sSubject: %s
    ",
-					citation, html);
-		g_free (html);
-	}
-	
-	date_val = camel_mime_message_get_date (message, &offset);
-	buf = header_format_date (date_val, offset);
-	html = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_CONVERT_NL, 0);
-	g_string_append_printf (retval, "%sDate: %s
    ", citation, html);
-	g_free (html);
-	g_free (buf);
-	
-	if (!strncasecmp (text, "
    ", 5))
-		g_string_append_printf (retval, "%s
    %s", citation, text + 5);
-	else
-		g_string_append_printf (retval, "%s
    %s", citation, text);
-	g_free (text);
-	
-	buf = retval->str;
-	g_string_free (retval, FALSE);
-	
-	return buf;
-}
-
-/**
- * mail_get_message_body:
- * @data: the message or mime part content
- * @want_plain: whether the caller prefers plain to html
- * @cite: whether or not to cite the message text
- *
- * This creates an HTML string representing @data. If @want_plain is %TRUE,
- * it will be an HTML string that looks like a text/plain representation
- * of @data (but it will still be HTML).
- *
- * If @cite is %TRUE, the message will be cited as a reply, using "> "s.
- *
- * Return value: the HTML string, which the caller must free, or
- * %NULL if @data doesn't include any data which should be forwarded or
- * replied to.
- **/
-char *
-mail_get_message_body (CamelDataWrapper *data, gboolean want_plain, gboolean cite)
-{
-	char *subtext, *old, *div, *text = NULL;
-	CamelContentType *mime_type;
-	CamelCipherContext *cipher;
-	GByteArray *bytes = NULL;
-	CamelMimePart *subpart;
-	CamelMultipart *mp;
-	int i, nparts;
-	
-	mime_type = camel_data_wrapper_get_mime_type_field (data);
-	
-	/* If it is message/rfc822 or message/news, extract the
-	 * important headers and recursively process the body.
-	 */
-	if (header_content_type_is (mime_type, "message", "rfc822") ||
-	    header_content_type_is (mime_type, "message", "news"))
-		return mail_get_message_rfc822 (CAMEL_MIME_MESSAGE (data), want_plain, cite);
-	
-	/* If it's a vcard or icalendar, ignore it. */
-	if (header_content_type_is (mime_type, "text", "x-vcard") ||
-	    header_content_type_is (mime_type, "text", "calendar"))
-		return NULL;
-	
-	/* Get the body data for other text/ or message/ types */
-	if (header_content_type_is (mime_type, "text", "*") ||
-	    header_content_type_is (mime_type, "message", "*")) {
-		bytes = mail_format_get_data_wrapper_text (data, NULL);
-		
-		if (bytes) {
-			g_byte_array_append (bytes, "", 1);
-			text = bytes->data;
-			g_byte_array_free (bytes, FALSE);
-		}
-		
-		if (text && !header_content_type_is (mime_type, "text", "html")) {
-			char *html;
-			
-			html = camel_text_to_html (text, CAMEL_MIME_FILTER_TOHTML_PRE |
-						   CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |
-						   (cite ? CAMEL_MIME_FILTER_TOHTML_CITE : 0), 0);
-			g_free (text);
-			text = html;
-		}
-		return text;
-	}
-	
-	/* If it's not message and it's not text, and it's not
-	 * multipart, we don't want to deal with it.
-	 */
-	if (!header_content_type_is (mime_type, "multipart", "*"))
-		return NULL;
-	
-	mp = CAMEL_MULTIPART (data);
-	
-	if (CAMEL_IS_MULTIPART_ENCRYPTED (mp)) {
-		cipher = camel_gpg_context_new (session);
-		subpart = camel_multipart_encrypted_decrypt (CAMEL_MULTIPART_ENCRYPTED (mp),
-							     cipher, NULL);
-		if (!subpart)
-			return NULL;
-		
-		data = camel_medium_get_content_object (CAMEL_MEDIUM (subpart));
-		return mail_get_message_body (data, want_plain, cite);
-	} else if (header_content_type_is (mime_type, "multipart", "alternative")) {
-		/* Pick our favorite alternative and reply to it. */
-		
-		subpart = find_preferred_alternative (mp, want_plain);
-		if (!subpart)
-			return NULL;
-		
-		data = camel_medium_get_content_object (CAMEL_MEDIUM (subpart));
-		return mail_get_message_body (data, want_plain, cite);
-	}
-	
-	/* Otherwise, concatenate all the parts that we can. */
-	if (want_plain) {
-		if (cite)
-			div = "
    \n> ----
    \n> 
    \n";
-		else
-			div = "
    \n----
    \n
    \n";
-	} else
-		div = "

    ";
-	
-	nparts = camel_multipart_get_number (mp);
-	for (i = 0; i < nparts; i++) {
-		subpart = camel_multipart_get_part (mp, i);
-		
-		/* only add to the body contents if it is marked as "inline" */
-		if (!mail_part_is_inline (subpart))
-			continue;
-		
-		data = camel_medium_get_content_object (CAMEL_MEDIUM (subpart));
-		subtext = mail_get_message_body (data, want_plain, cite);
-		if (!subtext)
-			continue;
-		
-		if (text) {
-			old = text;
-			text = g_strdup_printf ("%s%s%s", old, div, subtext);
-			g_free (subtext);
-			g_free (old);
-		} else
-			text = subtext;
-	}
-	
-	return text;
-}
diff --git a/mail/mail-format.h b/mail/mail-format.h
deleted file mode 100644
index a7f7ad423c..0000000000
--- a/mail/mail-format.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast 
- *
- *  Copyright 2003 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifndef __MAIL_FORMAT_H__
-#define __MAIL_FORMAT_H__
-
-#include 
-#include 
-
-#include "mail-display.h"
-#include "mail-display-stream.h"
-
-GByteArray *mail_format_get_data_wrapper_text (CamelDataWrapper *data,
-					       MailDisplay *mail_display);
-
-void mail_format_mime_message (CamelMimeMessage *mime_message,
-			       MailDisplay *md, MailDisplayStream *stream);
-void mail_format_raw_message (CamelMimeMessage *mime_message,
-			      MailDisplay *md, MailDisplayStream *stream);
-
-gboolean mail_content_loaded (CamelDataWrapper *wrapper,
-			      MailDisplay *display,
-			      gboolean redisplay,
-			      const char *url,
-			      GtkHTML *html,
-			      GtkHTMLStream *handle);
-
-typedef gboolean (*MailMimeHandlerFn) (CamelMimePart *part, const char *mime_type,
-				       MailDisplay *md, MailDisplayStream *stream);
-typedef struct {
-	gboolean generic;
-	Bonobo_ServerInfo *component;
-	GList *applications;
-	MailMimeHandlerFn builtin;
-} MailMimeHandler;
-
-MailMimeHandler *mail_lookup_handler (const char *mime_type);
-
-gboolean mail_part_is_inline (CamelMimePart *part);
-gboolean mail_part_is_displayed_inline (CamelMimePart *part, MailDisplay *md);
-void     mail_part_toggle_displayed (CamelMimePart *part, MailDisplay *md);
-
-char *mail_get_message_body (CamelDataWrapper *data, gboolean want_plain, gboolean cite);
-
-#endif /* __MAIL_FORMAT_H__ */
diff --git a/mail/mail-identify.c b/mail/mail-identify.c
deleted file mode 100644
index e2f614f059..0000000000
--- a/mail/mail-identify.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * Author :
- *  Dan Winship 
- *
- *  Copyright 2000, Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-
-#include 
-#include 
-#include "mail.h"
-
-static const char *identify_by_magic (CamelDataWrapper *data, MailDisplay *md);
-
-/**
- * mail_identify_mime_part:
- * @part: a CamelMimePart
- * @md: the MailDisplay @part is being shown in
- *
- * Try to identify the MIME type of the data in @part (which presumably
- * doesn't have a useful Content-Type).
- *
- * Return value: the MIME type, which the caller must free, or %NULL
- * if it could not be identified.
- **/
-char *
-mail_identify_mime_part (CamelMimePart *part, MailDisplay *md)
-{
-	const char *filename, *magic_type = NULL;
-	CamelDataWrapper *data;
-	char *name_type = NULL;
-
-	filename = camel_mime_part_get_filename (part);
-	if (filename) {
-		/* GNOME-VFS will misidentify TNEF attachments as MPEG */
-		if (!strcmp (filename, "winmail.dat"))
-			return g_strdup ("application/vnd.ms-tnef");
-
-#warning "does gnome_vfs_get_mime_type handle a plain filename as the 'text_uri'?"
-		name_type = gnome_vfs_get_mime_type(filename);
-	}
-
-	data = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	if (!camel_data_wrapper_is_offline (data))
-		magic_type = identify_by_magic (data, md);
-
-	if (magic_type && name_type) {
-		/* If GNOME-VFS doesn't recognize the data by magic, but it
-		 * contains English words, it will call it text/plain. If the
-		 * filename-based check came up with something different, use
-		 * that instead.
-		 */
-		if (!strcmp (magic_type, "text/plain"))
-			return name_type;
-
-		/* If if returns "application/octet-stream" try to
-		 * do better with the filename check.
-		 */
-		if (!strcmp (magic_type, "application/octet-stream"))
-			return name_type;
-	}
-
-	/* If the MIME part data was online, and the magic check
-	 * returned something, use that, since it's more reliable.
-	 */
-	if (magic_type) {
-		g_free(name_type);
-		return g_strdup (magic_type);
-	}
-
-	/* Otherwise try guessing based on the filename */
-	if (name_type)
-		return name_type;
-
-	/* Another possibility to try is the x-mac-type / x-mac-creator
-	 * parameter to Content-Type used by some Mac email clients. That
-	 * would require a Mac type to mime type conversion table.
-	 */
-
-#if 0
-	/* If the data part is offline, then we didn't try magic
-	 * before, so force it to be loaded so we can try again later.
-	 * FIXME: In a perfect world, we would not load the content
-	 * just to identify the MIME type.
-	 */
-	/* This is disabled as it just frustrates users more than it helps,
-	   see discussion in bug #11778 */
-	if (camel_data_wrapper_is_offline (data))
-		mail_content_loaded (data, md, TRUE, NULL, NULL, NULL);
-#endif
-
-	return NULL;
-}
-
-static const char *
-identify_by_magic (CamelDataWrapper *data, MailDisplay *md)
-{
-	CamelStreamMem *memstream;
-	const char *type;
-
-	memstream = (CamelStreamMem *)camel_stream_mem_new();
-	if (camel_data_wrapper_write_to_stream (data, (CamelStream *)memstream) > 0)
-		type = gnome_vfs_get_mime_type_for_data(memstream->buffer->data, memstream->buffer->len);
-	else
-		type = NULL;
-	camel_object_unref(memstream);
-
-	return type;
-}
diff --git a/mail/mail-importer.c b/mail/mail-importer.c
deleted file mode 100644
index f6b67351d3..0000000000
--- a/mail/mail-importer.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-importer.c
- *
- * Authors: Iain Holmes 
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "mail-importer.h"
-#include "mail-local.h"
-#include "mail.h"
-
-
-static GList *importer_modules = NULL;
-
-extern char *evolution_dir;
-
-static GNOME_Evolution_Storage local_storage = NULL;
-
-/* Prototype */
-
-void mail_importer_uninit (void);
-
-/**
- * mail_importer_create_folder:
- * parent_path: The path of the parent folder.
- * name: The name of the folder to be created.
- * description: A description of the folder.
- * listener: A BonoboListener for notification.
- *
- * Attempts to create the folder @parent_path/@name. When the folder has been
- * created, or there is an error, the "evolution-shell:folder-created" event is
- * emitted on @listener. The BonoboArg that is sent to @listener is a 
- * GNOME_Evolution_Storage_FolderResult which has two elements: result and path.
- * Result contains the error code, or success, and path contains the complete
- * physical path to the newly created folder.
- */
-void
-mail_importer_create_folder (const char *parent_path,
-			     const char *name,
-			     const char *description,
-			     const BonoboListener *listener)
-{
-	Bonobo_Listener corba_listener;
-	CORBA_Environment ev;
-	char *path, *physical;
-	char *real_description;
-
-	g_return_if_fail (local_storage != NULL);
-	g_return_if_fail (listener != NULL);
-	g_return_if_fail (BONOBO_IS_LISTENER (listener));
-
-	path = g_build_filename(parent_path, name, NULL);
-	physical = g_strdup_printf ("file://%s/local/%s", evolution_dir, parent_path);
-
-	corba_listener = bonobo_object_corba_objref (BONOBO_OBJECT (listener));
-
-	/* Darn CORBA wanting non-NULL values for strings */
-	real_description = CORBA_string_dup (description ? description : "");
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Storage_asyncCreateFolder (local_storage, 
-						   path, "mail", 
-						   real_description, physical,
-						   corba_listener, &ev);
-	CORBA_exception_free (&ev);
-	g_free (path);
-	g_free (physical);
-}
-
-/**
- * mail_importer_add_line:
- * importer: A MailImporter structure.
- * str: Next line of the mbox.
- * finished: TRUE if @str is the last line of the message.
- *
- * Adds lines to the message until it is finished, and then adds
- * the complete message to the folder.
- */
-void
-mail_importer_add_line (MailImporter *importer,
-			const char *str,
-			gboolean finished)
-{
-	CamelMimeMessage *msg;
-	CamelMessageInfo *info;
-	CamelException *ex;
-	
-	if (importer->mstream == NULL)
-		importer->mstream = CAMEL_STREAM_MEM (camel_stream_mem_new ());
-
-	camel_stream_write (CAMEL_STREAM (importer->mstream), str,  strlen (str));
-	
-	if (finished == FALSE)
-		return;
-
-	camel_stream_reset (CAMEL_STREAM (importer->mstream));
-	info = g_new0 (CamelMessageInfo, 1);
-	info->flags = CAMEL_MESSAGE_SEEN;
-
-	msg = camel_mime_message_new ();
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg),
-						  CAMEL_STREAM (importer->mstream));
-	
-	camel_object_unref (importer->mstream);
-	importer->mstream = NULL;
-
-	ex = camel_exception_new ();
-	camel_folder_append_message (importer->folder, msg, info, NULL, ex);
-	camel_object_unref (msg);
-
-	camel_exception_free (ex);
-	g_free (info);
-}
-
-/* module management */
-static GList *
-get_importer_list (void)
-{
-	DIR *dir;
-	struct dirent *d;
-	GList *importers_ret = NULL;
-
-	dir = opendir (MAIL_IMPORTERSDIR);
-	if (!dir) {
-		g_warning ("No importers dir: %s", MAIL_IMPORTERSDIR);
-		return NULL;
-	}
-
-	while ((d = readdir (dir))) {
-		char *path, *ext;
-
-		ext = strchr (d->d_name, '.');
-		if (!ext || strcmp (ext, ".so") != 0)
-			continue;
-
-		path = g_build_filename (MAIL_IMPORTERSDIR, d->d_name, NULL);
-		importers_ret = g_list_prepend (importers_ret, path);
-	}
-
-	closedir (dir);
-	return importers_ret;
-}
-
-static void
-free_importer_list (GList *list)
-{
-	for (; list; list = list->next) {
-		g_free (list->data);
-	}
-
-	g_list_free (list);
-}
-
-/**
- * mail_importer_init:
- *
- * Initialises all the importers
- */
-void
-mail_importer_init (EvolutionShellClient *client)
-{
-	GList *importers, *l;
-
-	if (importer_modules != NULL) {
-		return;
-	}
-
-	local_storage = evolution_shell_client_get_local_storage (client);
-
-	if (!g_module_supported ()) {
-		g_warning ("Could not initialise the importers as module loading"
-			   " is not supported on this system");
-		return;
-	}
-
-	importers = get_importer_list ();
-	if (importers == NULL)
-		return;
-
-	for (l = importers; l; l = l->next) {
-		GModule *module;
-
-		module = g_module_open (l->data, 0);
-		if (!module) {
-			g_warning ("Could not load: %s: %s", (char *) l->data,
-				   g_module_error ());
-		} else {
-			void *(*mail_importer_module_init) ();
-
-			if (!g_module_symbol (module, "mail_importer_module_init",
-					      (gpointer *)&mail_importer_module_init)) {
-				g_warning ("Could not load %s: No initialisation",
-					   (char *) l->data);
-				g_module_close (module);
-			}
-
-			mail_importer_module_init ();
-			importer_modules = g_list_prepend (importer_modules, module);
-		}
-	}
-
-	free_importer_list (importers);
-}
-
-/**
- * mail_importer_uninit:
- *
- * Unloads all the modules.
- */
-void
-mail_importer_uninit (void)
-{
-	CORBA_Environment ev;
-	GList *l;
-
-	for (l = importer_modules; l; l = l->next) {
-		g_module_close (l->data);
-	}
-
-	g_list_free (importer_modules);
-	importer_modules = NULL;
-	
-	CORBA_exception_init (&ev);
-	bonobo_object_release_unref (local_storage, &ev);
-	local_storage = NULL;
-	CORBA_exception_free (&ev);
-}
-
diff --git a/mail/mail-importer.h b/mail/mail-importer.h
deleted file mode 100644
index 41e7e0471c..0000000000
--- a/mail/mail-importer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-importer.h
- *
- * Authors: Iain Holmes 
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __MAIL_IMPORTER_H__
-#define __MAIL_IMPORTER_H__
-
-#include 
-#include 
-#include 
-#include 
-
-typedef struct _MailImporter MailImporter;
-struct _MailImporter {
-	CamelFolder *folder;
-	CamelStreamMem *mstream;
-
-	gboolean frozen; /* Is folder frozen? */
-};
-
-void mail_importer_init (EvolutionShellClient *client);
-void mail_importer_uninit (void);
-
-void mail_importer_add_line (MailImporter *importer,
-			     const char *str,
-			     gboolean finished);
-void mail_importer_create_folder (const char *parent_path,
-				  const char *name,
-				  const char *description,
-				  const BonoboListener *listener);
-#endif
diff --git a/mail/mail-local.c b/mail/mail-local.c
deleted file mode 100644
index af32b45fa2..0000000000
--- a/mail/mail-local.c
+++ /dev/null
@@ -1,1522 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-local.c: Local mailbox support. */
-
-/* 
- * Authors: 
- *  Michael Zucchi 
- *  Peter Williams 
- *  Ettore Perazzoli 
- *  Dan Winship 
- *
- * Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-
-#include 
-#include 
-
-#include "e-util/e-path.h"
-#include 
-#include 
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-#include "evolution-shell-component.h"
-#include "evolution-storage-listener.h"
-
-#include "camel/camel.h"
-#include "camel/camel-vtrash-folder.h"
-
-#include "mail.h"
-#include "mail-local.h"
-#include "mail-tools.h"
-#include "mail-mt.h"
-#include "mail-folder-cache.h"
-#include "mail-vfolder.h"
-#include "mail-ops.h"
-
-#define d(x) 
-
-/* sigh, required for passing around to some functions */
-static GNOME_Evolution_Storage local_corba_storage = CORBA_OBJECT_NIL;
-
-/* ** MailLocalStore ** (protos) ************************************************** */
-
-#define MAIL_LOCAL_STORE_TYPE     (mail_local_store_get_type ())
-#define MAIL_LOCAL_STORE(obj)     (CAMEL_CHECK_CAST((obj), MAIL_LOCAL_STORE_TYPE, MailLocalStore))
-#define MAIL_LOCAL_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), MAIL_LOCAL_STORE_TYPE, MailLocalStoreClass))
-#define MAIL_IS_LOCAL_STORE(o)    (CAMEL_CHECK_TYPE((o), MAIL_LOCAL_STORE_TYPE))
-
-typedef struct {
-	CamelStore parent_object;
-
-	/* stores CamelFolderInfo's of the folders we're supposed to know about, by uri */
-	GHashTable *folder_infos;
-	GMutex *folder_info_lock;
-
-} MailLocalStore;
-
-typedef struct {
-	CamelStoreClass parent_class;
-} MailLocalStoreClass;
-
-static CamelType mail_local_store_get_type (void);
-
-static MailLocalStore *global_local_store;
-
-/* ** MailLocalFolder ** (protos) ************************************************* */
-
-#define MAIL_LOCAL_FOLDER_TYPE     (mail_local_folder_get_type ())
-#define MAIL_LOCAL_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), MAIL_LOCAL_FOLDER_TYPE, MailLocalFolder))
-#define MAIL_LOCAL_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), MAIL_LOCAL_FOLDER_TYPE, MailLocalFolderClass))
-#define MAIL_IS_LOCAL_FOLDER(o)    (CAMEL_CHECK_TYPE((o), MAIL_LOCAL_FOLDER_TYPE))
-
-#define LOCAL_STORE_LOCK(folder)   (g_mutex_lock   (((MailLocalStore *)folder)->folder_info_lock))
-#define LOCAL_STORE_UNLOCK(folder) (g_mutex_unlock (((MailLocalStore *)folder)->folder_info_lock))
-
-struct _local_meta {
-	char *path;		/* path of metainfo */
-
-	char *format;		/* format of mailbox */
-	char *name;		/* name of actual mbox */
-	int indexed;		/* is body indexed? */
-};
-
-typedef struct {
-	CamelFolder parent_object;
-
-	CamelFolder *real_folder;
-	CamelStore *real_store;
-
-	char *description;
-	char *real_path;
-
-	struct _local_meta *meta;
-
-	GMutex *real_folder_lock; /* no way to use the CamelFolder's lock, so... */
-} MailLocalFolder;
-
-typedef struct {
-	CamelFolderClass parent_class;
-} MailLocalFolderClass;
-
-static CamelType mail_local_folder_get_type (void);
-
-#ifdef ENABLE_THREADS
-#define LOCAL_FOLDER_LOCK(folder)   (g_mutex_lock   (((MailLocalFolder *)folder)->real_folder_lock))
-#define LOCAL_FOLDER_UNLOCK(folder) (g_mutex_unlock (((MailLocalFolder *)folder)->real_folder_lock))
-#else
-#define LOCAL_FOLDER_LOCK(folder)
-#define LOCAL_FOLDER_UNLOCK(folder)
-#endif
-
-/* ** MailLocalFolder ************************************************************* */
-
-static struct _local_meta *
-load_metainfo(const char *path)
-{
-	xmlDocPtr doc;
-	xmlNodePtr node;
-	struct _local_meta *meta;
-
-	d(printf("Loading folder metainfo from : %s\n", path));
-
-	meta = g_malloc0(sizeof(*meta));
-	meta->path = g_strdup(path);
-
-	doc = xmlParseFile(path);
-	if (doc == NULL)
-		goto dodefault;
-
-	node = doc->children;
-	if (strcmp(node->name, "folderinfo"))
-		goto dodefault;
-
-	node = node->children;
-	while (node) {
-		if (!strcmp(node->name, "folder")) {
-			char *index, *txt;
-			
-			txt = xmlGetProp(node, "type");
-			meta->format = g_strdup(txt?txt:"mbox");
-			xmlFree(txt);
-			
-			txt = xmlGetProp(node, "name");
-			meta->name = g_strdup(txt?txt:"mbox");
-			xmlFree(txt);
-			
-			index = xmlGetProp(node, "index");
-			if (index) {
-				meta->indexed = atoi(index);
-				xmlFree(index);
-			} else
-				meta->indexed = TRUE;
-			
-		}
-		node = node->next;
-	}
-	xmlFreeDoc(doc);
-	return meta;
-
- dodefault:
-	meta->format = g_strdup("mbox"); /* defaults */
-	meta->name = g_strdup("mbox");
-	meta->indexed = TRUE;
-	xmlFreeDoc(doc);
-	return meta;
-}
-
-static void
-free_metainfo(struct _local_meta *meta)
-{
-	g_free(meta->path);
-	g_free(meta->format);
-	g_free(meta->name);
-	g_free(meta);
-}
-
-static gboolean
-save_metainfo (struct _local_meta *meta)
-{
-	xmlDocPtr doc;
-	xmlNodePtr root, node;
-	int ret;
-	
-	d(printf("Saving folder metainfo to : %s\n", meta->path));
-	
-	doc = xmlNewDoc("1.0");
-	root = xmlNewDocNode(doc, NULL, "folderinfo", NULL);
-	xmlDocSetRootElement(doc, root);
-
-	node  = xmlNewChild(root, NULL, "folder", NULL);
-	xmlSetProp(node, "type", meta->format);
-	xmlSetProp(node, "name", meta->name);
-	xmlSetProp(node, "index", meta->indexed?"1":"0");
-
-#warning "xmlSaveFile used here"	
-	ret = xmlSaveFile (meta->path, doc);
-	
-	xmlFreeDoc (doc);
-	
-	return ret == -1 ? FALSE : TRUE;
-}
-
-static CamelFolderClass *mlf_parent_class = NULL;
-
-/* forward a bunch of functions to the real folder. This pretty
- * much sucks but I haven't found a better way of doing it.
- */
-
-/* We need to do it without having locked our folder, otherwise
-   we can get sync hangs with vfolders/trash */
-static void
-mlf_refresh_info(CamelFolder *folder, CamelException *ex)
-{
-	MailLocalFolder *mlf = MAIL_LOCAL_FOLDER(folder);
-	CamelFolder *f;
-
-	LOCAL_FOLDER_LOCK(mlf);
-	f = mlf->real_folder;
-	camel_object_ref(f);
-	LOCAL_FOLDER_UNLOCK(mlf);
-
-	camel_folder_refresh_info(f, ex);
-	camel_object_unref(f);
-}
-
-static void
-mlf_sync(CamelFolder *folder, gboolean expunge, CamelException *ex)
-{
-	MailLocalFolder *mlf = MAIL_LOCAL_FOLDER(folder);
-	CamelFolder *f;
-
-	LOCAL_FOLDER_LOCK(mlf);
-	f = mlf->real_folder;
-	camel_object_ref(f);
-	LOCAL_FOLDER_UNLOCK(mlf);
-
-	camel_folder_sync(f, expunge, ex);
-	camel_object_unref(f);
-}
-
-static void
-mlf_expunge(CamelFolder *folder, CamelException *ex)
-{
-	MailLocalFolder *mlf = MAIL_LOCAL_FOLDER(folder);
-	CamelFolder *f;
-
-	LOCAL_FOLDER_LOCK(mlf);
-	f = mlf->real_folder;
-	camel_object_ref(f);
-	LOCAL_FOLDER_UNLOCK(mlf);
-
-	camel_folder_expunge(f, ex);
-	camel_object_unref(f);
-}
-
-static void
-mlf_append_message(CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, char **appended_uid, CamelException *ex)
-{
-	MailLocalFolder *mlf = MAIL_LOCAL_FOLDER(folder);
-	CamelFolder *f;
-
-	LOCAL_FOLDER_LOCK(mlf);
-	f = mlf->real_folder;
-	camel_object_ref(f);
-	LOCAL_FOLDER_UNLOCK(mlf);
-
-	camel_folder_append_message(f, message, info, appended_uid, ex);
-	camel_object_unref(f);
-}
-
-static CamelMimeMessage *
-mlf_get_message(CamelFolder *folder, const char *uid, CamelException *ex)
-{
-	MailLocalFolder *mlf = MAIL_LOCAL_FOLDER(folder);
-	CamelMimeMessage *ret;
-	CamelFolder *f;
-
-	LOCAL_FOLDER_LOCK(mlf);
-	f = mlf->real_folder;
-	camel_object_ref(f);
-	LOCAL_FOLDER_UNLOCK(mlf);
-
-	ret = camel_folder_get_message(f, uid, ex);
-	camel_object_unref(f);
-
-	return ret;
-}
-
-static GPtrArray *
-mlf_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex)
-{
-	MailLocalFolder *mlf = MAIL_LOCAL_FOLDER (folder);
-	GPtrArray *ret;
-	CamelFolder *f;
-
-	LOCAL_FOLDER_LOCK(mlf);
-	f = mlf->real_folder;
-	camel_object_ref(f);
-	LOCAL_FOLDER_UNLOCK(mlf);
-
-	ret = camel_folder_search_by_expression(f, expression, ex);
-	camel_object_unref(f);
-
-	return ret;
-}
-
-static GPtrArray *
-mlf_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex)
-{
-	MailLocalFolder *mlf = MAIL_LOCAL_FOLDER (folder);
-	GPtrArray *ret;
-	CamelFolder *f;
-
-	LOCAL_FOLDER_LOCK(mlf);
-	f = mlf->real_folder;
-	camel_object_ref(f);
-	LOCAL_FOLDER_UNLOCK(mlf);
-
-	ret = camel_folder_search_by_uids(f, expression, uids, ex);
-	camel_object_unref(f);
-
-	return ret;
-}
-
-static void
-mlf_search_free(CamelFolder *folder, GPtrArray *result)
-{
-	MailLocalFolder *mlf = MAIL_LOCAL_FOLDER(folder);
-	CamelFolder *f;
-
-	LOCAL_FOLDER_LOCK(mlf);
-	f = mlf->real_folder;
-	camel_object_ref(f);
-	LOCAL_FOLDER_UNLOCK(mlf);
-
-	camel_folder_search_free(f, result);
-	camel_object_unref(f);
-}
-
-static void
-mlf_set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set)
-{
-	MailLocalFolder *mlf = MAIL_LOCAL_FOLDER(folder);
-	CamelFolder *f;
-
-	LOCAL_FOLDER_LOCK(mlf);
-	f = mlf->real_folder;
-	camel_object_ref(f);
-	LOCAL_FOLDER_UNLOCK(mlf);
-
-	camel_folder_set_message_flags(mlf->real_folder, uid, flags, set);
-	camel_object_unref(f);
-}
-
-static void
-mlf_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value)
-{
-	MailLocalFolder *mlf = MAIL_LOCAL_FOLDER(folder);
-	CamelFolder *f;
-
-	LOCAL_FOLDER_LOCK(mlf);
-	f = mlf->real_folder;
-	camel_object_ref(f);
-	LOCAL_FOLDER_UNLOCK(mlf);
-
-	camel_folder_set_message_user_flag(mlf->real_folder, uid, name, value);
-	camel_object_unref(f);
-}
-
-static void
-mlf_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value)
-{
-	MailLocalFolder *mlf = MAIL_LOCAL_FOLDER(folder);
-	CamelFolder *f;
-
-	LOCAL_FOLDER_LOCK(mlf);
-	f = mlf->real_folder;
-	camel_object_ref(f);
-	LOCAL_FOLDER_UNLOCK(mlf);
-
-	camel_folder_set_message_user_tag(mlf->real_folder, uid, name, value);
-	camel_object_unref(f);
-}
-
-/* Internal store-rename call, update our strings */
-static void
-mlf_rename(CamelFolder *folder, const char *new)
-{
-	MailLocalFolder *mlf = (MailLocalFolder *)folder;
-
-	/* first, proxy it down */
-	if (mlf->real_folder) {
-		char *mbox = g_strdup_printf("%s/%s", new, mlf->meta->name);
-
-		d(printf("renaming real folder to %s\n", mbox));
-
-		camel_folder_rename(mlf->real_folder, mbox);
-		g_free(mbox);
-	}
-
-	/* Then do our stuff */
-	g_free(mlf->real_path);
-	mlf->real_path = g_strdup(new);
-
-	g_free(mlf->meta->path);
-	mlf->meta->path = g_strdup_printf("%s/%s/local-metadata.xml", ((CamelService *)folder->parent_store)->url->path, new);
-
-	/* Then pass it up */
-	((CamelFolderClass *)mlf_parent_class)->rename(folder, new);
-}
-
-/* and, conversely, forward the real folder's signals. */
-
-static void
-mlf_proxy_message_changed(CamelObject *real_folder, gpointer event_data, gpointer user_data)
-{
-	camel_object_trigger_event(user_data, "message_changed", event_data);
-}
-
-static void
-mlf_proxy_folder_changed(CamelObject *real_folder, gpointer event_data, gpointer user_data)
-{
-	camel_object_trigger_event(user_data, "folder_changed", event_data);
-}
-
-static void
-mlf_unset_folder (MailLocalFolder *mlf)
-{
-	CamelFolder *folder = (CamelFolder *)mlf;
-
-	g_assert(mlf->real_folder);
-
-	camel_object_unhook_event(mlf->real_folder,
-				  "message_changed",
-				  mlf_proxy_message_changed,
-				  mlf);
-	camel_object_unhook_event(mlf->real_folder,
-				  "folder_changed",
-				  mlf_proxy_folder_changed,
-				  mlf);
-
-	camel_object_unref(folder->summary);
-	folder->summary = NULL;
-	camel_object_unref(mlf->real_folder);
-	mlf->real_folder = NULL;
-	camel_object_unref(mlf->real_store);
-	mlf->real_store = NULL;
-
-	folder->permanent_flags = 0;
-	folder->folder_flags = 0;
-}
-
-static gboolean
-mlf_set_folder(MailLocalFolder *mlf, guint32 flags, CamelException *ex)
-{
-	CamelFolder *folder = (CamelFolder *)mlf;
-	char *uri, *mbox;
-
-	g_assert(mlf->real_folder == NULL);
-
-	uri = g_strdup_printf("%s:%s", mlf->meta->format, ((CamelService *)folder->parent_store)->url->path);
-
-	d(printf("opening real store: %s\n", uri));
-	mlf->real_store = camel_session_get_store(session, uri, ex);
-	g_free(uri);
-	if (mlf->real_store == NULL)
-		return FALSE;
-
-	if (mlf->meta->indexed)
-		flags |= CAMEL_STORE_FOLDER_BODY_INDEX;
-
-	/* mlf->real_folder = camel_store_get_folder(mlf->real_store, mlf->meta->name, flags, ex); */
-	mbox = g_strdup_printf("%s/%s", mlf->real_path, mlf->meta->name);
-	d(printf("Opening mbox on real path: %s\n", mbox));
-	mlf->real_folder = camel_store_get_folder(mlf->real_store, mbox, flags, ex);
-	g_free(mbox);
-	if (mlf->real_folder == NULL)
-		return FALSE;
-
-	if (mlf->real_folder->folder_flags & CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY) {
-		folder->summary = mlf->real_folder->summary;
-		camel_object_ref(mlf->real_folder->summary);
-	}
-
-	folder->permanent_flags = mlf->real_folder->permanent_flags;
-	folder->folder_flags = mlf->real_folder->folder_flags;
-
-	camel_object_hook_event(mlf->real_folder, "message_changed", mlf_proxy_message_changed, mlf);
-	camel_object_hook_event(mlf->real_folder, "folder_changed", mlf_proxy_folder_changed, mlf);
-
-	return TRUE;
-}
-
-static int
-mlf_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args)
-{
-	CamelFolder *folder = (CamelFolder *)object;
-	MailLocalFolder *mlf = (MailLocalFolder *)object;
-	int i, count=args->argc;
-	guint32 tag;
-
-	for (i=0;iargc;i++) {
-		CamelArgGet *arg = &args->argv[i];
-		
-		tag = arg->tag;
-		
-		switch (tag & CAMEL_ARG_TAG) {
-			/* CamelObject args */
-		case CAMEL_OBJECT_ARG_DESCRIPTION:
-			if (mlf->description == NULL) {
-				int pathlen;
-
-				/* string to describe a local folder as the location of a message */
-				pathlen = strlen(evolution_dir) + strlen("local") + 1;
-				if (strlen(folder->full_name) > pathlen)
-					mlf->description = g_strdup_printf(_("Local folders/%s"), folder->full_name+pathlen);
-				else
-					mlf->description = g_strdup_printf(_("Local folders/%s"), folder->name);
-			}
-			*arg->ca_str = mlf->description;
-			break;
-		default:
-			count--;
-			continue;
-		}
-
-		arg->tag = (tag & CAMEL_ARG_TYPE) | CAMEL_ARG_IGNORE;
-	}
-
-	if (count)
-		return ((CamelObjectClass *)mlf_parent_class)->getv(object, ex, args);
-
-	return 0;
-}
-
-static void 
-mlf_class_init (CamelObjectClass *camel_object_class)
-{
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_object_class);
-
-	/* override all the functions subclassed in providers/local/ */
-
-	camel_folder_class->refresh_info = mlf_refresh_info;
-	camel_folder_class->sync = mlf_sync;
-	camel_folder_class->expunge = mlf_expunge;
-	camel_folder_class->append_message = mlf_append_message;
-	camel_folder_class->get_message = mlf_get_message;
-	camel_folder_class->search_free = mlf_search_free;
-
-	camel_folder_class->search_by_expression = mlf_search_by_expression;
-	camel_folder_class->search_by_uids = mlf_search_by_uids;
-	camel_folder_class->set_message_flags = mlf_set_message_flags;
-	camel_folder_class->set_message_user_flag = mlf_set_message_user_flag;
-	camel_folder_class->set_message_user_tag = mlf_set_message_user_tag;
-
-	camel_folder_class->rename = mlf_rename;
-
-	camel_object_class->getv = mlf_getv;
-}
-
-static void
-mlf_init (CamelObject *obj, CamelObjectClass *klass)
-{
-	MailLocalFolder *mlf = MAIL_LOCAL_FOLDER (obj);
-
-#ifdef ENABLE_THREADS
-	mlf->real_folder_lock = g_mutex_new();
-#endif
-}
-
-static void
-mlf_finalize (CamelObject *obj)
-{
-	MailLocalFolder *mlf = MAIL_LOCAL_FOLDER (obj);
-
-	if (mlf->real_folder)
-		mlf_unset_folder(mlf);
-
-	free_metainfo(mlf->meta);
-	
-	g_free (mlf->real_path);
-	
-#ifdef ENABLE_THREADS
-	g_mutex_free (mlf->real_folder_lock);
-#endif
-}
-
-static CamelType
-mail_local_folder_get_type (void)
-{
-	static CamelType mail_local_folder_type = CAMEL_INVALID_TYPE;
-
-	if (mail_local_folder_type == CAMEL_INVALID_TYPE) {
-		mail_local_folder_type = camel_type_register(CAMEL_FOLDER_TYPE,
-							     "MailLocalFolder",
-							     sizeof (MailLocalFolder),
-							     sizeof (MailLocalFolderClass),
-							     mlf_class_init,
-							     NULL,
-							     mlf_init,
-							     mlf_finalize);
-		mlf_parent_class = (CamelFolderClass *)CAMEL_FOLDER_TYPE;
-	}
-
-	return mail_local_folder_type;
-}
-
-static MailLocalFolder *
-mail_local_folder_construct(MailLocalFolder *mlf, MailLocalStore *parent_store, const char *full_name, CamelException *ex)
-{
-	char *metapath, *name;
-	
-	name = g_path_get_basename (full_name);
-	d(printf ("constructing local folder: full = %s, name = %s\n", full_name, name));
-	camel_folder_construct (CAMEL_FOLDER (mlf), CAMEL_STORE (parent_store), full_name, name);
-	g_free (name);
-	
-	mlf->real_path = g_strdup (((CamelFolder *) mlf)->full_name);
-	
-	metapath = g_strdup_printf ("%s/%s/local-metadata.xml", ((CamelService *) parent_store)->url->path, full_name);
-	mlf->meta = load_metainfo (metapath);
-	g_free (metapath);
-	
-	return mlf;
-}
-
-static gboolean
-mail_local_folder_reconfigure (MailLocalFolder *mlf, const char *new_format, int index_body, CamelException *ex)
-{
-	CamelStore *fromstore = NULL;
-	CamelFolder *fromfolder = NULL;
-	char *oldformat = NULL;
-	char *store_uri;
-	GPtrArray *uids;
-	int real_folder_frozen = FALSE;
-	int format_change, index_changed;
-	char *tmpname = NULL;
-	char *mbox = NULL;
-
-	format_change = strcmp(mlf->meta->format, new_format) != 0;
-	index_changed = mlf->meta->indexed != index_body;
-
-	if (format_change == FALSE && index_changed == FALSE)
-		return TRUE;
-
-	camel_operation_start(NULL, _("Reconfiguring folder"));
-
-	/* first things first */
-	g_assert (ex);
-	LOCAL_FOLDER_LOCK (mlf);
-
-	/* first, 'close' the old folder */
-	if (mlf->real_folder) {
-		camel_folder_sync(mlf->real_folder, FALSE, ex);
-		if (camel_exception_is_set (ex))
-			goto cleanup;
-		mlf_unset_folder(mlf);
-	}
-
-	/* only indexed change, just re-open with new flags */
-	if (!format_change) {
-		mlf->meta->indexed = index_body;
-		mlf_set_folder(mlf, CAMEL_STORE_FOLDER_CREATE, ex);
-		save_metainfo(mlf->meta);
-		goto cleanup;
-	}
-
-	store_uri = g_strdup_printf("%s:%s", mlf->meta->format, ((CamelService *)((CamelFolder *)mlf)->parent_store)->url->path);
-	fromstore = camel_session_get_store(session, store_uri, ex);
-	g_free(store_uri);
-	if (fromstore == NULL)
-		goto cleanup;
-
-	oldformat = mlf->meta->format;
-	mlf->meta->format = g_strdup(new_format);
-
-	/* rename the old mbox and open it again, without indexing */
-	tmpname = g_strdup_printf ("%s/%s_reconfig", mlf->real_path, mlf->meta->name);
-	mbox = g_strdup_printf("%s/%s", mlf->real_path, mlf->meta->name);
-	d(printf("renaming %s to %s, and opening it\n", mbox, tmpname));
-	
-	camel_store_rename_folder(fromstore, mbox, tmpname, ex);
-	if (camel_exception_is_set(ex))
-		goto cleanup;
-	
-	/* we dont need to set the create flag ... or need an index if it has one */
-	fromfolder = camel_store_get_folder(fromstore, tmpname, 0, ex);
-	if (fromfolder == NULL || camel_exception_is_set(ex)) {
-		/* try and recover ... */
-		camel_exception_clear(ex);
-		camel_store_rename_folder(fromstore, tmpname, mbox, ex);
-		goto cleanup;
-	}
-	
-	/* create a new mbox */
-	d(printf("Creating the destination mbox\n"));
-
-	if (!mlf_set_folder(mlf, CAMEL_STORE_FOLDER_CREATE, ex)) {
-		d(printf("cannot open destination folder\n"));
-		/* try and recover ... */
-		camel_exception_clear(ex);
-		camel_store_rename_folder(fromstore, tmpname, mbox, ex);
-		goto cleanup;
-	}
-
-	real_folder_frozen = TRUE;
-	camel_folder_freeze(mlf->real_folder);
-
-	uids = camel_folder_get_uids(fromfolder);
-	camel_folder_transfer_messages_to(fromfolder, uids, mlf->real_folder, NULL, TRUE, ex);
-	camel_folder_free_uids(fromfolder, uids);
-	if (camel_exception_is_set(ex))
-		goto cleanup;
-	
-	camel_folder_expunge(fromfolder, ex);
-	
-	d(printf("delete old mbox ...\n"));
-	camel_object_unref(fromfolder);
-	fromfolder = NULL;
-	camel_store_delete_folder(fromstore, tmpname, ex);
-	
-	/* switch format */
-	g_free(oldformat);
-	oldformat = NULL;
-	if (save_metainfo(mlf->meta) == FALSE) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot save folder metainfo; "
-					"you may find you can't\n"
-					"open this folder anymore: %s: %s"),
-				      mlf->meta->path, strerror(errno));
-	}
-	
- cleanup:
-	if (oldformat) {
-		g_free(mlf->meta->format);
-		mlf->meta->format = oldformat;
-	}
-	if (mlf->real_folder == NULL)
-		mlf_set_folder (mlf, CAMEL_STORE_FOLDER_CREATE, ex);
-	if (fromfolder)
-		camel_object_unref(fromfolder);
-	if (fromstore)
-		camel_object_unref(fromstore);
-
-	g_free(tmpname);
-	g_free(mbox);
-
-	LOCAL_FOLDER_UNLOCK (mlf);
-
-	if (real_folder_frozen)
-		camel_folder_thaw(mlf->real_folder);
-
-	camel_operation_end(NULL);
-
-	return !camel_exception_is_set(ex);
-}
-		
-/* ******************************************************************************** */
-
-static CamelObjectClass *local_store_parent_class = NULL;
-
-static CamelFolder *
-mls_get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
-{
-	MailLocalStore *local_store = MAIL_LOCAL_STORE (store);
-	MailLocalFolder *folder;
-
-	d(printf("--LOCAL-- get_folder: %s\n", folder_name));
-
-	folder = (MailLocalFolder *)camel_object_new(MAIL_LOCAL_FOLDER_TYPE);
-	folder = mail_local_folder_construct(folder, local_store, folder_name, ex);
-	if (folder == NULL)
-		return NULL;
-
-	if (!mlf_set_folder(folder, flags, ex)) {
-		camel_object_unref(folder);
-		return NULL;
-	}
-
-	if (flags & CAMEL_STORE_FOLDER_CREATE) {
-		if (save_metainfo(folder->meta) == FALSE) {
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Cannot save folder metainfo to %s: %s"),
-					      folder->meta->path, g_strerror(errno));
-			camel_object_unref(folder);
-			return NULL;
-		}
-	}
-
-	return (CamelFolder *)folder;
-}
-
-static void
-mls_delete_folder(CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	CamelStore *real_store;
-	char *metapath, *uri, *mbox;
-	CamelException local_ex;
-	struct _local_meta *meta;
-
-	d(printf("Deleting folder: %s %s\n", ((CamelService *)store)->url->path, folder_name));
-
-	camel_exception_init(&local_ex);
-
-	/* find the real store for this folder, and proxy the call */
-	metapath = g_strdup_printf("%s%s/local-metadata.xml", ((CamelService *)store)->url->path, folder_name);
-	meta = load_metainfo(metapath);
-	uri = g_strdup_printf("%s:%s", meta->format, ((CamelService *)store)->url->path);
-	real_store = (CamelStore *)camel_session_get_service(session, uri, CAMEL_PROVIDER_STORE, ex);
-	g_free(uri);
-	if (real_store == NULL) {
-		g_free(metapath);
-		free_metainfo(meta);
-		camel_object_unref(real_store);
-		return;
-	}
-
-	mbox = g_strdup_printf("%s/%s", folder_name, meta->name);
-	camel_store_delete_folder(real_store, mbox, &local_ex);
-	g_free(mbox);
-	if (camel_exception_is_set(&local_ex)) {
-		camel_exception_xfer(ex, &local_ex);
-		g_free(metapath);
-		free_metainfo(meta);
-		camel_object_unref(real_store);
-		return;
-	}
-
-	camel_object_unref((CamelObject *)real_store);
-
-	free_metainfo(meta);
-
-	if (unlink(metapath) == -1) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Cannot delete folder metadata %s: %s"),
-				     metapath, g_strerror(errno));
-	}
-
-	g_free(metapath);
-}
-
-static void
-mls_rename_folder(CamelStore *store, const char *old_name, const char *new_name, CamelException *ex)
-{
-	CamelStore *real_store;
-	/*MailLocalStore *mls = (MailLocalStore *)store;*/
-	char *uri;
-	/*CamelException local_ex;*/
-	struct _local_meta *meta;
-	char *oldname, *newname;
-	char *oldmeta, *newmeta;
-	struct stat st;
-
-	/* folder:rename() updates all our in-memory data to match */
-
-	/* FIXME: Need to lock the subfolder that matches this if its open
-	   Then rename it and unlock it when done */
-
-	d(printf("Renaming folder from '%s' to '%s'\n", old_name, new_name));
-
-	oldmeta = g_strdup_printf("%s%s/local-metadata.xml", ((CamelService *)store)->url->path, old_name);
-	newmeta = g_strdup_printf("%s%s/local-metadata.xml", ((CamelService *)store)->url->path, new_name);
-
-	meta = load_metainfo(oldmeta);
-	uri = g_strdup_printf("%s:%s", meta->format, ((CamelService *)store)->url->path);
-	real_store = (CamelStore *)camel_session_get_service(session, uri, CAMEL_PROVIDER_STORE, ex);
-	g_free(uri);
-	if (real_store == NULL) {
-		g_free(newmeta);
-		g_free(oldmeta);
-		free_metainfo(meta);
-		return;
-	}
-
-	oldname = g_strdup_printf("%s/%s", old_name, meta->name);
-	newname = g_strdup_printf("%s/%s", new_name, meta->name);
-
-	camel_store_rename_folder(real_store, oldname, newname, ex);
-	if (!camel_exception_is_set(ex)) {
-		/* If this fails?  Well, doesn't really matter but 'fail' anyway */
-		if (stat(oldmeta, &st) == 0
-		    && rename(oldmeta, newmeta) == -1) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Could not rename folder %s to %s: %s"),
-					     old_name, new_name, strerror(errno));
-		} else {
-			/* So .. .the shell does a remove/add now the rename worked, so we dont
-			   have to do this.  However totally broken that idea might be */
-#if 0
-			CamelFolderInfo *info;
-			const char *tmp;
-			char *olduri, *newuri;
-
-			olduri = g_strdup_printf("%s:%s%s", ((CamelService *)store)->url->protocol, ((CamelService *)store)->url->path, old_name);
-			newuri = g_strdup_printf("%s:%s%s", ((CamelService *)store)->url->protocol, ((CamelService *)store)->url->path, new_name);
-			info = g_hash_table_lookup(mls->folder_infos, olduri);
-			if (info) {
-				CamelRenameInfo reninfo;
-
-				g_free(info->url);
-				g_free(info->full_name);
-				g_free(info->name);
-				g_free(info->path);
-				info->url = newuri;
-				info->full_name = g_strdup(new_name);
-				info->path = g_strdup_printf("/%s", new_name);
-				tmp = strchr(new_name, '/');
-				if (tmp == NULL)
-					tmp = new_name;
-				info->name = g_strdup(tmp);
-				g_hash_table_insert(mls->folder_infos, info->url, info);
-
-				reninfo.new = info;
-				reninfo.old_base = (char *)old_name;
-				
-				camel_object_trigger_event(store, "folder_renamed", &reninfo);
-			} else {
-				g_free(newuri);
-				g_warning("Cannot find existing folder '%s' in table?\n", olduri);
-			}
-
-			g_free(olduri);
-#endif
-		}
-	}
-
-	g_free(newname);
-	g_free(oldname);
-
-	camel_object_unref(real_store);
-
-	free_metainfo(meta);
-
-	g_free(newmeta);
-	g_free(oldmeta);
-}
-
-static char *
-mls_get_name (CamelService *service, gboolean brief)
-{
-	if (brief)
-		return g_strdup("local");
-
-	return g_strdup("Local mail folders");
-}
-
-static void
-mls_init (MailLocalStore *mls, MailLocalStoreClass *mlsclass)
-{
-	mls->folder_infos = g_hash_table_new(g_str_hash, g_str_equal);
-	mls->folder_info_lock = g_mutex_new();
-}
-
-static void
-free_info(void *key, void *value, void *data)
-{
-	CamelFolderInfo *info = value;
-
-	camel_folder_info_free (info);
-}
-
-static void
-mls_finalise(MailLocalStore *mls)
-{
-	g_hash_table_foreach(mls->folder_infos, (GHFunc)free_info, NULL);
-	g_hash_table_destroy(mls->folder_infos);
-	g_mutex_free(mls->folder_info_lock);
-}
-
-static void
-mls_class_init (CamelObjectClass *camel_object_class)
-{
-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS(camel_object_class);
-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS(camel_object_class);
-	
-	/* virtual method overload -- the bare minimum */
-	camel_service_class->get_name    = mls_get_name;
-	camel_store_class->get_folder    = mls_get_folder;
-	camel_store_class->delete_folder = mls_delete_folder;
-	camel_store_class->rename_folder = mls_rename_folder;
-
-	local_store_parent_class = camel_type_get_global_classfuncs (CAMEL_STORE_TYPE);
-}
-
-static CamelType
-mail_local_store_get_type (void)
-{
-	static CamelType mail_local_store_type = CAMEL_INVALID_TYPE;
-
-	if (mail_local_store_type == CAMEL_INVALID_TYPE) {
-		mail_local_store_type = camel_type_register (
-			CAMEL_STORE_TYPE, "MailLocalStore",
-			sizeof (MailLocalStore),
-			sizeof (MailLocalStoreClass),
-			(CamelObjectClassInitFunc) mls_class_init,
-			NULL,
-			(CamelObjectInitFunc) mls_init,
-			(CamelObjectFinalizeFunc) mls_finalise);
-	}
-
-	return mail_local_store_type;
-}
-
-static void mail_local_store_add_folder(MailLocalStore *mls, const char *uri, const char *path, const char *name)
-{
-	CamelFolderInfo *info = NULL;
-	CamelURL *url;
-
-	d(printf("Shell adding folder: '%s' path = '%s'\n", uri, path));
-
-	url = camel_url_new(uri, NULL);
-	if (url == NULL) {
-		g_warning("Shell trying to add invalid folder url: %s", uri);
-		return;
-	}
-	if (url->path == NULL || url->path[0] == 0) {
-		g_warning("Shell trying to add invalid folder url: %s", uri);
-		camel_url_free(url);
-		return;
-	}
-
-	LOCAL_STORE_LOCK(mls);
-
-	if (g_hash_table_lookup(mls->folder_infos, uri)) {
-		g_warning("Shell trying to add a folder I already have!");
-	} else {
-		info = g_malloc0(sizeof(*info));
-		info->url = g_strdup(uri);
-		info->full_name = g_strdup(url->path+1);
-		info->name = g_strdup(name);
-		info->unread_message_count = -1;
-		info->path = g_strdup (path);
-		g_hash_table_insert(mls->folder_infos, info->url, info);
-	}
-
-	LOCAL_STORE_UNLOCK(mls);
-
-	camel_url_free(url);
-
-	if (info) {
-		/* FIXME: should copy info, so we dont get a removed while we're using it? */
-		camel_object_trigger_event(mls, "folder_created", info);
-
-		/* this is just so the folder is opened at least once to setup the folder
-		   counts etc in the display.  Joy eh?   The result is discarded. */
-		mail_get_folder (uri, CAMEL_STORE_FOLDER_CREATE, NULL, NULL, mail_thread_queued_slow);
-	}
-}
-
-struct _search_info {
-	const char *path;
-	CamelFolderInfo *info;
-};
-
-static void
-remove_find_path(char *uri, CamelFolderInfo *info, struct _search_info *data)
-{
-	if (!strcmp(info->path, data->path))
-		data->info = info;
-}
-
-static void mail_local_store_remove_folder(MailLocalStore *mls, const char *path)
-{
-	struct _search_info data = { path, NULL };
-
-	d(printf("shell removing folder? '%s'\n", path));
-
-	/* we're keyed on uri, not path, so have to search for it manually */
-
-	LOCAL_STORE_LOCK(mls);
-	g_hash_table_foreach(mls->folder_infos, (GHFunc)remove_find_path, &data);
-	if (data.info)
-		g_hash_table_remove(mls->folder_infos, data.info->url);
-	LOCAL_STORE_UNLOCK(mls);
-
-	if (data.info) {
-		camel_object_trigger_event(mls, "folder_deleted", data.info);
-
-		g_free(data.info->url);
-		g_free(data.info->full_name);
-		g_free(data.info->name);
-		g_free(data.info);
-	}
-}
-
-/* ** Local Provider ************************************************************** */
-
-static CamelProvider local_provider = {
-	"file", "Local mail", NULL, "mail",
-	CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_EXTERNAL,
-	CAMEL_URL_NEED_PATH,
-	/* ... */
-};
-
-/* There's only one "file:" store. */
-static guint
-non_hash (gconstpointer key)
-{
-	return 0;
-}
-
-static gint
-non_equal (gconstpointer a, gconstpointer b)
-{
-	return TRUE;
-}
-
-static void
-mail_local_provider_init (void)
-{
-	/* Register with Camel to handle file: URLs */
-	local_provider.object_types[CAMEL_PROVIDER_STORE] = MAIL_LOCAL_STORE_TYPE;
-
-	local_provider.url_hash = non_hash;
-	local_provider.url_equal = non_equal;
-	camel_session_register_provider (session, &local_provider);
-}
-
-/* ** Local Storage Listener ****************************************************** */
-
-static void
-local_storage_destroyed_cb (EvolutionStorageListener *storage_listener,
-			    void *data)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	bonobo_object_release_unref (data, &ev);
-	CORBA_exception_free (&ev);
-}
-
-
-static void
-local_storage_new_folder_cb (EvolutionStorageListener *storage_listener,
-			     const char *path,
-			     const GNOME_Evolution_Folder *folder,
-			     void *data)
-{
-	d(printf("Local folder new:\n"));
-	d(printf(" path = '%s'\n uri = '%s'\n display = '%s'\n",
-		 path, folder->physicalUri, folder->displayName));
-
-	/* We dont actually add the trash to our local folders list, get_trash is handled
-	   outside our internal folder list */
-
-	if (strcmp(folder->type, "mail") == 0) {
-		mail_local_store_add_folder(global_local_store, folder->physicalUri, path, folder->displayName);
-	} else if (strcmp(folder->type, "vtrash") == 0) {
-		CamelFolderInfo info;
-		CamelURL *url;
-
-		url = camel_url_new(folder->physicalUri, NULL);
-		if (url == NULL) {
-			g_warning("Shell trying to add invalid folder url: %s", folder->physicalUri);
-			return;
-		}
-		if (url->path == NULL || url->path[0] == 0) {
-			g_warning("Shell trying to add invalid folder url: %s", folder->physicalUri);
-			camel_url_free(url);
-			return;
-		}
-
-		memset(&info, 0, sizeof(info));
-		info.full_name = CAMEL_VTRASH_NAME;
-		info.name = folder->displayName;
-		info.url = g_strdup_printf("vtrash:%s", folder->physicalUri);
-		info.unread_message_count = 0;
-		info.path = (char *)path;
-
-		camel_object_trigger_event(global_local_store, "folder_created", &info);
-		g_free(info.url);
-		camel_url_free(url);
-	}
-}
-
-
-static void
-local_storage_removed_folder_cb (EvolutionStorageListener *storage_listener,
-				 const char *path,
-				 void *data)
-{
-	d(printf("Local folder remove:\n"));
-	d(printf(" path = '%s'\n", path));
-
-	mail_local_store_remove_folder(global_local_store, path);
-}
-
-static void
-storage_listener_startup (EvolutionShellClient *shellclient)
-{
-	EvolutionStorageListener *local_storage_listener;
-	GNOME_Evolution_StorageListener corba_local_storage_listener;
-	GNOME_Evolution_Storage corba_storage;
-	CORBA_Environment ev;
-
-	d(printf("---- CALLING STORAGE LISTENER STARTUP ---\n"));
-
-	local_corba_storage = corba_storage = evolution_shell_client_get_local_storage (shellclient);
-	if (corba_storage == CORBA_OBJECT_NIL) {
-		g_warning ("No local storage available from shell client!");
-		return;
-	}
-
-	/* setup to record this store's changes */
-	mail_note_store((CamelStore *)global_local_store, NULL, local_corba_storage, NULL, NULL);
-
-	local_storage_listener = evolution_storage_listener_new ();
-	corba_local_storage_listener = evolution_storage_listener_corba_objref (
-		local_storage_listener);
-
-	/* FIXME: is this supposed to be destroy? */
-	g_signal_connect(local_storage_listener,
-			 "destroyed",
-			 G_CALLBACK (local_storage_destroyed_cb),
-			 corba_storage);
-	g_signal_connect(local_storage_listener,
-			 "new_folder",
-			 G_CALLBACK (local_storage_new_folder_cb),
-			 corba_storage);
-	g_signal_connect(local_storage_listener,
-			 "removed_folder",
-			 G_CALLBACK (local_storage_removed_folder_cb),
-			 corba_storage);
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_Storage_addListener (corba_storage,
-					     corba_local_storage_listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Cannot add a listener to the Local Storage.");
-		CORBA_exception_free (&ev);
-		return;
-	}
-	CORBA_exception_free (&ev);
-}
-
-/* ** The rest ******************************************************************** */
-
-void
-mail_local_storage_startup (EvolutionShellClient *shellclient, const char *evolution_path)
-{
-	mail_local_provider_init ();
-
-	global_local_store = MAIL_LOCAL_STORE(camel_session_get_service (session, "file:/", CAMEL_PROVIDER_STORE, NULL));
-
-	if (!global_local_store) {
-		g_warning ("No local store!");
-		return;
-	}
-
-	storage_listener_startup (shellclient);
-}
-
-
-/*----------------------------------------------------------------------
- * Local folder reconfiguration stuff
- *----------------------------------------------------------------------*/
-
-/*
-   open new
-   copy old->new
-   close old
-   rename old oldsave
-   rename new old
-   open oldsave
-   delete oldsave
-
-   close old
-   rename oldtmp
-   open new
-   open oldtmp
-   copy oldtmp new
-   close oldtmp
-   close oldnew
-
-*/
-
-/* we should have our own progress bar for this */
-
-struct _reconfigure_msg {
-	struct _mail_msg msg;
-
-	char *uri;
-	CamelFolder *folder;
-
-	char *newtype;
-	unsigned int index_body:1;
-	GtkWidget *frame;
-	GtkWidget *apply;
-	GtkWidget *cancel;
-	GtkWidget *check_index_body;
-	GtkOptionMenu *optionlist;
-
-	void (*done)(const char *uri, CamelFolder *folder, void*data);
-	void *done_data;
-};
-
-/* hash table of folders that the user has a reconfig-folder dialog for */
-static GHashTable *reconfigure_folder_hash = NULL;
-
-static char *
-reconfigure_folder_describe (struct _mail_msg *mm, int done)
-{
-	struct _reconfigure_msg *m = (struct _reconfigure_msg *)mm;
-	
-	return g_strdup_printf (_("Changing folder \"%s\" to \"%s\" format"),
-				camel_folder_get_full_name (m->folder),
-				m->newtype);
-}
-
-static void
-reconfigure_folder_reconfigure (struct _mail_msg *mm)
-{
-	struct _reconfigure_msg *m = (struct _reconfigure_msg *)mm;
-
-	d(printf("reconfiguring folder: %s to type %s\n", m->uri, m->newtype));
-	
-	mail_local_folder_reconfigure (MAIL_LOCAL_FOLDER (m->folder), m->newtype, m->index_body, &mm->ex);
-}
-
-static void
-reconfigure_folder_reconfigured (struct _mail_msg *mm)
-{
-	struct _reconfigure_msg *m = (struct _reconfigure_msg *)mm;
-	/*char *uri;*/
-	
-	if (camel_exception_is_set (&mm->ex)) {
-		gnome_error_dialog (_("If you can no longer open this mailbox, then\n"
-				      "you may need to repair it manually."));
-	}
-
-	if (m->done)
-		m->done(m->uri, m->folder, m->done_data);
-}
-
-static void
-reconfigure_folder_free (struct _mail_msg *mm)
-{
-	struct _reconfigure_msg *m = (struct _reconfigure_msg *)mm;
-
-	/* remove this folder from our hash since we are done with it */
-	g_hash_table_remove (reconfigure_folder_hash, m->folder);
-	if (g_hash_table_size (reconfigure_folder_hash) == 0) {
-		/* additional cleanup */
-		g_hash_table_destroy (reconfigure_folder_hash);
-		reconfigure_folder_hash = NULL;
-	}
-
-	if (m->folder)
-		camel_object_unref (m->folder);
-	g_free(m->uri);
-	g_free (m->newtype);
-}
-
-static struct _mail_msg_op reconfigure_folder_op = {
-	reconfigure_folder_describe,
-	reconfigure_folder_reconfigure,
-	reconfigure_folder_reconfigured,
-	reconfigure_folder_free,
-};
-
-static void
-reconfigure_response(GtkDialog *dialog, int button, struct _reconfigure_msg *m)
-{
-	switch(button) {
-	case GTK_RESPONSE_OK: {
-		GtkWidget *menu, *item;
-
-		menu = gtk_option_menu_get_menu(m->optionlist);
-		item = gtk_menu_get_active(GTK_MENU(menu));
-		m->newtype = g_strdup(g_object_get_data ((GObject *)item, "type"));
-		m->index_body = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m->check_index_body));
-
-		gtk_widget_set_sensitive (m->frame, FALSE);
-		gtk_widget_set_sensitive (m->apply, FALSE);
-		gtk_widget_set_sensitive (m->cancel, FALSE);
-		
-		e_thread_put (mail_thread_queued, (EMsg *)m);
-		break; }
-	case GTK_RESPONSE_CANCEL:
-	default:
-		if (m->done)
-			m->done(m->uri, NULL, m->done_data);
-		mail_msg_free ((struct _mail_msg *)m);
-		break;
-	}
-
-	gtk_widget_destroy((GtkWidget *)dialog);
-}
-
-static void
-reconfigure_got_folder(char *uri, CamelFolder *folder, void *data)
-{
-	GladeXML *gui;
-	GtkDialog *gd;
-	struct _reconfigure_msg *m = data;
-	char *title;
-	GList *p;
-	GtkWidget *menu;
-	char *currentformat;
-	int index=0, history=0;
-
-	if (folder == NULL
-	    || !MAIL_IS_LOCAL_FOLDER (folder)) {
-		g_warning ("Trying to reconfigure nonexistant folder");
-		/* error display ? */
-		if (m->done)
-			m->done(uri, NULL, m->done_data);
-		mail_msg_free((struct _mail_msg *)m);
-		return;
-	}
-	
-	if (!reconfigure_folder_hash)
-		reconfigure_folder_hash = g_hash_table_new (NULL, NULL);
-	
-	if ((gd = g_hash_table_lookup (reconfigure_folder_hash, folder))) {
-		gdk_window_raise (GTK_WIDGET (gd)->window);
-		if (m->done)
-			m->done(uri, NULL, m->done_data);
-		mail_msg_free((struct _mail_msg *)m);
-		return;
-	}
-	
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/local-config.glade", "dialog_format", NULL);
-	gd = (GtkDialog *)glade_xml_get_widget (gui, "dialog_format");
-	
-	title = g_strdup_printf (_("Reconfigure /%s"),
-				 camel_folder_get_full_name (folder));
-	gtk_window_set_title (GTK_WINDOW (gd), title);
-	g_free (title);
-
-	m->uri = g_strdup(uri);
-	m->frame = glade_xml_get_widget (gui, "frame_format");
-	m->apply = glade_xml_get_widget (gui, "apply_format");
-	m->cancel = glade_xml_get_widget (gui, "cancel_format");
-	m->optionlist = (GtkOptionMenu *)glade_xml_get_widget (gui, "option_format");
-	m->check_index_body = glade_xml_get_widget (gui, "check_index_body");
-	m->newtype = NULL;
-	m->folder = folder;
-	camel_object_ref(folder);
-	
-	/* dynamically create the folder type list from camel */
-	/* we assume the list is static and never freed */
-	currentformat = MAIL_LOCAL_FOLDER (folder)->meta->format;
-	p = camel_session_list_providers (session, TRUE);
-	menu = gtk_menu_new ();
-	while (p) {
-		CamelProvider *cp = p->data;
-		
-		/* we only want local providers */
-		if (cp->flags & CAMEL_PROVIDER_IS_LOCAL) {
-			GtkWidget *item;
-			char *label;
-			
-			if (!strcmp (cp->protocol, currentformat))
-				history = index;
-			
-			label = g_strdup_printf("%s (%s)", cp->protocol, _(cp->name));
-			item = gtk_menu_item_new_with_label (label);
-			g_free (label);
-			g_object_set_data ((GObject *) item, "type", cp->protocol);
-			gtk_widget_show (item);
-			gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-			index++;
-		}
-		p = p->next;
-	}
-	gtk_option_menu_remove_menu (GTK_OPTION_MENU (m->optionlist));
-	gtk_option_menu_set_menu (GTK_OPTION_MENU(m->optionlist), menu);
-	gtk_option_menu_set_history(GTK_OPTION_MENU(m->optionlist), history);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m->check_index_body), MAIL_LOCAL_FOLDER (folder)->meta->indexed);
-
-	gtk_label_set_text ((GtkLabel *)glade_xml_get_widget (gui, "label_format"),
-			    MAIL_LOCAL_FOLDER (folder)->meta->format);
-	
-	g_signal_connect(gd, "response", G_CALLBACK(reconfigure_response), m);
-	g_object_unref(gui);
-	
-	g_hash_table_insert (reconfigure_folder_hash, (gpointer) folder, (gpointer) gd);
-	
-	gtk_widget_show((GtkWidget *)gd);
-}
-
-void
-mail_local_reconfigure_folder(const char *uri, void (*done)(const char *uri, CamelFolder *folder, void *data), void *done_data)
-{
-	struct _reconfigure_msg *m;
-
-	if (strncmp(uri, "file:", 5) != 0) {
-		e_notice (NULL, GTK_MESSAGE_WARNING,
-			  _("You cannot change the format of a non-local folder."));
-		if (done) 
-			done(uri, NULL, done_data);
-		return;
-	}
-
-	m = mail_msg_new (&reconfigure_folder_op, NULL, sizeof (*m));
-	m->done = done;
-	m->done_data = done_data;
-
-	mail_get_folder(uri, 0, reconfigure_got_folder, m, mail_thread_new);
-}
diff --git a/mail/mail-local.h b/mail/mail-local.h
deleted file mode 100644
index d75356609c..0000000000
--- a/mail/mail-local.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-local.h: Local mailbox support. */
-
-/* 
- * Authors: 
- *  Michael Zucchi 
- *  Dan Winship 
- *
- * Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef _MAIL_LOCAL_H
-#define _MAIL_LOCAL_H
-
-#include "evolution-shell-client.h"
-#include 
-
-void mail_local_storage_startup (EvolutionShellClient *shellclient, const char *evolution_path);
-
-void mail_local_reconfigure_folder(const char *uri, void (*done)(const char *uri, CamelFolder *folder, void *data), void *done_data);
-
-#endif
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
deleted file mode 100644
index adbdbb0828..0000000000
--- a/mail/mail-mt.c
+++ /dev/null
@@ -1,1009 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "folder-browser-factory.h"
-#include "e-util/e-msgport.h"
-#include "camel/camel-operation.h"
-
-#include "evolution-activity-client.h"
-
-#include "mail-config.h"
-#include "camel/camel-url.h"
-#include "mail-session.h"
-#include "mail-mt.h"
-
-#include "component-factory.h"
-
-/*#define MALLOC_CHECK*/
-#define LOG_OPS
-#define LOG_LOCKS
-#define d(x) 
-
-static void set_stop(int sensitive);
-static void mail_operation_status(struct _CamelOperation *op, const char *what, int pc, void *data);
-
-#ifdef LOG_LOCKS
-#define MAIL_MT_LOCK(x) (log_locks?fprintf(log, "%ld: lock " # x "\n", pthread_self()):0, pthread_mutex_lock(&x))
-#define MAIL_MT_UNLOCK(x) (log_locks?fprintf(log, "%ld: unlock " # x "\n", pthread_self()): 0, pthread_mutex_unlock(&x))
-#else
-#define MAIL_MT_LOCK(x) pthread_mutex_lock(&x)
-#define MAIL_MT_UNLOCK(x) pthread_mutex_unlock(&x)
-#endif
-extern EvolutionShellClient *global_shell_client;
-
-/* background operation status stuff */
-struct _mail_msg_priv {
-	int activity_state;	/* sigh sigh sigh, we need to keep track of the state external to the
-				 pointer itself for locking/race conditions */
-	EvolutionActivityClient *activity;
-};
-
-/* This is used for the mail status bar, cheap and easy */
-#include "art/mail-new.xpm"
-
-static GdkPixbuf *progress_icon[2] = { NULL, NULL };
-
-/* mail_msg stuff */
-#ifdef LOG_OPS
-static FILE *log;
-static int log_ops, log_locks, log_init;
-#endif
-
-static unsigned int mail_msg_seq; /* sequence number of each message */
-static GHashTable *mail_msg_active_table; /* table of active messages, must hold mail_msg_lock to access */
-static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER;
-
-pthread_t mail_gui_thread;
-
-MailAsyncEvent *mail_async_event;
-
-static void mail_msg_destroy(EThread *e, EMsg *msg, void *data);
-
-void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size)
-{
-	struct _mail_msg *msg;
-
-	MAIL_MT_LOCK(mail_msg_lock);
-
-#if defined(LOG_OPS) || defined(LOG_LOCKS)
-	if (!log_init) {
-		time_t now = time(0);
-
-		log_init = TRUE;
-		log_ops = getenv("EVOLUTION_MAIL_LOG_OPS") != NULL;
-		log_locks = getenv("EVOLUTION_MAIL_LOG_LOCKS") != NULL;
-		if (log_ops || log_locks) {
-			log = fopen("evolution-mail-ops.log", "w+");
-			if (log) {
-				setvbuf(log, NULL, _IOLBF, 0);
-				fprintf(log, "Started evolution-mail: %s\n", ctime(&now));
-				g_warning("Logging mail operations to evolution-mail-ops.log");
-
-				if (log_ops)
-					fprintf(log, "Logging async operations\n");
-
-				if (log_locks) {
-					fprintf(log, "Logging lock operations, mail_gui_thread = %ld\n\n", mail_gui_thread);
-					fprintf(log, "%ld: lock mail_msg_lock\n", pthread_self());
-				}
-			} else {
-				g_warning ("Could not open log file: %s", strerror(errno));
-				log_ops = log_locks = FALSE;
-			}
-		}
-	}
-#endif
-	msg = g_malloc0(size);
-	msg->ops = ops;
-	msg->seq = mail_msg_seq++;
-	msg->msg.reply_port = reply_port;
-	msg->cancel = camel_operation_new(mail_operation_status, (void *)msg->seq);
-	camel_exception_init(&msg->ex);
-	msg->priv = g_malloc0(sizeof(*msg->priv));
-
-	g_hash_table_insert(mail_msg_active_table, (void *)msg->seq, msg);
-
-	d(printf("New message %p\n", msg));
-
-#ifdef LOG_OPS
-	if (log_ops)
-		fprintf(log, "%p: New\n", msg);
-#endif
-	MAIL_MT_UNLOCK(mail_msg_lock);
-
-	return msg;
-}
-
-/* either destroy the progress (in event_data), or the whole dialogue (in data) */
-static void destroy_objects(CamelObject *o, void *event_data, void *data)
-{
-	if (event_data)
-		g_object_unref(event_data);
-}
-
-#ifdef MALLOC_CHECK
-#include 
-
-static void
-checkmem(void *p)
-{
-	if (p) {
-		int status = mprobe(p);
-
-		switch (status) {
-		case MCHECK_HEAD:
-			printf("Memory underrun at %p\n", p);
-			abort();
-		case MCHECK_TAIL:
-			printf("Memory overrun at %p\n", p);
-			abort();
-		case MCHECK_FREE:
-			printf("Double free %p\n", p);
-			abort();
-		}
-	}
-}
-#endif
-
-void mail_msg_free(void *msg)
-{
-	struct _mail_msg *m = msg;
-	void *activity = NULL;
-
-#ifdef MALLOC_CHECK
-	checkmem(m);
-	checkmem(m->cancel);
-	checkmem(m->priv);
-#endif
-	d(printf("Free message %p\n", msg));
-
-	if (m->ops->destroy_msg)
-		m->ops->destroy_msg(m);
-
-	MAIL_MT_LOCK(mail_msg_lock);
-
-#ifdef LOG_OPS
-	if (log_ops)
-		fprintf(log, "%p: Free  (exception `%s')\n", msg,
-			camel_exception_get_description(&m->ex)?camel_exception_get_description(&m->ex):"None");
-#endif
-	g_hash_table_remove(mail_msg_active_table, (void *)m->seq);
-	pthread_cond_broadcast(&mail_msg_cond);
-
-	/* We need to make sure we dont lose a reference here YUCK YUCK */
-	/* This is tightly integrated with the code in do_op_status,
-	   as it closely relates to the CamelOperation setup in msg_new() above */
-	if (m->priv->activity_state == 1) {
-		m->priv->activity_state = 3; /* tell the other thread
-					      * to free it itself (yuck yuck) */
-		MAIL_MT_UNLOCK(mail_msg_lock);
-		return;
-	} else {
-		activity = m->priv->activity;
-	}
-
-	MAIL_MT_UNLOCK(mail_msg_lock);
-
-	if (m->cancel)
-		camel_operation_unref(m->cancel);
-
-	camel_exception_clear(&m->ex);
-	/*g_free(m->priv->what);*/
-	g_free(m->priv);
-	g_free(m);
-
-	if (activity)
-		mail_async_event_emit(mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc)destroy_objects, NULL, activity, NULL);
-}
-
-/* hash table of ops->dialogue of active errors */
-static GHashTable *active_errors = NULL;
-
-static void error_response(GtkObject *o, int button, void *data)
-{
-	g_hash_table_remove(active_errors, data);
-
-	gtk_widget_destroy((GtkWidget *)o);
-	g_object_unref(o);
-}
-
-void mail_msg_check_error(void *msg)
-{
-	struct _mail_msg *m = msg;
-	char *what = NULL;
-	char *text;
-	GtkDialog *gd;
-	
-#ifdef MALLOC_CHECK
-	checkmem(m);
-	checkmem(m->cancel);
-	checkmem(m->priv);
-#endif
-	
-	/* don't report any errors if we are not in interactive mode */
-	if (!mail_session_get_interactive ())
-		return;
-	
-	if (!camel_exception_is_set(&m->ex)
-	    || m->ex.id == CAMEL_EXCEPTION_USER_CANCEL)
-		return;
-
-	if (active_errors == NULL)
-		active_errors = g_hash_table_new(NULL, NULL);
-
-	if (m->ops->describe_msg)
-		what = m->ops->describe_msg(m, FALSE);
-
-	if (what) {
-		text = g_strdup_printf(_("Error while '%s':\n%s"), what, camel_exception_get_description(&m->ex));
-		g_free (what);
-	} else
-		text = g_strdup_printf(_("Error while performing operation:\n%s"), camel_exception_get_description(&m->ex));
-
-	/* check to see if we have dialogue already running for this operation */
-	/* we key on the operation pointer, which is at least accurate enough
-	   for the operation type, although it could be on a different object. */
-	if (g_hash_table_lookup(active_errors, m->ops)) {
-		g_warning("Error occured while existing dialogue active:\n%s", text);
-		g_free(text);
-		return;
-	}
-
-	gd = (GtkDialog *)gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", text);
-	g_hash_table_insert(active_errors, m->ops, gd);
-	g_signal_connect(gd, "response", G_CALLBACK(error_response), m->ops);
-	gtk_widget_show((GtkWidget *)gd);
-}
-
-void mail_msg_cancel(unsigned int msgid)
-{
-	struct _mail_msg *m;
-
-	MAIL_MT_LOCK(mail_msg_lock);
-	m = g_hash_table_lookup(mail_msg_active_table, (void *)msgid);
-
-	if (m && m->cancel)
-		camel_operation_cancel(m->cancel);
-
-	MAIL_MT_UNLOCK(mail_msg_lock);
-}
-
-
-/* waits for a message to be finished processing (freed)
-   the messageid is from struct _mail_msg->seq */
-void mail_msg_wait(unsigned int msgid)
-{
-	struct _mail_msg *m;
-	int ismain = pthread_self() == mail_gui_thread;
-
-	if (ismain) {
-		MAIL_MT_LOCK(mail_msg_lock);
-		m = g_hash_table_lookup(mail_msg_active_table, (void *)msgid);
-		while (m) {
-			MAIL_MT_UNLOCK(mail_msg_lock);
-			gtk_main_iteration();
-			MAIL_MT_LOCK(mail_msg_lock);
-			m = g_hash_table_lookup(mail_msg_active_table, (void *)msgid);
-		}
-		MAIL_MT_UNLOCK(mail_msg_lock);
-	} else {
-		MAIL_MT_LOCK(mail_msg_lock);
-		m = g_hash_table_lookup(mail_msg_active_table, (void *)msgid);
-		while (m) {
-			pthread_cond_wait(&mail_msg_cond, &mail_msg_lock);
-			m = g_hash_table_lookup(mail_msg_active_table, (void *)msgid);
-		}
-		MAIL_MT_UNLOCK(mail_msg_lock);
-	}
-}
-
-int mail_msg_active(unsigned int msgid)
-{
-	int active;
-
-	MAIL_MT_LOCK(mail_msg_lock);
-	if (msgid == (unsigned int)-1) 
-		active = g_hash_table_size(mail_msg_active_table) > 0;
-	else
-		active = g_hash_table_lookup(mail_msg_active_table, (void *)msgid) != NULL;
-	MAIL_MT_UNLOCK(mail_msg_lock);
-
-	return active;
-}
-
-void mail_msg_wait_all(void)
-{
-	int ismain = pthread_self() == mail_gui_thread;
-
-	if (ismain) {
-		MAIL_MT_LOCK(mail_msg_lock);
-		while (g_hash_table_size(mail_msg_active_table) > 0) {
-			MAIL_MT_UNLOCK(mail_msg_lock);
-			gtk_main_iteration();
-			MAIL_MT_LOCK(mail_msg_lock);
-		}
-		MAIL_MT_UNLOCK(mail_msg_lock);
-	} else {
-		MAIL_MT_LOCK(mail_msg_lock);
-		while (g_hash_table_size(mail_msg_active_table) > 0) {
-			pthread_cond_wait(&mail_msg_cond, &mail_msg_lock);
-		}
-		MAIL_MT_UNLOCK(mail_msg_lock);
-	}
-}
-
-EMsgPort		*mail_gui_port;
-static GIOChannel	*mail_gui_channel;
-static guint		 mail_gui_watch;
-
-/* TODO: Merge these, gui_port2 doesn't do any mail_msg processing on the request (replies, forwards, frees) */
-EMsgPort		*mail_gui_port2;
-static GIOChannel	*mail_gui_channel2;
-static guint		 mail_gui_watch2;
-
-EMsgPort		*mail_gui_reply_port;
-static GIOChannel	*mail_gui_reply_channel;
-
-/* a couple of global threads available */
-EThread *mail_thread_queued;	/* for operations that can (or should) be queued */
-EThread *mail_thread_queued_slow;	/* for operations that can (or should) be queued, but take a long time */
-EThread *mail_thread_new;	/* for operations that should run in a new thread each time */
-
-static gboolean
-mail_msgport_replied(GIOChannel *source, GIOCondition cond, void *d)
-{
-	EMsgPort *port = (EMsgPort *)d;
-	mail_msg_t *m;
-
-	while (( m = (mail_msg_t *)e_msgport_get(port))) {
-
-#ifdef MALLOC_CHECK
-		checkmem(m);
-		checkmem(m->cancel);
-		checkmem(m->priv);
-#endif
-
-#ifdef LOG_OPS
-		if (log_ops)
-			fprintf(log, "%p: Replied to GUI thread (exception `%s'\n", m,
-				camel_exception_get_description(&m->ex)?camel_exception_get_description(&m->ex):"None");
-#endif
-
-		if (m->ops->reply_msg)
-			m->ops->reply_msg(m);
-		mail_msg_check_error(m);
-		mail_msg_free(m);
-	}
-
-	return TRUE;
-}
-
-static gboolean
-mail_msgport_received(GIOChannel *source, GIOCondition cond, void *d)
-{
-	EMsgPort *port = (EMsgPort *)d;
-	mail_msg_t *m;
-
-	while (( m = (mail_msg_t *)e_msgport_get(port))) {
-#ifdef MALLOC_CHECK
-		checkmem(m);
-		checkmem(m->cancel);
-		checkmem(m->priv);
-#endif
-
-#ifdef LOG_OPS
-		if (log_ops)
-			fprintf(log, "%p: Received at GUI thread\n", m);
-#endif
-
-		if (m->ops->receive_msg)
-			m->ops->receive_msg(m);
-		if (m->msg.reply_port)
-			e_msgport_reply((EMsg *)m);
-		else {
-			if (m->ops->reply_msg)
-				m->ops->reply_msg(m);
-			mail_msg_free(m);
-		}
-	}
-
-	return TRUE;
-}
-
-/* Test code, lighterwight, more configurable calls */
-static gboolean
-mail_msgport_received2(GIOChannel *source, GIOCondition cond, void *d)
-{
-	EMsgPort *port = (EMsgPort *)d;
-	mail_msg_t *m;
-
-	while (( m = (mail_msg_t *)e_msgport_get(port))) {
-#ifdef LOG_OPS
-		if (log_ops)
-			fprintf(log, "%p: Received at GUI2 thread\n", m);
-#endif
-
-		if (m->ops->receive_msg)
-			m->ops->receive_msg(m);
-		else
-			mail_msg_free(m);
-	}
-
-	return TRUE;
-}
-
-
-static void
-mail_msg_destroy(EThread *e, EMsg *msg, void *data)
-{
-	mail_msg_t *m = (mail_msg_t *)msg;
-
-#ifdef MALLOC_CHECK
-	checkmem(m);
-	checkmem(m->cancel);
-	checkmem(m->priv);
-#endif	
-
-	mail_msg_free(m);
-}
-
-static void
-mail_msg_received(EThread *e, EMsg *msg, void *data)
-{
-	mail_msg_t *m = (mail_msg_t *)msg;
-
-#ifdef MALLOC_CHECK
-	checkmem(m);
-	checkmem(m->cancel);
-	checkmem(m->priv);
-#endif
-
-	if (m->ops->describe_msg) {
-		char *text = m->ops->describe_msg(m, FALSE);
-
-#ifdef LOG_OPS
-		if (log_ops)
-			fprintf(log, "%p: Received at thread %ld: '%s'\n", m, pthread_self(), text);
-#endif
-
-		d(printf("message received at thread\n"));
-		camel_operation_register(m->cancel);
-		camel_operation_start(m->cancel, "%s", text);
-		g_free(text);
-	}
-#ifdef LOG_OPS
-	else
-		if (log_ops)
-			fprintf(log, "%p: Received at thread %ld\n", m, pthread_self());
-#endif
-
-	if (m->ops->receive_msg) {
-		mail_enable_stop();
-		m->ops->receive_msg(m);
-		mail_disable_stop();
-	}
-
-	if (m->ops->describe_msg) {
-		camel_operation_end(m->cancel);
-		camel_operation_unregister(m->cancel);
-		MAIL_MT_LOCK(mail_msg_lock);
-		camel_operation_unref(m->cancel);
-		m->cancel = NULL;
-		MAIL_MT_UNLOCK(mail_msg_lock);
-	}
-}
-
-void mail_msg_cleanup(void)
-{
-	mail_msg_wait_all();
-
-	e_thread_destroy(mail_thread_queued_slow);
-	e_thread_destroy(mail_thread_queued);
-	e_thread_destroy(mail_thread_new);
-
-	g_io_channel_unref(mail_gui_channel);
-	g_io_channel_unref(mail_gui_reply_channel);
-
-	e_msgport_destroy(mail_gui_port);
-	e_msgport_destroy(mail_gui_reply_port);
-}
-
-void mail_msg_init(void)
-{
-	mail_gui_reply_port = e_msgport_new();
-	mail_gui_reply_channel = g_io_channel_unix_new(e_msgport_fd(mail_gui_reply_port));
-	g_io_add_watch(mail_gui_reply_channel, G_IO_IN, mail_msgport_replied, mail_gui_reply_port);
-
-	mail_gui_port = e_msgport_new();
-	mail_gui_channel = g_io_channel_unix_new(e_msgport_fd(mail_gui_port));
-	mail_gui_watch = g_io_add_watch(mail_gui_channel, G_IO_IN, mail_msgport_received, mail_gui_port);
-
-	/* experimental temporary */
-	mail_gui_port2 = e_msgport_new();
-	mail_gui_channel2 = g_io_channel_unix_new(e_msgport_fd(mail_gui_port2));
-	mail_gui_watch2 = g_io_add_watch(mail_gui_channel2, G_IO_IN, mail_msgport_received2, mail_gui_port2);
-
-
-	mail_thread_queued = e_thread_new(E_THREAD_QUEUE);
-	e_thread_set_msg_destroy(mail_thread_queued, mail_msg_destroy, 0);
-	e_thread_set_msg_received(mail_thread_queued, mail_msg_received, 0);
-	e_thread_set_reply_port(mail_thread_queued, mail_gui_reply_port);
-
-	mail_thread_queued_slow = e_thread_new(E_THREAD_QUEUE);
-	e_thread_set_msg_destroy(mail_thread_queued_slow, mail_msg_destroy, 0);
-	e_thread_set_msg_received(mail_thread_queued_slow, mail_msg_received, 0);
-	e_thread_set_reply_port(mail_thread_queued_slow, mail_gui_reply_port);
-
-	mail_thread_new = e_thread_new(E_THREAD_NEW);
-	e_thread_set_msg_destroy(mail_thread_new, mail_msg_destroy, 0);
-	e_thread_set_msg_received(mail_thread_new, mail_msg_received, 0);
-	e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port);
-	e_thread_set_queue_limit(mail_thread_new, 10);
-
-	mail_msg_active_table = g_hash_table_new(NULL, NULL);
-	mail_gui_thread = pthread_self();
-
-	mail_async_event = mail_async_event_new();
-}
-
-/* ********************************************************************** */
-
-/* locks */
-static pthread_mutex_t status_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* ********************************************************************** */
-
-struct _proxy_msg {
-	struct _mail_msg msg;
-	MailAsyncEvent *ea;
-	mail_async_event_t type;
-
-	pthread_t thread;
-
-	MailAsyncFunc func;
-	void *o;
-	void *event_data;
-	void *data;
-};
-
-static void
-do_async_event(struct _mail_msg *mm)
-{
-	struct _proxy_msg *m = (struct _proxy_msg *)mm;
-
-	m->thread = pthread_self();
-	m->func(m->o, m->event_data, m->data);
-	m->thread = ~0;
-
-	g_mutex_lock(m->ea->lock);
-	m->ea->tasks = g_slist_remove(m->ea->tasks, m);
-	g_mutex_unlock(m->ea->lock);
-}
-
-static int
-idle_async_event(void *mm)
-{
-	do_async_event(mm);
-	mail_msg_free(mm);
-
-	return FALSE;
-}
-
-struct _mail_msg_op async_event_op = {
-	NULL,
-	do_async_event,
-	NULL,
-	NULL,
-};
-
-MailAsyncEvent *mail_async_event_new(void)
-{
-	MailAsyncEvent *ea;
-
-	ea = g_malloc0(sizeof(*ea));
-	ea->lock = g_mutex_new();
-
-	return ea;
-}
-
-int mail_async_event_emit(MailAsyncEvent *ea, mail_async_event_t type, MailAsyncFunc func, void *o, void *event_data, void *data)
-{
-	struct _proxy_msg *m;
-	int id;
-	int ismain = pthread_self() == mail_gui_thread;
-
-	/* we dont have a reply port for this, we dont care when/if it gets executed, just queue it */
-	m = mail_msg_new(&async_event_op, NULL, sizeof(*m));
-	m->func = func;
-	m->o = o;
-	m->event_data = event_data;
-	m->data = data;
-	m->ea = ea;
-	m->type = type;
-	m->thread = ~0;
-	
-	id = m->msg.seq;
-	g_mutex_lock(ea->lock);
-	ea->tasks = g_slist_prepend(ea->tasks, m);
-	g_mutex_unlock(ea->lock);
-
-	/* We use an idle function instead of our own message port only because the
-	   gui message ports's notification buffer might overflow and deadlock us */
-	if (type == MAIL_ASYNC_GUI) {
-		if (ismain)
-			g_idle_add(idle_async_event, m);
-		else
-			e_msgport_put(mail_gui_port, (EMsg *)m);
-	} else
-		e_thread_put(mail_thread_queued, (EMsg *)m);
-
-	return id;
-}
-
-int mail_async_event_destroy(MailAsyncEvent *ea)
-{
-	int id;
-	pthread_t thread = pthread_self();
-	struct _proxy_msg *m;
-
-	g_mutex_lock(ea->lock);
-	while (ea->tasks) {
-		m = ea->tasks->data;
-		id = m->msg.seq;
-		if (m->thread == thread) {
-			g_warning("Destroying async event from inside an event, returning EDEADLK");
-			g_mutex_unlock(ea->lock);
-			errno = EDEADLK;
-			return -1;
-		}
-		g_mutex_unlock(ea->lock);
-		mail_msg_wait(id);
-		g_mutex_lock(ea->lock);
-	}
-	g_mutex_unlock(ea->lock);
-
-	g_mutex_free(ea->lock);
-	g_free(ea);
-
-	return 0;
-}
-
-/* ********************************************************************** */
-
-struct _call_msg {
-	struct _mail_msg msg;
-	mail_call_t type;
-	MailMainFunc func;
-	void *ret;
-	va_list ap;
-};
-
-static void
-do_call(struct _mail_msg *mm)
-{
-	struct _call_msg *m = (struct _call_msg *)mm;
-	void *p1, *p2, *p3, *p4, *p5;
-	int i1;
-	va_list ap;
-
-	G_VA_COPY(ap, m->ap);
-
-	switch(m->type) {
-	case MAIL_CALL_p_p:
-		p1 = va_arg(ap, void *);
-		m->ret = m->func(p1);
-		break;
-	case MAIL_CALL_p_pp:
-		p1 = va_arg(ap, void *);
-		p2 = va_arg(ap, void *);
-		m->ret = m->func(p1, p2);
-		break;
-	case MAIL_CALL_p_ppp:
-		p1 = va_arg(ap, void *);
-		p2 = va_arg(ap, void *);
-		p3 = va_arg(ap, void *);
-		m->ret = m->func(p1, p2, p3);
-		break;
-	case MAIL_CALL_p_pppp:
-		p1 = va_arg(ap, void *);
-		p2 = va_arg(ap, void *);
-		p3 = va_arg(ap, void *);
-		p4 = va_arg(ap, void *);
-		m->ret = m->func(p1, p2, p3, p4);
-		break;
-	case MAIL_CALL_p_ppippp:
-		p1 = va_arg(ap, void *);
-		p2 = va_arg(ap, void *);
-		i1 = va_arg(ap, int);
-		p3 = va_arg(ap, void *);
-		p4 = va_arg(ap, void *);
-		p5 = va_arg(ap, void *);
-		m->ret = m->func(p1, p2, i1, p3, p4, p5);
-		break;
-	}
-}
-
-struct _mail_msg_op mail_call_op = {
-	NULL,
-	do_call,
-	NULL,
-	NULL,
-};
-
-void *mail_call_main(mail_call_t type, MailMainFunc func, ...)
-{
-	struct _call_msg *m;
-	void *ret;
-	va_list ap;
-	EMsgPort *reply = NULL;
-	int ismain = pthread_self() == mail_gui_thread;
-
-	va_start(ap, func);
-
-	if (!ismain)
-		reply = e_msgport_new();
-
-	m = mail_msg_new(&mail_call_op, reply, sizeof(*m));
-	m->type = type;
-	m->func = func;
-	G_VA_COPY(m->ap, ap);
-
-	if (!ismain) {
-		e_msgport_put(mail_gui_port, (EMsg *)m);
-		e_msgport_wait(reply);
-		e_msgport_destroy(reply);
-	} else {
-		do_call(&m->msg);
-	}
-
-	va_end(ap);
-
-	ret = m->ret;
-	mail_msg_free(m);
-	
-	return ret;
-}
-
-/* ********************************************************************** */
-/* locked via status_lock */
-static int busy_state;
-
-static void do_set_busy(struct _mail_msg *mm)
-{
-	if (global_shell_client)
-		set_stop(busy_state > 0);
-}
-
-struct _mail_msg_op set_busy_op = {
-	NULL,
-	do_set_busy,
-	NULL,
-	NULL,
-};
-
-void mail_enable_stop(void)
-{
-	struct _mail_msg *m;
-
-	MAIL_MT_LOCK(status_lock);
-	busy_state++;
-	if (busy_state == 1 && global_shell_client) {
-		m = mail_msg_new(&set_busy_op, NULL, sizeof(*m));
-		e_msgport_put(mail_gui_port, (EMsg *)m);
-	}
-	MAIL_MT_UNLOCK(status_lock);
-}
-
-void mail_disable_stop(void)
-{
-	struct _mail_msg *m;
-
-	MAIL_MT_LOCK(status_lock);
-	busy_state--;
-	if (busy_state == 0 && global_shell_client) {
-		m = mail_msg_new(&set_busy_op, NULL, sizeof(*m));
-		e_msgport_put(mail_gui_port, (EMsg *)m);
-	}
-	MAIL_MT_UNLOCK(status_lock);
-}
-
-/* ******************************************************************************** */
-
-struct _op_status_msg {
-	struct _mail_msg msg;
-
-	struct _CamelOperation *op;
-	char *what;
-	int pc;
-	void *data;
-};
-
-static void do_op_status(struct _mail_msg *mm)
-{
-	struct _op_status_msg *m = (struct _op_status_msg *)mm;
-	struct _mail_msg *msg;
-	struct _mail_msg_priv *data;
-	char *out, *p, *o, c;
-	int pc;
-	EvolutionActivityClient *activity;
-	
-	g_assert (mail_gui_thread == pthread_self ());
-	
-	MAIL_MT_LOCK (mail_msg_lock);
-	
-	msg = g_hash_table_lookup (mail_msg_active_table, m->data);
-
-	/* shortcut processing, i.e. if we have no global_shell_client and no activity, we can't create one */
-	if (msg == NULL || (msg->priv->activity == NULL && global_shell_client == NULL)) {
-		MAIL_MT_UNLOCK (mail_msg_lock);
-		return;
-	}
-	
-	data = msg->priv;
-	
-	out = alloca (strlen (m->what) * 2 + 1);
-	o = out;
-	p = m->what;
-	while ((c = *p++)) {
-		if (c == '%')
-			*o++ = '%';
-		*o++ = c;
-	}
-	*o = 0;
-	
-	pc = m->pc;
-	
-	/* so whats all this crap about:
-	 * When we call activity_client, we have a chance of coming
-	 * back to code that will call mail_msg_new or one of many
-	 * calls which may deadlock us.  So we need to call corba
-	 * outside of the lock.  The activity_state thing is so we can
-	 * properly lock data->activity without having to hold a lock
-	 * ... of course we have to be careful in the free function to
-	 * keep track of it too.
-	 */
-	if (data->activity == NULL && global_shell_client) {
-		char *what;
-		int display;
-		
-		/* its being created/removed?  well leave it be */
-		if (data->activity_state == 1 || data->activity_state == 3) {
-			MAIL_MT_UNLOCK (mail_msg_lock);
-			return;
-		} else {
-			data->activity_state = 1;
-			
-			if (progress_icon[0] == NULL)
-				progress_icon[0] = gdk_pixbuf_new_from_xpm_data ((const char **)mail_new_xpm);
-			
-			MAIL_MT_UNLOCK (mail_msg_lock);
-			if (msg->ops->describe_msg)
-				what = msg->ops->describe_msg (msg, FALSE);
-			else
-				what = _("Working");
-			
-			if (global_shell_client) {
-				activity = evolution_activity_client_new (global_shell_client,
-									  COMPONENT_ID,
-									  progress_icon, what, TRUE,
-									  &display);
-			} else {
-				activity = NULL;
-			}
-			
-			if (msg->ops->describe_msg)
-				g_free (what);
-			
-			MAIL_MT_LOCK (mail_msg_lock);
-			if (data->activity_state == 3) {
-				MAIL_MT_UNLOCK (mail_msg_lock);
-				if (activity)
-					g_object_unref(activity);
-				if (msg->cancel)
-					camel_operation_unref (msg->cancel);
-				camel_exception_clear (&msg->ex);
-				g_free (msg->priv);
-				g_free (msg);
-			} else {
-				data->activity_state = 2;
-				data->activity = activity;
-				MAIL_MT_UNLOCK (mail_msg_lock);
-			}
-			return;
-		}
-	} else if (data->activity) {
-		activity = data->activity;
-		g_object_ref((activity));
-		MAIL_MT_UNLOCK (mail_msg_lock);
-			
-		evolution_activity_client_update (activity, out, (double)(pc/100.0));
-		g_object_unref(activity);
-	} else {
-		MAIL_MT_UNLOCK (mail_msg_lock);
-	}
-}
-
-static void
-do_op_status_free (struct _mail_msg *mm)
-{
-	struct _op_status_msg *m = (struct _op_status_msg *)mm;
-
-	g_free (m->what);
-}
-
-struct _mail_msg_op op_status_op = {
-	NULL,
-	do_op_status,
-	NULL,
-	do_op_status_free,
-};
-
-static void
-mail_operation_status (struct _CamelOperation *op, const char *what, int pc, void *data)
-{
-	struct _op_status_msg *m;
-	
-	d(printf("got operation statys: %s %d%%\n", what, pc));
-
-	if (global_shell_client == NULL)
-		return;
-	
-	m = mail_msg_new(&op_status_op, NULL, sizeof(*m));
-	m->op = op;
-	m->what = g_strdup(what);
-	switch (pc) {
-	case CAMEL_OPERATION_START:
-		pc = 0;
-		break;
-	case CAMEL_OPERATION_END:
-		pc = 100;
-		break;
-	}
-	m->pc = pc;
-	m->data = data;
-	e_msgport_put(mail_gui_port, (EMsg *)m);
-}
-
-/* ******************** */
-
-static void
-set_stop(int sensitive)
-{
-	EList *controls;
-	EIterator *it;
-	static int last = FALSE;
-
-	if (last == sensitive)
-		return;
-
-	controls = folder_browser_factory_get_control_list ();
-	for (it = e_list_get_iterator (controls); e_iterator_is_valid (it); e_iterator_next (it)) {
-		BonoboControl *control;
-		BonoboUIComponent *uic;
-
-		control = BONOBO_CONTROL (e_iterator_get (it));
-		uic = bonobo_control_get_ui_component (control);
-		if (uic == CORBA_OBJECT_NIL || bonobo_ui_component_get_container(uic) == CORBA_OBJECT_NIL)
-			continue;
-
-		bonobo_ui_component_set_prop(uic, "/commands/MailStop", "sensitive", sensitive?"1":"0", NULL);
-	}
-	g_object_unref(it);
-	last = sensitive;
-}
diff --git a/mail/mail-mt.h b/mail/mail-mt.h
deleted file mode 100644
index 11a7166d74..0000000000
--- a/mail/mail-mt.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *
- * Authors: Michael Zucchi 
- *
- * Copyright 2000, Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef _MAIL_MT
-#define _MAIL_MT
-
-#include 
-#include "camel/camel-exception.h"
-#include "e-util/e-msgport.h"
-#include "camel/camel-object.h"
-#include "camel/camel-operation.h"
-
-typedef struct _mail_msg {
-	EMsg msg;		/* parent type */
-	struct _mail_msg_op *ops; /* operation functions */
-	unsigned int seq;	/* seq number for synchronisation */
-	CamelOperation *cancel;	/* a cancellation/status handle */
-	CamelException ex;	/* an initialised camel exception, upto the caller to use this */
-	struct _mail_msg_priv *priv; /* private for internal use */
-} mail_msg_t;
-
-/* callback functions for thread message */
-typedef struct _mail_msg_op {
-	char *(*describe_msg)(struct _mail_msg *msg, int complete);
-
-	void (*receive_msg)(struct _mail_msg *msg);	/* message received */
-	void (*reply_msg)(struct _mail_msg *msg);	/* message replied */
-	void (*destroy_msg)(struct _mail_msg *msg);	/* finalise message */
-} mail_msg_op_t;
-
-/* setup ports */
-void mail_msg_init(void);
-void mail_msg_cleanup (void);
-
-/* allocate a new message */
-void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size);
-void mail_msg_free(void *msg);
-void mail_msg_check_error(void *msg);
-void mail_msg_cancel(unsigned int msgid);
-void mail_msg_wait(unsigned int msgid);
-void mail_msg_wait_all(void);
-int mail_msg_active(unsigned int msgid);
-
-/* request a string/password */
-char *mail_get_password (CamelService *service, const char *prompt,
-			 gboolean secret, gboolean *cache);
-
-/* present information and get an ok (or possibly cancel)
- * "type" is as for gnome_message_box_new();
- */
-gboolean mail_user_message (const char *type, const char *prompt, gboolean allow_cancel);
-
-/* asynchronous event proxies */
-typedef struct _MailAsyncEvent {
-	GMutex *lock;
-	GSList *tasks;
-} MailAsyncEvent;
-
-typedef enum _mail_async_event_t {
-	MAIL_ASYNC_GUI,
-	MAIL_ASYNC_THREAD,
-} mail_async_event_t;
-
-typedef void (*MailAsyncFunc)(void *, void *, void *);
-
-/* create a new async event handler */
-MailAsyncEvent *mail_async_event_new(void);
-/* forward a camel event (or other call) to the gui thread */
-int mail_async_event_emit(MailAsyncEvent *ea, mail_async_event_t type, MailAsyncFunc func, void *, void *, void *);
-/* wait for all outstanding async events to complete */
-int mail_async_event_destroy(MailAsyncEvent *ea);
-
-/* Call a function in the gui thread, wait for it to return, type is the marshaller to use */
-typedef enum {
-	MAIL_CALL_p_p,
-	MAIL_CALL_p_pp,
-	MAIL_CALL_p_ppp,
-	MAIL_CALL_p_pppp,
-	MAIL_CALL_p_ppippp,
-} mail_call_t;
-
-typedef void *(*MailMainFunc)();
-
-void *mail_call_main(mail_call_t type, MailMainFunc func, ...);
-
-/* use with caution.  only works with active message's anyway */
-void mail_enable_stop(void);
-void mail_disable_stop(void);
-
-/* a message port that receives messages in the gui thread, used for sending port */
-extern EMsgPort *mail_gui_port;
-/* a message port that receives messages in the gui thread, used for the reply port */
-extern EMsgPort *mail_gui_reply_port;
-
-/* some globally available threads */
-extern EThread *mail_thread_queued;	/* for operations that can (or should) be queued */
-extern EThread *mail_thread_new;	/* for operations that should run in a new thread each time */
-extern EThread *mail_thread_queued_slow;	/* for operations that can (or should) be queued, but take a long time */
-
-/* The main thread. */
-extern pthread_t mail_gui_thread;
-
-/* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */
-/* Note that almost all objects care about the lifecycle of their events, so this cannot be used */
-extern MailAsyncEvent *mail_async_event;
-
-#endif /* ! _MAIL_MT */
diff --git a/mail/mail-offline-handler.c b/mail/mail-offline-handler.c
deleted file mode 100644
index e9387215e4..0000000000
--- a/mail/mail-offline-handler.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-offline-handler.c
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *   Ettore Perazzoli 
- *   Dan Winship 
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include "mail-offline-handler.h"
-#include "mail.h"
-#include "mail-ops.h"
-
-#include 
-
-#include 
-
-#define PARENT_TYPE bonobo_x_object_get_type ()
-static BonoboXObjectClass *parent_class = NULL;
-
-struct _MailOfflineHandlerPrivate {
-	GHashTable *sync_table;
-};
-
-static gboolean
-service_is_relevant (CamelService *service, gboolean going_offline)
-{
-	if (!(service->provider->flags & CAMEL_PROVIDER_IS_REMOTE) ||
-	    (service->provider->flags & CAMEL_PROVIDER_IS_EXTERNAL))
-		return FALSE;
-
-	if (CAMEL_IS_DISCO_STORE (service) &&
-	    camel_disco_store_status (CAMEL_DISCO_STORE (service)) == CAMEL_DISCO_STORE_OFFLINE)
-			return !going_offline;
-
-	return service->status != CAMEL_SERVICE_DISCONNECTED;
-}
-
-static void
-add_connection (gpointer key, gpointer data, gpointer user_data)
-{
-	CamelService *service = key;
-	GNOME_Evolution_ConnectionList *list = user_data;
-
-	if (!service_is_relevant (service, TRUE))
-		return;
-
-	list->_buffer[list->_length].hostName = CORBA_string_dup (service->url->host);
-	list->_buffer[list->_length].type     = CORBA_string_dup (service->provider->name);
-	list->_length++;
-}
-
-static GNOME_Evolution_ConnectionList *
-create_connection_list (void)
-{
-	GNOME_Evolution_ConnectionList *list;
-
-	list = GNOME_Evolution_ConnectionList__alloc ();
-	list->_length = 0;
-	list->_maximum = mail_storages_count ();
-	list->_buffer = CORBA_sequence_GNOME_Evolution_Connection_allocbuf (list->_maximum);
-
-	mail_storages_foreach (add_connection, list);
-
-	return list;
-}
-
-/* GNOME::Evolution::Offline methods.  */
-
-static CORBA_boolean
-impl__get_isOffline (PortableServer_Servant servant,
-		     CORBA_Environment *ev)
-{
-	return !camel_session_is_online (session);
-}
-
-static void
-impl_prepareForOffline (PortableServer_Servant servant,
-			GNOME_Evolution_ConnectionList **active_connection_list,
-			CORBA_Environment *ev)
-{
-	MailOfflineHandler *offline_handler;
-	MailOfflineHandlerPrivate *priv;
-
-	offline_handler = MAIL_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	*active_connection_list = create_connection_list ();
-}
-
-/* keep track of each sync in progress */
-struct _sync_info {
-	char *uri;		/* uri of folder being synced */
-	CamelOperation *cancel;	/* progress report/cancellation object */
-	GNOME_Evolution_SyncFolderProgressListener listener;
-	int pc;			/* percent complete (0-100) */
-	int lastpc;		/* last percent reported, so we dont overreport */
-	int id;			/* timeout id */
-	GHashTable *table;      /* the hashtable that we're registered in */
-};
-
-static void
-impl_cancelSyncFolder (PortableServer_Servant servant,
-		       const GNOME_Evolution_Folder *folder,
-		       CORBA_Environment *ev)
-{
-	MailOfflineHandler *offline_handler;
-	MailOfflineHandlerPrivate *priv;
-	struct _sync_info *info;
-
-	offline_handler = MAIL_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	info = g_hash_table_lookup(priv->sync_table, folder->physicalUri);
-	if (info)
-		camel_operation_cancel(info->cancel);
-	else
-		g_warning("Shell tried to cancel sync of '%s': no such folder", folder->physicalUri);
-}
-
-static int sync_timeout(struct _sync_info *info)
-{
-	CORBA_Environment ev;
-
-	if (info->pc != info->lastpc) {
-		CORBA_exception_init(&ev);
-		GNOME_Evolution_SyncFolderProgressListener_updateProgress(info->listener, info->pc/100.0, &ev);
-		if (ev._major != CORBA_NO_EXCEPTION)
-			g_warning("Error updating offline progress");
-		CORBA_exception_free(&ev);
-		info->lastpc = info->pc;
-	}
-
-	return TRUE;
-}
-
-static void sync_status(CamelOperation *op, const char *what, int pc, void *data)
-{
-	struct _sync_info *info = data;
-
-	if (pc == CAMEL_OPERATION_START)
-		pc = 0;
-	else if (pc == CAMEL_OPERATION_END)
-		pc = 100;
-
-	info->pc = pc;
-}
-
-static void
-sync_done(const char *uri, void *crap)
-{
-	CORBA_Environment ev;
-	struct _sync_info *info = crap;
-
-	g_source_remove(info->id);
-
-	CORBA_exception_init(&ev);
-	GNOME_Evolution_SyncFolderProgressListener_reportSuccess(info->listener, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_warning("Error sending offline completion: hang likely");
-	CORBA_Object_release(info->listener, &ev);
-	CORBA_exception_free(&ev);
-
-	g_hash_table_remove (info->table, info->uri);
-	g_free(info->uri);
-	camel_operation_unref(info->cancel);
-	g_free(info);
-}
-
-static void
-impl_syncFolder (PortableServer_Servant servant,
-		 const GNOME_Evolution_Folder *folder,
-		 const GNOME_Evolution_SyncFolderProgressListener progress_listener,
-		 CORBA_Environment *ev)
-{
-	MailOfflineHandler *offline_handler;
-	MailOfflineHandlerPrivate *priv;
-	struct _sync_info *info;
-
-	offline_handler = MAIL_OFFLINE_HANDLER(bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	info = g_malloc(sizeof(*info));
-	info->listener = CORBA_Object_duplicate(progress_listener, ev);
-	info->pc = 0;
-	info->uri = g_strdup(folder->physicalUri);
-	info->id = g_timeout_add(500, (GSourceFunc)sync_timeout, info);
-	info->cancel = camel_operation_new(sync_status, info);
-	info->table = priv->sync_table;
-
-	g_hash_table_insert(priv->sync_table, info->uri, info);
-
-	mail_prep_offline(info->uri, info->cancel, sync_done, info);
-}
-
-static void
-went_offline (CamelStore *store, void *data)
-{
-	CORBA_Environment ev;
-	GNOME_Evolution_ConnectionList *connection_list;
-	GNOME_Evolution_OfflineProgressListener listener = data;
-
-	connection_list = create_connection_list ();
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_OfflineProgressListener_updateProgress(listener, connection_list, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION)
-		g_warning ("Error updating offline progress");
-	CORBA_Object_release(listener, &ev);
-
-	CORBA_exception_free (&ev);
-	CORBA_free (connection_list);
-}
-
-static void
-storage_go_offline (gpointer key, gpointer value, gpointer data)
-{
-	CamelStore *store = key;
-	GNOME_Evolution_OfflineProgressListener listener = data;
-	CORBA_Environment ev;
-
-	CORBA_exception_init(&ev);
-	if (service_is_relevant (CAMEL_SERVICE (store), TRUE)) {
-		mail_store_set_offline (store, TRUE, went_offline, CORBA_Object_duplicate(listener, &ev));
-	}
-	CORBA_exception_free(&ev);
-}
-
-static void
-impl_goOffline (PortableServer_Servant servant,
-		const GNOME_Evolution_OfflineProgressListener progress_listener,
-		CORBA_Environment *ev)
-{
-	MailOfflineHandler *offline_handler;
-
-	offline_handler = MAIL_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-
-	/* This will disable further auto-mail-check action. */
-	camel_session_set_online (session, FALSE);
-
-	/* FIXME: If send/receive active, wait for it to finish */
-
-	mail_storages_foreach (storage_go_offline, progress_listener);
-}
-
-static void
-storage_go_online (gpointer key, gpointer value, gpointer data)
-{
-	CamelStore *store = key;
-
-	if (service_is_relevant (CAMEL_SERVICE (store), FALSE)) {
-		mail_store_set_offline (store, FALSE, NULL, NULL);
-		mail_note_store (store, NULL, CORBA_OBJECT_NIL,
-				 NULL, NULL);
-	}
-}
-
-static void
-impl_goOnline (PortableServer_Servant servant,
-	       CORBA_Environment *ev)
-{
-	MailOfflineHandler *offline_handler;
-	MailOfflineHandlerPrivate *priv;
-
-	offline_handler = MAIL_OFFLINE_HANDLER (bonobo_object_from_servant (servant));
-	priv = offline_handler->priv;
-
-	/* Enable auto-mail-checking */
-	camel_session_set_online (session, TRUE);
-
-	mail_storages_foreach (storage_go_online, NULL);
-}
-
-/* GObject methods.  */
-
-static void
-impl_finalise (GObject *object)
-{
-	MailOfflineHandler *offline_handler;
-	MailOfflineHandlerPrivate *priv;
-
-	offline_handler = MAIL_OFFLINE_HANDLER (object);
-	priv = offline_handler->priv;
-	g_hash_table_destroy(priv->sync_table);
-	g_free (priv);
-
-	if (G_OBJECT_CLASS (parent_class)->finalize != NULL)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
-
-/* GTK+ type initialization.  */
-
-static void
-mail_offline_handler_class_init (MailOfflineHandlerClass *klass)
-{
-	GObjectClass *object_class;
-	POA_GNOME_Evolution_Offline__epv *epv;
-
-	object_class = G_OBJECT_CLASS (klass);
-	object_class->finalize = impl_finalise;
-
-	epv = & klass->epv;
-	epv->_get_isOffline    = impl__get_isOffline;
-	epv->prepareForOffline = impl_prepareForOffline;
-	epv->syncFolder        = impl_syncFolder;
-	epv->cancelSyncFolder  = impl_cancelSyncFolder;
-	epv->goOffline         = impl_goOffline;
-	epv->goOnline          = impl_goOnline;
-
-	parent_class = g_type_class_ref(PARENT_TYPE);
-}
-
-static void
-mail_offline_handler_init (MailOfflineHandler *offline_handler)
-{
-	MailOfflineHandlerPrivate *priv;
-
-	priv = g_new (MailOfflineHandlerPrivate, 1);
-	priv->sync_table = g_hash_table_new(g_str_hash, g_str_equal);
-
-	offline_handler->priv = priv;
-}
-
-MailOfflineHandler *
-mail_offline_handler_new (void)
-{
-	MailOfflineHandler *new;
-
-	new = g_object_new(mail_offline_handler_get_type (), NULL);
-
-	return new;
-}
-
-BONOBO_X_TYPE_FUNC_FULL (MailOfflineHandler, GNOME_Evolution_Offline, PARENT_TYPE, mail_offline_handler);
diff --git a/mail/mail-offline-handler.h b/mail/mail-offline-handler.h
deleted file mode 100644
index 375f374005..0000000000
--- a/mail/mail-offline-handler.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-offline-handler.h
- *
- * Copyright (C) 2001  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ettore Perazzoli 
- */
-
-#ifndef _MAIL_OFFLINE_HANDLER_H_
-#define _MAIL_OFFLINE_HANDLER_H_
-
-#include 
-#include "Evolution.h"
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define MAIL_TYPE_OFFLINE_HANDLER			(mail_offline_handler_get_type ())
-#define MAIL_OFFLINE_HANDLER(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), MAIL_TYPE_OFFLINE_HANDLER, MailOfflineHandler))
-#define MAIL_OFFLINE_HANDLER_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), MAIL_TYPE_OFFLINE_HANDLER, MailOfflineHandlerClass))
-#define MAIL_IS_OFFLINE_HANDLER(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), MAIL_TYPE_OFFLINE_HANDLER))
-#define MAIL_IS_OFFLINE_HANDLER_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), MAIL_TYPE_OFFLINE_HANDLER))
-
-
-typedef struct _MailOfflineHandler        MailOfflineHandler;
-typedef struct _MailOfflineHandlerPrivate MailOfflineHandlerPrivate;
-typedef struct _MailOfflineHandlerClass   MailOfflineHandlerClass;
-
-struct _MailOfflineHandler {
-	BonoboXObject parent;
-
-	MailOfflineHandlerPrivate *priv;
-};
-
-struct _MailOfflineHandlerClass {
-	BonoboXObjectClass parent_class;
-
-	POA_GNOME_Evolution_Offline__epv epv;
-};
-
-
-GType             mail_offline_handler_get_type  (void);
-MailOfflineHandler *mail_offline_handler_new       (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _MAIL_OFFLINE_HANDLER_H_ */
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
deleted file mode 100644
index c9de994aaa..0000000000
--- a/mail/mail-ops.c
+++ /dev/null
@@ -1,2296 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-ops.c: callbacks for the mail toolbar/menus */
-
-/* 
- * Authors: Dan Winship 
- *  	    Jeffrey Stedfast 
- *          Peter Williams 
- *          Michael Zucchi 
- *
- * Copyright 2000,2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-/* #include  */
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include "mail.h"
-#include "mail-tools.h"
-#include "mail-ops.h"
-#include "mail-vfolder.h"
-#include "mail-session.h"
-#include "composer/e-msg-composer.h"
-#include "folder-browser.h"
-
-#include "filter/filter-filter.h"
-
-#include "mail-mt.h"
-#include "mail-folder-cache.h"
-
-#define w(x)
-#define d(x) 
-
-/* used for both just filtering a folder + uid's, and for filtering a whole folder */
-/* used both for fetching mail, and for filtering mail */
-struct _filter_mail_msg {
-	struct _mail_msg msg;
-	
-	CamelFolder *source_folder; /* where they come from */
-	GPtrArray *source_uids;	/* uids to copy, or NULL == copy all */
-	CamelUIDCache *cache;  /* UID cache if we are to cache the uids, NULL otherwise */
-	CamelOperation *cancel;
-	CamelFilterDriver *driver;
-	int delete;		/* delete messages after filtering them? */
-	CamelFolder *destination; /* default destination for any messages, NULL for none */
-};
-
-/* since fetching also filters, we subclass the data here */
-struct _fetch_mail_msg {
-	struct _filter_mail_msg fmsg;
-
-	CamelOperation *cancel;	/* we have our own cancellation struct, the other should be empty */
-	int keep;		/* keep on server? */
-
-	char *source_uri;
-
-	void (*done)(char *source, void *data);
-	void *data;
-};
-
-static char *
-filter_folder_describe (struct _mail_msg *mm, int complete)
-{
-	return g_strdup (_("Filtering Folder"));
-}
-
-/* filter a folder, or a subset thereof, uses source_folder/source_uids */
-/* this is shared with fetch_mail */
-static void
-filter_folder_filter (struct _mail_msg *mm)
-{
-	struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm;
-	CamelFolder *folder;
-	GPtrArray *uids, *folder_uids = NULL;
-	
-	if (m->cancel)
-		camel_operation_register (m->cancel);
-	
-	folder = m->source_folder;
-	
-	if (folder == NULL || camel_folder_get_message_count (folder) == 0) {
-		if (m->cancel)
-			camel_operation_unregister (m->cancel);
-		return;
-	}
-	
-	if (m->destination) {
-		camel_folder_freeze (m->destination);
-		camel_filter_driver_set_default_folder (m->driver, m->destination);
-	}
-	
-	camel_folder_freeze (folder);
-	
-	if (m->source_uids)
-		uids = m->source_uids;
-	else
-		folder_uids = uids = camel_folder_get_uids (folder);
-	
-	camel_filter_driver_filter_folder (m->driver, folder, m->cache, uids, m->delete, &mm->ex);
-	camel_filter_driver_flush (m->driver, &mm->ex);
-	
-	if (folder_uids)
-		camel_folder_free_uids (folder, folder_uids);
-	
-	/* sync our source folder */
-	if (!m->cache)
-		camel_folder_sync (folder, FALSE, camel_exception_is_set (&mm->ex) ? NULL : &mm->ex);
-	camel_folder_thaw (folder);
-	
-	if (m->destination)
-		camel_folder_thaw (m->destination);
-
-	/* this may thaw/unref source folders, do it here so we dont do it in the main thread
-	   see also fetch_mail_fetch() below */
-	camel_object_unref(m->driver);
-	m->driver = NULL;
-	
-	if (m->cancel)
-		camel_operation_unregister (m->cancel);
-}
-
-static void
-filter_folder_filtered (struct _mail_msg *mm)
-{
-}
-
-static void
-filter_folder_free (struct _mail_msg *mm)
-{
-	struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm;
-	int i;
-	
-	if (m->source_folder)
-		camel_object_unref (m->source_folder);
-	
-	if (m->source_uids) {
-		for (i = 0; i < m->source_uids->len; i++)
-			g_free (m->source_uids->pdata[i]);
-		
-		g_ptr_array_free (m->source_uids, TRUE);
-	}
-	
-	if (m->cancel)
-		camel_operation_unref (m->cancel);
-	
-	if (m->destination)
-		camel_object_unref (m->destination);
-	
-	if (m->driver)
-		camel_object_unref (m->driver);
-	
-	mail_session_flush_filter_log ();
-}
-
-static struct _mail_msg_op filter_folder_op = {
-	filter_folder_describe,  /* we do our own progress reporting? */
-	filter_folder_filter,
-	filter_folder_filtered,
-	filter_folder_free,
-};
-
-void
-mail_filter_folder (CamelFolder *source_folder, GPtrArray *uids,
-		    const char *type, gboolean notify,
-		    CamelOperation *cancel)
-{
-	struct _filter_mail_msg *m;
-	
-	m = mail_msg_new (&filter_folder_op, NULL, sizeof (*m));
-	m->source_folder = source_folder;
-	camel_object_ref (source_folder);
-	m->source_uids = uids;
-	m->cache = NULL;
-	m->delete = FALSE;
-	if (cancel) {
-		m->cancel = cancel;
-		camel_operation_ref (cancel);
-	}
-	
-	m->driver = camel_session_get_filter_driver (session, type, NULL);
-	
-	if (!notify) {
-		/* FIXME: have a #define NOTIFY_FILTER_NAME macro? */
-		/* the filter name has to stay in sync with mail-session::get_filter_driver */
-		camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification");
-	}
-	
-	e_thread_put (mail_thread_new, (EMsg *)m);
-}
-
-/* convenience function for it */
-void
-mail_filter_on_demand (CamelFolder *folder, GPtrArray *uids)
-{
-	mail_filter_folder (folder, uids, FILTER_SOURCE_INCOMING, FALSE, NULL);
-}
-
-/* ********************************************************************** */
-
-/* Temporary workaround for various issues. Gone before 0.11 */
-static char *
-uid_cachename_hack (CamelStore *store)
-{
-	CamelURL *url = CAMEL_SERVICE (store)->url;
-	char *encoded_url, *filename, *old_location;
-	struct stat st;
-	
-	encoded_url = g_strdup_printf ("pop://%s%s%s@%s/", url->user,
-				       url->authmech ? ";auth=" : "",
-				       url->authmech ? url->authmech : "",
-				       url->host);
-	e_filename_make_safe (encoded_url);
-	
-	filename = g_strdup_printf ("%s/mail/pop3/cache-%s", evolution_dir, encoded_url);
-	
-	/* lame hack, but we can't expect user's to actually migrate
-           their cache files - brain power requirements are too
-           high. */
-	if (stat (filename, &st) == -1) {
-		/* This is either the first time the user has checked
-                   mail with this POP provider or else their cache
-                   file is in the old location... */
-		old_location = g_strdup_printf ("%s/config/cache-%s", evolution_dir, encoded_url);
-		if (stat (old_location, &st) == -1) {
-			/* old location doesn't exist either so use the new location */
-			g_free (old_location);
-		} else {
-			/* old location exists, so I guess we use the old cache file location */
-			g_free (filename);
-			filename = old_location;
-		}
-	}
-	
-	g_free (encoded_url);
-	
-	return filename;
-}
-
-static char *
-fetch_mail_describe (struct _mail_msg *mm, int complete)
-{
-	return g_strdup (_("Fetching Mail"));
-}
-
-static void
-fetch_mail_fetch (struct _mail_msg *mm)
-{
-	struct _fetch_mail_msg *m = (struct _fetch_mail_msg *)mm;
-	struct _filter_mail_msg *fm = (struct _filter_mail_msg *)mm;
-	int i;
-	
-	if (m->cancel)
-		camel_operation_register (m->cancel);
-	
-	if ((fm->destination = mail_tool_get_local_inbox (&mm->ex)) == NULL) {
-		if (m->cancel)
-			camel_operation_unregister (m->cancel);
-		return;
-	}
-	
-	/* FIXME: this should support keep_on_server too, which would then perform a spool
-	   access thingy, right?  problem is matching raw messages to uid's etc. */
-	if (!strncmp (m->source_uri, "mbox:", 5)) {
-		char *path = mail_tool_do_movemail (m->source_uri, &mm->ex);
-		
-		if (path && !camel_exception_is_set (&mm->ex)) {
-			camel_folder_freeze (fm->destination);
-			camel_filter_driver_set_default_folder (fm->driver, fm->destination);
-			camel_filter_driver_filter_mbox (fm->driver, path, m->source_uri, &mm->ex);
-			camel_folder_thaw (fm->destination);
-			
-			if (!camel_exception_is_set (&mm->ex))
-				unlink (path);
-		}
-		g_free (path);
-	} else {
-		CamelFolder *folder = fm->source_folder = mail_tool_get_inbox (m->source_uri, &mm->ex);
-		
-		if (folder) {
-			/* this handles 'keep on server' stuff, if we have any new uid's to copy
-			   across, we need to copy them to a new array 'cause of the way fetch_mail_free works */
-			CamelUIDCache *cache = NULL;
-			char *cachename;
-			
-			cachename = uid_cachename_hack (folder->parent_store);
-			cache = camel_uid_cache_new (cachename);
-			g_free (cachename);
-			
-			if (cache) {
-				GPtrArray *folder_uids, *cache_uids, *uids;
-				
-				folder_uids = camel_folder_get_uids (folder);
-				cache_uids = camel_uid_cache_get_new_uids (cache, folder_uids);
-				if (cache_uids) {
-					/* need to copy this, sigh */
-					fm->source_uids = uids = g_ptr_array_new ();
-					g_ptr_array_set_size (uids, cache_uids->len);
-					for (i = 0; i < cache_uids->len; i++)
-						uids->pdata[i] = g_strdup (cache_uids->pdata[i]);
-					camel_uid_cache_free_uids (cache_uids);
-					
-					fm->cache = cache;
-					filter_folder_filter (mm);
-					
-					/* if we are not to delete the messages or there was an
-					 * exception, save the UID cache */
-					if (!fm->delete || camel_exception_is_set (&mm->ex))
-						camel_uid_cache_save (cache);
-					
-					/* if we are deleting off the server and no exception occured
-					 * then iterate through the folder uids and mark them all
-					 * for deletion. */
-					if (fm->delete && !camel_exception_is_set (&mm->ex)) {
-						camel_folder_freeze (folder);
-						
-						for (i = 0; i < folder_uids->len; i++)
-							camel_folder_delete_message (folder, folder_uids->pdata[i]);
-						
-						/* sync and expunge */
-						camel_folder_sync (folder, TRUE, &mm->ex);
-						
-						camel_folder_thaw (folder);
-					}
-				}
-				camel_uid_cache_destroy (cache);
-				camel_folder_free_uids (folder, folder_uids);
-			} else {
-				filter_folder_filter (mm);
-			}
-			
-			/* we unref the source folder here since we
-			   may now block in finalize (we try to
-			   disconnect cleanly) */
-			camel_object_unref (fm->source_folder);
-			fm->source_folder = NULL;
-		}
-	}
-	
-	if (m->cancel)
-		camel_operation_unregister (m->cancel);
-	
-	/* we unref this here as it may have more work to do (syncing
-	   folders and whatnot) before we are really done */
-	/* should this be cancellable too? (i.e. above unregister above) */
-	if (fm->driver) {
-		camel_object_unref (fm->driver);
-		fm->driver = NULL;
-	}
-}
-
-static void
-fetch_mail_fetched (struct _mail_msg *mm)
-{
-	struct _fetch_mail_msg *m = (struct _fetch_mail_msg *)mm;
-	
-	if (m->done)
-		m->done (m->source_uri, m->data);
-}
-
-static void
-fetch_mail_free (struct _mail_msg *mm)
-{
-	struct _fetch_mail_msg *m = (struct _fetch_mail_msg *)mm;
-	
-	g_free (m->source_uri);
-	if (m->cancel)
-		camel_operation_unref (m->cancel);
-	
-	filter_folder_free (mm);
-}
-
-static struct _mail_msg_op fetch_mail_op = {
-	fetch_mail_describe, /* we do our own progress reporting */
-	fetch_mail_fetch,
-	fetch_mail_fetched,
-	fetch_mail_free,
-};
-
-/* ouch, a 'do everything' interface ... */
-void
-mail_fetch_mail (const char *source, int keep, const char *type, CamelOperation *cancel,
-		 CamelFilterGetFolderFunc get_folder, void *get_data,
-		 CamelFilterStatusFunc *status, void *status_data,
-		 void (*done)(char *source, void *data), void *data)
-{
-	struct _fetch_mail_msg *m;
-	struct _filter_mail_msg *fm;
-	
-	m = mail_msg_new (&fetch_mail_op, NULL, sizeof (*m));
-	fm = (struct _filter_mail_msg *)m;
-	m->source_uri = g_strdup (source);
-	fm->delete = !keep;
-	fm->cache = NULL;
-	if (cancel) {
-		m->cancel = cancel;
-		camel_operation_ref (cancel);
-	}
-	m->done = done;
-	m->data = data;
-	
-	fm->driver = camel_session_get_filter_driver (session, type, NULL);
-	camel_filter_driver_set_folder_func (fm->driver, get_folder, get_data);
-	if (status)
-		camel_filter_driver_set_status_func (fm->driver, status, status_data);
-	
-	e_thread_put (mail_thread_new, (EMsg *)m);
-}
-
-/* ********************************************************************** */
-/* sending stuff */
-/* ** SEND MAIL *********************************************************** */
-
-extern CamelFolder *sent_folder;
-
-static char *normal_recipients[] = {
-	CAMEL_RECIPIENT_TYPE_TO,
-	CAMEL_RECIPIENT_TYPE_CC,
-	CAMEL_RECIPIENT_TYPE_BCC
-};
-
-static char *resent_recipients[] = {
-	CAMEL_RECIPIENT_TYPE_RESENT_TO,
-	CAMEL_RECIPIENT_TYPE_RESENT_CC,
-	CAMEL_RECIPIENT_TYPE_RESENT_BCC
-};
-
-/* send 1 message to a specific transport */
-static void
-mail_send_message (CamelMimeMessage *message, const char *destination,
-		   CamelFilterDriver *driver, CamelException *ex)
-{
-	const MailConfigAccount *account = NULL;
-	const CamelInternetAddress *iaddr;
-	CamelAddress *from, *recipients;
-	CamelMessageInfo *info;
-	CamelTransport *xport = NULL;
-	char *transport_url = NULL;
-	char *sent_folder_uri = NULL;
-	const char *resent_from;
-	CamelFolder *folder;
-	XEvolution *xev;
-	int i;
-	
-	camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer",
-				 "Ximian Evolution " VERSION SUB_VERSION " " VERSION_COMMENT);
-	
-	camel_mime_message_set_date (message, CAMEL_MESSAGE_DATE_CURRENT, 0);
-	
-	xev = mail_tool_remove_xevolution_headers (message);
-	
-	if (xev->account) {
-		char *name;
-		
-		name = g_strstrip (g_strdup (xev->account));
-		account = mail_config_get_account_by_name (name);
-		g_free (name);
-		
-		if (account) {
-			if (account->transport && account->transport->url)
-				transport_url = g_strdup (account->transport->url);
-			
-			sent_folder_uri = g_strdup (account->sent_folder_uri);
-		}
-	}
-	
-	if (!account) {
-		/* default back to these headers */
-		if (xev->transport)
-			transport_url = g_strstrip (g_strdup (xev->transport));
-		
-		if (xev->fcc)
-			sent_folder_uri = g_strstrip (g_strdup (xev->fcc));
-	}
-	
-	xport = camel_session_get_transport (session, transport_url ? transport_url : destination, ex);
-	g_free (transport_url);
-	if (!xport) {
-		mail_tool_restore_xevolution_headers (message, xev);
-		mail_tool_destroy_xevolution (xev);
-		g_free (sent_folder_uri);
-		return;
-	}
-	
-	from = (CamelAddress *) camel_internet_address_new ();
-	resent_from = camel_medium_get_header (CAMEL_MEDIUM (message), "Resent-From");
-	if (resent_from) {
-		camel_address_decode (from, resent_from);
-	} else {
-		iaddr = camel_mime_message_get_from (message);
-		camel_address_copy (from, CAMEL_ADDRESS (iaddr));
-	}
-	
-	recipients = (CamelAddress *) camel_internet_address_new ();
-	for (i = 0; i < 3; i++) {
-		const char *type;
-		
-		type = resent_from ? resent_recipients[i] : normal_recipients[i];
-		iaddr = camel_mime_message_get_recipients (message, type);
-		camel_address_cat (recipients, CAMEL_ADDRESS (iaddr));
-	}
-	
-	camel_transport_send_to (xport, message, from, recipients, ex);
-	camel_object_unref (recipients);
-	camel_object_unref (from);
-	
-	mail_tool_restore_xevolution_headers (message, xev);
-	mail_tool_destroy_xevolution (xev);
-	
-	camel_object_unref (xport);
-	if (camel_exception_is_set (ex)) {
-		g_free (sent_folder_uri);
-		return;
-	}
-	
-	/* post-process */
-	info = camel_message_info_new ();
-	info->flags = CAMEL_MESSAGE_SEEN;
-	
-	if (driver) {
-		camel_filter_driver_filter_message (driver, message, info,
-						    NULL, NULL, NULL, "", ex);
-		
-		if (camel_exception_is_set (ex)) {
-			ExceptionId id;
-			
-			id = camel_exception_get_id (ex);
-			camel_exception_setv (ex, id, "%s\n%s", camel_exception_get_description (ex),
-					      _("However, the message was successfully sent."));
-			
-			camel_message_info_free (info);
-			g_free (sent_folder_uri);
-			
-			return;
-		}
-	}
-	
-	if (sent_folder_uri) {
-		folder = mail_tool_uri_to_folder (sent_folder_uri, 0, NULL);
-		g_free (sent_folder_uri);
-		if (!folder) {
-			/* FIXME */
-			camel_object_ref (sent_folder);
-			folder = sent_folder;
-		}
-	} else {
-		camel_object_ref (sent_folder);
-		folder = sent_folder;
-	}
-	
-	if (folder) {
-		camel_folder_append_message (folder, message, info, NULL, ex);
-		if (camel_exception_is_set (ex)) {
-			ExceptionId id;
-			
-			id = camel_exception_get_id (ex);
-			camel_exception_setv (ex, id, "%s\n%s", camel_exception_get_description (ex),
-					      _("However, the message was successfully sent."));
-		}
-		
-		camel_folder_sync (folder, FALSE, NULL);
-		camel_object_unref (folder);
-	}
-	
-	camel_message_info_free (info);
-}
-
-/* ********************************************************************** */
-
-struct _send_mail_msg {
-	struct _mail_msg msg;
-
-	CamelFilterDriver *driver;
-	char *destination;
-	CamelMimeMessage *message;
-	
-	void (*done)(char *uri, CamelMimeMessage *message, gboolean sent, void *data);
-	void *data;
-};
-
-static char *
-send_mail_desc (struct _mail_msg *mm, int done)
-{
-	struct _send_mail_msg *m = (struct _send_mail_msg *)mm;
-	const char *subject;
-	
-	subject = camel_mime_message_get_subject (m->message);
-	
-	if (subject)
-		return g_strdup_printf (_("Sending \"%s\""), subject);
-	else
-		return g_strdup (_("Sending message"));
-}
-
-static void
-send_mail_send (struct _mail_msg *mm)
-{
-	struct _send_mail_msg *m = (struct _send_mail_msg *)mm;
-	
-	mail_send_message (m->message, m->destination, m->driver, &mm->ex);
-}
-
-static void
-send_mail_sent (struct _mail_msg *mm)
-{
-	struct _send_mail_msg *m = (struct _send_mail_msg *)mm;
-	
-	if (m->done)
-		m->done (m->destination, m->message, !camel_exception_is_set (&mm->ex), m->data);
-}
-
-static void
-send_mail_free (struct _mail_msg *mm)
-{
-	struct _send_mail_msg *m = (struct _send_mail_msg *)mm;
-	
-	camel_object_unref (m->driver);
-	camel_object_unref (m->message);
-	g_free (m->destination);
-}
-
-static struct _mail_msg_op send_mail_op = {
-	send_mail_desc,
-	send_mail_send,
-	send_mail_sent,
-	send_mail_free,
-};
-
-int
-mail_send_mail (const char *uri, CamelMimeMessage *message,
-		void (*done) (char *uri, CamelMimeMessage *message, gboolean sent, void *data),
-		void *data)
-{
-	struct _send_mail_msg *m;
-	int id;
-	
-	m = mail_msg_new (&send_mail_op, NULL, sizeof (*m));
-	m->destination = g_strdup (uri);
-	m->message = message;
-	camel_object_ref (message);
-	m->data = data;
-	m->done = done;
-	
-	id = m->msg.seq;
-	
-	m->driver = camel_session_get_filter_driver (session, FILTER_SOURCE_OUTGOING, NULL);
-	
-	e_thread_put (mail_thread_new, (EMsg *)m);
-	return id;
-}
-
-/* ** SEND MAIL QUEUE ***************************************************** */
-
-struct _send_queue_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *queue;
-	char *destination;
-
-	CamelFilterDriver *driver;
-	CamelOperation *cancel;
-
-	/* we use camelfilterstatusfunc, even though its not the filter doing it */
-	CamelFilterStatusFunc *status;
-	void *status_data;
-
-	void (*done)(char *destination, void *data);
-	void *data;
-};
-
-static void
-report_status (struct _send_queue_msg *m, enum camel_filter_status_t status, int pc, const char *desc, ...)
-{
-	va_list ap;
-	char *str;
-	
-	if (m->status) {
-		va_start (ap, desc);
-		str = g_strdup_vprintf (desc, ap);
-		va_end (ap);
-		m->status (m->driver, status, pc, str, m->status_data);
-		g_free (str);
-	}
-}
-
-static void
-send_queue_send(struct _mail_msg *mm)
-{
-	struct _send_queue_msg *m = (struct _send_queue_msg *)mm;
-	extern CamelFolder *sent_folder; /* FIXME */
-	GPtrArray *uids;
-	int i;
-	
-	d(printf("sending queue\n"));
-	
-	uids = camel_folder_get_uids (m->queue);
-	if (uids == NULL || uids->len == 0)
-		return;
-
-	if (m->cancel)
-		camel_operation_register (m->cancel);
-	
-	for (i = 0; i < uids->len; i++) {
-		CamelMimeMessage *message;
-		CamelMessageInfo *info;
-		int pc = (100 * i) / uids->len;
-		
-		report_status (m, CAMEL_FILTER_STATUS_START, pc, _("Sending message %d of %d"), i+1, uids->len);
-		
-		info = camel_folder_get_message_info (m->queue, uids->pdata[i]);
-		if (info && info->flags & CAMEL_MESSAGE_DELETED)
-			continue;
-		
-		message = camel_folder_get_message (m->queue, uids->pdata[i], &mm->ex);
-		if (camel_exception_is_set (&mm->ex))
-			break;
-		
-		mail_send_message (message, m->destination, m->driver, &mm->ex);
-		
-		if (camel_exception_is_set (&mm->ex))
-			break;
-		
-		camel_folder_set_message_flags (m->queue, uids->pdata[i], CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED);
-	}
-
-	if (camel_exception_is_set (&mm->ex))
-		report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Failed on message %d of %d"), i+1, uids->len);
-	else
-		report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Complete."));
-
-	if (m->driver) {
-		camel_object_unref((CamelObject *)m->driver);
-		m->driver = NULL;
-	}
-		
-	camel_folder_free_uids (m->queue, uids);
-	
-	if (!camel_exception_is_set (&mm->ex))
-		camel_folder_expunge (m->queue, &mm->ex);
-	
-	if (sent_folder)
-		camel_folder_sync (sent_folder, FALSE, NULL);
-	
-	if (m->cancel)
-		camel_operation_unregister (m->cancel);
-}
-
-static void
-send_queue_sent(struct _mail_msg *mm)
-{
-	struct _send_queue_msg *m = (struct _send_queue_msg *)mm;
-
-	if (m->done)
-		m->done(m->destination, m->data);
-}
-
-static void
-send_queue_free(struct _mail_msg *mm)
-{
-	struct _send_queue_msg *m = (struct _send_queue_msg *)mm;
-	
-	if (m->driver)
-		camel_object_unref(m->driver);
-	camel_object_unref(m->queue);
-	g_free(m->destination);
-	if (m->cancel)
-		camel_operation_unref(m->cancel);
-}
-
-static struct _mail_msg_op send_queue_op = {
-	NULL,			/* do our own reporting, as with fetch mail */
-	send_queue_send,
-	send_queue_sent,
-	send_queue_free,
-};
-
-/* same interface as fetch_mail, just 'cause i'm lazy today (and we need to run it from the same spot?) */
-void
-mail_send_queue(CamelFolder *queue, const char *destination,
-		const char *type, CamelOperation *cancel,
-		CamelFilterGetFolderFunc get_folder, void *get_data,
-		CamelFilterStatusFunc *status, void *status_data,
-		void (*done)(char *destination, void *data), void *data)
-{
-	struct _send_queue_msg *m;
-
-	m = mail_msg_new(&send_queue_op, NULL, sizeof(*m));
-	m->queue = queue;
-	camel_object_ref(queue);
-	m->destination = g_strdup(destination);
-	if (cancel) {
-		m->cancel = cancel;
-		camel_operation_ref(cancel);
-	}
-	m->status = status;
-	m->status_data = status_data;
-	m->done = done;
-	m->data = data;
-
-	m->driver = camel_session_get_filter_driver (session, type, NULL);
-	camel_filter_driver_set_folder_func (m->driver, get_folder, get_data);
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-}
-
-/* ** APPEND MESSAGE TO FOLDER ******************************************** */
-
-struct _append_msg {
-	struct _mail_msg msg;
-
-        CamelFolder *folder;
-	CamelMimeMessage *message;
-        CamelMessageInfo *info;
-	char *appended_uid;
-
-	void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, const char *appended_uid, void *data);
-	void *data;
-};
-
-static char *
-append_mail_desc (struct _mail_msg *mm, int done)
-{
-	return g_strdup (_("Saving message to folder"));
-}
-
-static void
-append_mail_append (struct _mail_msg *mm)
-{
-	struct _append_msg *m = (struct _append_msg *)mm;
-
-	camel_mime_message_set_date(m->message, CAMEL_MESSAGE_DATE_CURRENT, 0);
-	camel_folder_append_message(m->folder, m->message, m->info, &m->appended_uid, &mm->ex);
-}
-
-static void
-append_mail_appended (struct _mail_msg *mm)
-{
-	struct _append_msg *m = (struct _append_msg *)mm;
-
-	if (m->done)
-		m->done(m->folder, m->message, m->info, !camel_exception_is_set(&mm->ex), m->appended_uid, m->data);
-}
-
-static void
-append_mail_free (struct _mail_msg *mm)
-{
-	struct _append_msg *m = (struct _append_msg *)mm;
-
-	camel_object_unref(m->message);
-	camel_object_unref(m->folder);
-	g_free (m->appended_uid);
-}
-
-static struct _mail_msg_op append_mail_op = {
-	append_mail_desc,
-	append_mail_append,
-	append_mail_appended,
-	append_mail_free
-};
-
-void
-mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info,
-		  void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, const char *appended_uid, void *data),
-		  void *data)
-{
-	struct _append_msg *m;
-	
-	g_assert(CAMEL_IS_FOLDER (folder));
-	g_assert(CAMEL_IS_MIME_MESSAGE (message));
-	
-	m = mail_msg_new (&append_mail_op, NULL, sizeof (*m));
-	m->folder = folder;
-	camel_object_ref(folder);
-	m->message = message;
-	camel_object_ref(message);
-	m->info = info;
-	
-	m->done = done;
-	m->data = data;
-	
-	e_thread_put (mail_thread_new, (EMsg *)m);
-}
-
-/* ** TRANSFER MESSAGES **************************************************** */
-
-struct _transfer_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *source;
-	GPtrArray *uids;
-	gboolean delete;
-	char *dest_uri;
-	guint32 dest_flags;
-	
-	void (*done)(gboolean ok, void *data);
-	void *data;
-};
-
-static char *
-transfer_messages_desc (struct _mail_msg *mm, int done)
-{
-	struct _transfer_msg *m = (struct _transfer_msg *)mm;
-
-	return g_strdup_printf(m->delete?_("Moving messages to %s"):_("Copying messages to %s"),
-			       m->dest_uri);
-			       
-}
-
-static void
-transfer_messages_transfer (struct _mail_msg *mm)
-{
-	struct _transfer_msg *m = (struct _transfer_msg *)mm;
-	CamelFolder *dest;
-
-	dest = mail_tool_uri_to_folder (m->dest_uri, m->dest_flags, &mm->ex);
-	if (camel_exception_is_set (&mm->ex))
-		return;
-
-	if (dest == m->source) {
-		camel_object_unref(dest);
-		/* no-op */
-		return;
-	}
-
-	camel_folder_freeze (m->source);
-	camel_folder_freeze (dest);
-
-	camel_folder_transfer_messages_to (m->source, m->uids, dest, NULL, m->delete, &mm->ex);
-
-	/* make sure all deleted messages are marked as seen */
-
-	if (m->delete) {
-		int i;
-
-		for (i = 0; i < m->uids->len; i++)
-			camel_folder_set_message_flags (m->source, m->uids->pdata[i], 
-							CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
-	}
-
-	camel_folder_thaw (m->source);
-	camel_folder_thaw (dest);
-	camel_folder_sync (dest, FALSE, NULL);
-	camel_object_unref (dest);
-}
-
-static void
-transfer_messages_transferred (struct _mail_msg *mm)
-{
-	struct _transfer_msg *m = (struct _transfer_msg *)mm;
-	
-	if (m->done)
-		m->done (!camel_exception_is_set (&mm->ex), m->data);
-}
-
-static void
-transfer_messages_free (struct _mail_msg *mm)
-{
-	struct _transfer_msg *m = (struct _transfer_msg *)mm;
-	int i;
-
-	camel_object_unref (m->source);
-	g_free (m->dest_uri);
-	for (i = 0; i < m->uids->len; i++)
-		g_free (m->uids->pdata[i]);
-	g_ptr_array_free (m->uids, TRUE);
-
-}
-
-static struct _mail_msg_op transfer_messages_op = {
-	transfer_messages_desc,
-	transfer_messages_transfer,
-	transfer_messages_transferred,
-	transfer_messages_free,
-};
-
-void
-mail_transfer_messages (CamelFolder *source, GPtrArray *uids,
-			gboolean delete_from_source,
-			const char *dest_uri,
-			guint32 dest_flags,
-			void (*done) (gboolean ok, void *data),
-			void *data)
-{
-	struct _transfer_msg *m;
-	
-	g_assert(CAMEL_IS_FOLDER (source));
-	g_assert(uids != NULL);
-	g_assert(dest_uri != NULL);
-	
-	m = mail_msg_new(&transfer_messages_op, NULL, sizeof(*m));
-	m->source = source;
-	camel_object_ref (source);
-	m->uids = uids;
-	m->delete = delete_from_source;
-	m->dest_uri = g_strdup (dest_uri);
-	m->dest_flags = dest_flags;
-	m->done = done;
-	m->data = data;
-	
-	e_thread_put(mail_thread_queued, (EMsg *)m);
-}
-
-/* ** SCAN SUBFOLDERS ***************************************************** */
-
-struct _get_folderinfo_msg {
-	struct _mail_msg msg;
-
-	CamelStore *store;
-	CamelFolderInfo *info;
-	void (*done)(CamelStore *store, CamelFolderInfo *info, void *data);
-	void *data;
-};
-
-static char *
-get_folderinfo_desc (struct _mail_msg *mm, int done)
-{
-	struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm;
-	char *ret, *name;
-
-	name = camel_service_get_name((CamelService *)m->store, TRUE);
-	ret = g_strdup_printf(_("Scanning folders in \"%s\""), name);
-	g_free(name);
-	return ret;
-}
-
-static void
-add_vtrash_info (CamelStore *store, CamelFolderInfo *info)
-{
-	CamelFolderInfo *fi, *vtrash, *parent;
-	char *uri, *path;
-	CamelURL *url;
-	
-	g_return_if_fail (info != NULL);
-
-	parent = NULL;
-	for (fi = info; fi; fi = fi->sibling) {
-		if (!strcmp (fi->name, CAMEL_VTRASH_NAME))
-			break;
-		parent = fi;
-	}
-	
-	/* create our vTrash URL */
-	url = camel_url_new (info->url, NULL);
-	path = g_strdup_printf ("/%s", CAMEL_VTRASH_NAME);
-	if (url->fragment)
-		camel_url_set_fragment (url, path);
-	else
-		camel_url_set_path (url, path);
-	g_free (path);
-	uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
-	camel_url_free (url);
-	
-	if (fi) {
-		/* We're going to replace the physical Trash folder with our vTrash folder */
-		vtrash = fi;
-		g_free (vtrash->full_name);
-		g_free (vtrash->name);
-		g_free (vtrash->url);
-	} else {
-		/* There wasn't a Trash folder so create a new folder entry */
-		vtrash = g_new0 (CamelFolderInfo, 1);
-
-		g_assert(parent != NULL);
-
-		/* link it into the right spot */
-		vtrash->sibling = parent->sibling;
-		parent->sibling = vtrash;
-	}
-	
-	/* Fill in the new fields */
-	vtrash->full_name = g_strdup (_("Trash"));
-	vtrash->name = g_strdup(vtrash->full_name);
-	vtrash->url = g_strdup_printf ("vtrash:%s", uri);
-	vtrash->unread_message_count = -1;
-	vtrash->path = g_strdup_printf("/%s", vtrash->name);
-	g_free (uri);
-}
-
-static void
-add_unmatched_info(CamelFolderInfo *fi)
-{
-	for (; fi; fi = fi->sibling) {
-		if (!strcmp(fi->full_name, CAMEL_UNMATCHED_NAME)) {
-			g_free(fi->name);
-			fi->name = g_strdup(_("Unmatched"));
-			g_free(fi->path);
-			fi->path = g_strdup_printf("/%s", fi->name);
-			break;
-		}
-	}
-}
-
-static void
-get_folderinfo_get (struct _mail_msg *mm)
-{
-	struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm;
-	guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE;
-	
-	if (camel_store_supports_subscriptions (m->store))
-		flags |= CAMEL_STORE_FOLDER_INFO_SUBSCRIBED;
-	
-	m->info = camel_store_get_folder_info (m->store, NULL, flags, &mm->ex);
-	if (m->info) {
-		if (m->info->url && (m->store->flags & CAMEL_STORE_VTRASH))
-			add_vtrash_info(m->store, m->info);
-		if (CAMEL_IS_VEE_STORE(m->store))
-			add_unmatched_info(m->info);
-	}
-}
-
-static void
-get_folderinfo_got (struct _mail_msg *mm)
-{
-	struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm;
-	
-	if (camel_exception_is_set (&mm->ex)) {
-		char *url;
-		
-		url = camel_service_get_url (CAMEL_SERVICE (m->store));
-		w(g_warning ("Error getting folder info from store at %s: %s",
-			     url, camel_exception_get_description (&mm->ex)));
-		g_free (url);
-	}
-	
-	/* 'done' is probably guaranteed to fail, but... */
-	
-	if (m->done)
-		m->done (m->store, m->info, m->data);
-}
-
-static void
-get_folderinfo_free (struct _mail_msg *mm)
-{
-	struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm;
-
-	if (m->info)
-		camel_store_free_folder_info(m->store, m->info);
-	camel_object_unref(m->store);
-}
-
-static struct _mail_msg_op get_folderinfo_op = {
-	get_folderinfo_desc,
-	get_folderinfo_get,
-	get_folderinfo_got,
-	get_folderinfo_free,
-};
-
-int
-mail_get_folderinfo (CamelStore *store, void (*done)(CamelStore *store, CamelFolderInfo *info, void *data), void *data)
-{
-	struct _get_folderinfo_msg *m;
-	int id;
-
-	m = mail_msg_new(&get_folderinfo_op, NULL, sizeof(*m));
-	m->store = store;
-	camel_object_ref(store);
-	m->done = done;
-	m->data = data;
-	id = m->msg.seq;
-
-	e_thread_put(mail_thread_queued, (EMsg *)m);
-
-	return id;
-}
-
-/* ** ATTACH MESSAGES ****************************************************** */
-
-struct _build_data {
-	void (*done)(CamelFolder *folder, GPtrArray *uids, CamelMimePart *part, char *subject, void *data);
-	void *data;
-};
-
-static void
-do_build_attachment (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void *data)
-{
-	struct _build_data *d = data;
-	CamelMultipart *multipart;
-	CamelMimePart *part;
-	char *subject;
-	int i;
-
-	if (messages->len == 0) {
-		d->done(folder, messages, NULL, NULL, d->data);
-		g_free(d);
-		return;
-	}
-
-	if (messages->len == 1) {
-		part = mail_tool_make_message_attachment(messages->pdata[0]);
-	} else {
-		multipart = camel_multipart_new();
-		camel_data_wrapper_set_mime_type(CAMEL_DATA_WRAPPER (multipart), "multipart/digest");
-		camel_multipart_set_boundary(multipart, NULL);
-
-		for (i=0;ilen;i++) {
-			part = mail_tool_make_message_attachment(messages->pdata[i]);
-			camel_multipart_add_part(multipart, part);
-			camel_object_unref(part);
-		}
-		part = camel_mime_part_new();
-		camel_medium_set_content_object(CAMEL_MEDIUM (part), CAMEL_DATA_WRAPPER(multipart));
-		camel_object_unref(multipart);
-
-		camel_mime_part_set_description(part, _("Forwarded messages"));
-	}
-
-	subject = mail_tool_generate_forward_subject(messages->pdata[0]);
-	d->done(folder, messages, part, subject, d->data);
-	g_free(subject);
-	camel_object_unref(part);
-
-	g_free(d);
-}
-
-void
-mail_build_attachment(CamelFolder *folder, GPtrArray *uids,
-		      void (*done)(CamelFolder *folder, GPtrArray *messages, CamelMimePart *part, char *subject, void *data), void *data)
-{
-	struct _build_data *d;
-
-	d = g_malloc(sizeof(*d));
-	d->done = done;
-	d->data = data;
-	mail_get_messages(folder, uids, do_build_attachment, d);
-}
-
-/* ** LOAD FOLDER ********************************************************* */
-
-/* there should be some way to merge this and create folder, since both can
-   presumably create a folder ... */
-
-struct _get_folder_msg {
-	struct _mail_msg msg;
-	
-	char *uri;
-	guint32 flags;
-	CamelFolder *folder;
-	void (*done) (char *uri, CamelFolder *folder, void *data);
-	void *data;
-};
-
-static char *
-get_folder_desc (struct _mail_msg *mm, int done)
-{
-	struct _get_folder_msg *m = (struct _get_folder_msg *)mm;
-	
-	return g_strdup_printf(_("Opening folder %s"), m->uri);
-}
-
-static void
-get_folder_get (struct _mail_msg *mm)
-{
-	struct _get_folder_msg *m = (struct _get_folder_msg *)mm;
-	
-	m->folder = mail_tool_uri_to_folder (m->uri, m->flags, &mm->ex);
-}
-
-static void
-get_folder_got (struct _mail_msg *mm)
-{
-	struct _get_folder_msg *m = (struct _get_folder_msg *)mm;
-	
-	if (m->done)
-		m->done (m->uri, m->folder, m->data);
-}
-
-static void
-get_folder_free (struct _mail_msg *mm)
-{
-	struct _get_folder_msg *m = (struct _get_folder_msg *)mm;
-	
-	g_free (m->uri);
-	if (m->folder)
-		camel_object_unref (m->folder);
-}
-
-static struct _mail_msg_op get_folder_op = {
-	get_folder_desc,
-	get_folder_get,
-	get_folder_got,
-	get_folder_free,
-};
-
-int
-mail_get_folder (const char *uri, guint32 flags,
-		 void (*done)(char *uri, CamelFolder *folder, void *data),
-		 void *data, EThread *thread)
-{
-	struct _get_folder_msg *m;
-	int id;
-	
-	m = mail_msg_new(&get_folder_op, NULL, sizeof(*m));
-	m->uri = g_strdup (uri);
-	m->flags = flags;
-	m->data = data;
-	m->done = done;
-	
-	id = m->msg.seq;
-	e_thread_put(thread, (EMsg *)m);
-	return id;
-}
-
-/* ** GET STORE ******************************************************* */
-
-struct _get_store_msg {
-	struct _mail_msg msg;
-
-	char *uri;
-	CamelStore *store;
-	void (*done) (char *uri, CamelStore *store, void *data);
-	void *data;
-};
-
-static char *
-get_store_desc (struct _mail_msg *mm, int done)
-{
-	struct _get_store_msg *m = (struct _get_store_msg *)mm;
-	
-	return g_strdup_printf(_("Opening store %s"), m->uri);
-}
-
-static void
-get_store_get (struct _mail_msg *mm)
-{
-	struct _get_store_msg *m = (struct _get_store_msg *)mm;
-	
-	/*camel_session_get_store connects us, which we don't want to do on startup. */
-
-	m->store = (CamelStore *) camel_session_get_service (session, m->uri,
-							     CAMEL_PROVIDER_STORE,
-							     &mm->ex);
-}
-
-static void
-get_store_got (struct _mail_msg *mm)
-{
-	struct _get_store_msg *m = (struct _get_store_msg *)mm;
-
-	if (m->done)
-		m->done (m->uri, m->store, m->data);
-}
-
-static void
-get_store_free (struct _mail_msg *mm)
-{
-	struct _get_store_msg *m = (struct _get_store_msg *)mm;
-	
-	g_free (m->uri);
-	if (m->store)
-		camel_object_unref (m->store);
-}
-
-static struct _mail_msg_op get_store_op = {
-	get_store_desc,
-	get_store_get,
-	get_store_got,
-	get_store_free,
-};
-
-int
-mail_get_store (const char *uri, void (*done) (char *uri, CamelStore *store, void *data), void *data)
-{
-	struct _get_store_msg *m;
-	int id;
-	
-	m = mail_msg_new (&get_store_op, NULL, sizeof (*m));
-	m->uri = g_strdup (uri);
-	m->data = data;
-	m->done = done;
-	
-	id = m->msg.seq;
-	e_thread_put (mail_thread_new, (EMsg *)m);
-	return id;
-}
-
-/* ** REMOVE FOLDER ******************************************************* */
-
-struct _remove_folder_msg {
-	struct _mail_msg msg;
-
-	char *uri;
-	gboolean removed;
-	void (*done) (char *uri, gboolean removed, void *data);
-	void *data;
-};
-
-static char *
-remove_folder_desc (struct _mail_msg *mm, int done)
-{
-	struct _remove_folder_msg *m = (struct _remove_folder_msg *)mm;
-	
-	return g_strdup_printf (_("Removing folder %s"), m->uri);
-}
-
-static void
-remove_folder_get (struct _mail_msg *mm)
-{
-	struct _remove_folder_msg *m = (struct _remove_folder_msg *)mm;
-	CamelStore *store;
-	CamelFolder *folder;
-	GPtrArray *uids;
-	int i;
-	
-	m->removed = FALSE;
-	
-	folder = mail_tool_uri_to_folder (m->uri, 0, &mm->ex);
-	if (!folder)
-		return;
-	
-	store = folder->parent_store;
-	
-	/* Delete every message in this folder, then expunge it */
-	uids = camel_folder_get_uids (folder);
-	camel_folder_freeze(folder);
-	for (i = 0; i < uids->len; i++)
-		camel_folder_delete_message (folder, uids->pdata[i]);
-	camel_folder_sync (folder, TRUE, NULL);
-	camel_folder_thaw(folder);
-	camel_folder_free_uids (folder, uids);
-	
-	/* if the store supports subscriptions, unsubscribe from this folder... */
-	if (camel_store_supports_subscriptions (store))
-		camel_store_unsubscribe_folder (store, folder->full_name, NULL);
-	
-	/* Then delete the folder from the store */
-	camel_store_delete_folder (store, folder->full_name, &mm->ex);
-	m->removed = !camel_exception_is_set (&mm->ex);
-	camel_object_unref (folder);
-}
-
-static void
-remove_folder_got (struct _mail_msg *mm)
-{
-	struct _remove_folder_msg *m = (struct _remove_folder_msg *)mm;
-
-	if (m->removed) {
-		/* FIXME: Remove this folder from the folder cache ??? */
-	}
-
-	if (m->done)
-		m->done (m->uri, m->removed, m->data);
-}
-
-static void
-remove_folder_free (struct _mail_msg *mm)
-{
-	struct _remove_folder_msg *m = (struct _remove_folder_msg *)mm;
-	
-	g_free (m->uri);
-}
-
-static struct _mail_msg_op remove_folder_op = {
-	remove_folder_desc,
-	remove_folder_get,
-	remove_folder_got,
-	remove_folder_free,
-};
-
-void
-mail_remove_folder (const char *uri, void (*done) (char *uri, gboolean removed, void *data), void *data)
-{
-	struct _remove_folder_msg *m;
-	
-	m = mail_msg_new (&remove_folder_op, NULL, sizeof (*m));
-	m->uri = g_strdup (uri);
-	m->data = data;
-	m->done = done;
-	
-	e_thread_put (mail_thread_new, (EMsg *)m);
-}
-
-/* ** SYNC FOLDER ********************************************************* */
-
-struct _sync_folder_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *folder;
-	void (*done) (CamelFolder *folder, void *data);
-	void *data;
-};
-
-static char *sync_folder_desc(struct _mail_msg *mm, int done)
-{
-	struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm;
-
-	return g_strdup_printf (_("Storing folder \'%s\'"), 
-			       camel_folder_get_full_name (m->folder));
-}
-
-static void sync_folder_sync(struct _mail_msg *mm)
-{
-	struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm;
-
-	camel_folder_sync(m->folder, FALSE, &mm->ex);
-}
-
-static void sync_folder_synced(struct _mail_msg *mm)
-{
-	struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm;
-
-	if (m->done)
-		m->done(m->folder, m->data);
-}
-
-static void sync_folder_free(struct _mail_msg *mm)
-{
-	struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm;
-
-	camel_object_unref((CamelObject *)m->folder);
-}
-
-static struct _mail_msg_op sync_folder_op = {
-	sync_folder_desc,
-	sync_folder_sync,
-	sync_folder_synced,
-	sync_folder_free,
-};
-
-void
-mail_sync_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, void *data), void *data)
-{
-	struct _sync_folder_msg *m;
-
-	m = mail_msg_new(&sync_folder_op, NULL, sizeof(*m));
-	m->folder = folder;
-	camel_object_ref(folder);
-	m->data = data;
-	m->done = done;
-
-	e_thread_put(mail_thread_queued, (EMsg *)m);
-}
-
-/* ******************************************************************************** */
-
-static char *refresh_folder_desc(struct _mail_msg *mm, int done)
-{
-	return g_strdup(_("Refreshing folder"));
-}
-
-static void refresh_folder_refresh(struct _mail_msg *mm)
-{
-	struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm;
-
-	camel_folder_refresh_info(m->folder, &mm->ex);
-}
-
-/* we just use the sync stuff where we can, since it would be the same */
-static struct _mail_msg_op refresh_folder_op = {
-	refresh_folder_desc,
-	refresh_folder_refresh,
-	sync_folder_synced,
-	sync_folder_free,
-};
-
-void
-mail_refresh_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, void *data), void *data)
-{
-	struct _sync_folder_msg *m;
-
-	m = mail_msg_new(&refresh_folder_op, NULL, sizeof(*m));
-	m->folder = folder;
-	camel_object_ref(folder);
-	m->data = data;
-	m->done = done;
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-}
-
-/* ******************************************************************************** */
-
-static char *expunge_folder_desc(struct _mail_msg *mm, int done)
-{
-	return g_strdup(_("Expunging folder"));
-}
-
-static void expunge_folder_expunge(struct _mail_msg *mm)
-{
-	struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm;
-
-	camel_folder_expunge(m->folder, &mm->ex);
-}
-
-/* we just use the sync stuff where we can, since it would be the same */
-static struct _mail_msg_op expunge_folder_op = {
-	expunge_folder_desc,
-	expunge_folder_expunge,
-	sync_folder_synced,
-	sync_folder_free,
-};
-
-void
-mail_expunge_folder(CamelFolder *folder, void (*done) (CamelFolder *folder, void *data), void *data)
-{
-	struct _sync_folder_msg *m;
-
-	m = mail_msg_new(&expunge_folder_op, NULL, sizeof(*m));
-	m->folder = folder;
-	camel_object_ref(folder);
-	m->data = data;
-	m->done = done;
-
-	e_thread_put(mail_thread_queued, (EMsg *)m);
-}
-
-/* ** GET MESSAGE(s) ***************************************************** */
-
-struct _get_message_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *folder;
-	char *uid;
-	void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data);
-	void *data;
-	CamelMimeMessage *message;
-	CamelOperation *cancel;
-};
-
-static char *get_message_desc(struct _mail_msg *mm, int done)
-{
-	struct _get_message_msg *m = (struct _get_message_msg *)mm;
-
-	return g_strdup_printf(_("Retrieving message %s"), m->uid);
-}
-
-static void get_message_get(struct _mail_msg *mm)
-{
-	struct _get_message_msg *m = (struct _get_message_msg *)mm;
-
-	m->message = camel_folder_get_message(m->folder, m->uid, &mm->ex);
-}
-
-static void get_message_got(struct _mail_msg *mm)
-{
-	struct _get_message_msg *m = (struct _get_message_msg *)mm;
-
-	if (m->done)
-		m->done(m->folder, m->uid, m->message, m->data);
-}
-
-static void get_message_free(struct _mail_msg *mm)
-{
-	struct _get_message_msg *m = (struct _get_message_msg *)mm;
-	
-	g_free (m->uid);
-	camel_object_unref (m->folder);
-	camel_operation_unref (m->cancel);
-	
-	if (m->message)
-		camel_object_unref (m->message);
-}
-
-static struct _mail_msg_op get_message_op = {
-	get_message_desc,
-	get_message_get,
-	get_message_got,
-	get_message_free,
-};
-
-void
-mail_get_message(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid,
-								     CamelMimeMessage *msg, void *data),
-		 void *data, EThread *thread)
-{
-	struct _get_message_msg *m;
-	
-	m = mail_msg_new(&get_message_op, NULL, sizeof(*m));
-	m->folder = folder;
-	camel_object_ref(folder);
-	m->uid = g_strdup(uid);
-	m->data = data;
-	m->done = done;
-	m->cancel = camel_operation_new(NULL, NULL);
-	
-	e_thread_put(thread, (EMsg *)m);
-}
-
-/* ********************************************************************** */
-
-struct _get_messages_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *folder;
-	GPtrArray *uids;
-	GPtrArray *messages;
-
-	void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, void *data);
-	void *data;
-};
-
-static char * get_messages_desc(struct _mail_msg *mm, int done)
-{
-	struct _get_messages_msg *m = (struct _get_messages_msg *)mm;
-
-	return g_strdup_printf(_("Retrieving %d message(s)"), m->uids->len);
-}
-
-static void get_messages_get(struct _mail_msg *mm)
-{
-	struct _get_messages_msg *m = (struct _get_messages_msg *)mm;
-	int i;
-	CamelMimeMessage *message;
-
-	for (i=0; iuids->len; i++) {
-		int pc = ((i+1) * 100) / m->uids->len;
-
-		message = camel_folder_get_message(m->folder, m->uids->pdata[i], &mm->ex);
-		camel_operation_progress(mm->cancel, pc);
-		if (message == NULL)
-			break;
-
-		g_ptr_array_add(m->messages, message);
-	}
-}
-
-static void get_messages_got(struct _mail_msg *mm)
-{
-	struct _get_messages_msg *m = (struct _get_messages_msg *)mm;
-
-	if (m->done)
-		m->done(m->folder, m->uids, m->messages, m->data);
-}
-
-static void get_messages_free(struct _mail_msg *mm)
-{
-	struct _get_messages_msg *m = (struct _get_messages_msg *)mm;
-	int i;
-
-	for (i=0;iuids->len;i++)
-		g_free(m->uids->pdata[i]);
-	g_ptr_array_free(m->uids, TRUE);
-	for (i=0;imessages->len;i++) {
-		if (m->messages->pdata[i])
-			camel_object_unref(m->messages->pdata[i]);
-	}
-	g_ptr_array_free(m->messages, TRUE);
-	camel_object_unref(m->folder);
-}
-
-static struct _mail_msg_op get_messages_op = {
-	get_messages_desc,
-	get_messages_get,
-	get_messages_got,
-	get_messages_free,
-};
-
-void
-mail_get_messages(CamelFolder *folder, GPtrArray *uids,
-		  void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, void *data),
-		  void *data)
-{
-	struct _get_messages_msg *m;
-
-	m = mail_msg_new(&get_messages_op, NULL, sizeof(*m));
-	m->folder = folder;
-	camel_object_ref(folder);
-	m->uids = uids;
-	m->messages = g_ptr_array_new();
-	m->data = data;
-	m->done = done;
-
-	e_thread_put(mail_thread_new, (EMsg *)m);
-}
-
-/* ** SAVE MESSAGES ******************************************************* */
-
-struct _save_messages_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *folder;
-	GPtrArray *uids;
-	char *path;
-	void (*done)(CamelFolder *folder, GPtrArray *uids, char *path, void *data);
-	void *data;
-};
-
-static char *save_messages_desc(struct _mail_msg *mm, int done)
-{
-	struct _save_messages_msg *m = (struct _save_messages_msg *)mm;
-
-	return g_strdup_printf(_("Saving %d messsage(s)"), m->uids->len);
-}
-
-/* tries to build a From line, based on message headers */
-/* this is a copy directly from camel-mbox-summary.c */
-
-static char *tz_months[] = {
-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-};
-
-static char *tz_days[] = {
-	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-
-static char *
-build_from(struct _header_raw *header)
-{
-	GString *out = g_string_new("From ");
-	char *ret;
-	const char *tmp;
-	time_t thetime;
-	int offset;
-	struct tm tm;
-	
-	tmp = header_raw_find (&header, "Sender", NULL);
-	if (tmp == NULL)
-		tmp = header_raw_find (&header, "From", NULL);
-	if (tmp != NULL) {
-		struct _header_address *addr = header_address_decode (tmp);
-		
-		tmp = NULL;
-		if (addr) {
-			if (addr->type == HEADER_ADDRESS_NAME) {
-				g_string_append (out, addr->v.addr);
-				tmp = "";
-			}
-			header_address_unref (addr);
-		}
-	}
-	
-	if (tmp == NULL)
-		g_string_append (out, "unknown@nodomain.now.au");
-	
-	/* try use the received header to get the date */
-	tmp = header_raw_find (&header, "Received", NULL);
-	if (tmp) {
-		tmp = strrchr(tmp, ';');
-		if (tmp)
-			tmp++;
-	}
-	
-	/* if there isn't one, try the Date field */
-	if (tmp == NULL)
-		tmp = header_raw_find (&header, "Date", NULL);
-	
-	thetime = header_decode_date (tmp, &offset);
-	thetime += ((offset / 100) * (60 * 60)) + (offset % 100) * 60;
-	gmtime_r (&thetime, &tm);
-	g_string_append_printf (out, " %s %s %d %02d:%02d:%02d %4d\n",
-				tz_days[tm.tm_wday], tz_months[tm.tm_mon],
-				tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
-				tm.tm_year + 1900);
-	
-	ret = out->str;
-	g_string_free (out, FALSE);
-	
-	return ret;
-}
-
-static void
-save_prepare_part (CamelMimePart *mime_part)
-{
-	CamelDataWrapper *wrapper;
-	int parts, i;
-	
-	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));
-	if (!wrapper)
-		return;
-	
-	if (CAMEL_IS_MULTIPART (wrapper)) {
-		parts = camel_multipart_get_number (CAMEL_MULTIPART (wrapper));
-		for (i = 0; i < parts; i++) {
-			CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (wrapper), i);
-			
-			save_prepare_part (part);
-		}
-	} else {
-		if (CAMEL_IS_MIME_MESSAGE (wrapper)) {
-			/* prepare the message parts' subparts */
-			save_prepare_part (CAMEL_MIME_PART (wrapper));
-		} else {
-			CamelContentType *type;
-			
-			/* We want to save textual parts as 8bit instead of encoded */
-			type = camel_data_wrapper_get_mime_type_field (wrapper);
-			if (header_content_type_is (type, "text", "*"))
-				camel_mime_part_set_encoding (mime_part, CAMEL_MIME_PART_ENCODING_8BIT);
-		}
-	}
-}
-
-static void
-save_messages_save (struct _mail_msg *mm)
-{
-	struct _save_messages_msg *m = (struct _save_messages_msg *)mm;
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilterFrom *from_filter;
-	CamelStream *stream;
-	int fd, i;
-	char *from;
-	
-	fd = open (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-	if (fd == -1) {
-		camel_exception_setv(&mm->ex, CAMEL_EXCEPTION_SYSTEM,
-				     _("Unable to create output file: %s\n %s"), m->path, strerror(errno));
-		return;
-	}
-	
-	stream = camel_stream_fs_new_with_fd(fd);
-	from_filter = camel_mime_filter_from_new();
-	filtered_stream = camel_stream_filter_new_with_stream(stream);
-	camel_stream_filter_add(filtered_stream, (CamelMimeFilter *)from_filter);
-	camel_object_unref(from_filter);
-	
-	for (i=0; iuids->len; i++) {
-		CamelMimeMessage *message;
-		int pc = ((i+1) * 100) / m->uids->len;
-
-		message = camel_folder_get_message(m->folder, m->uids->pdata[i], &mm->ex);
-		camel_operation_progress(mm->cancel, pc);
-		if (message == NULL)
-			break;
-		
-		save_prepare_part (CAMEL_MIME_PART (message));
-		
-		/* we need to flush after each stream write since we are writing to the same fd */
-		from = build_from(((CamelMimePart *)message)->headers);
-		if (camel_stream_write_string(stream, from) == -1
-		    || camel_stream_flush(stream) == -1
-		    || camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, (CamelStream *)filtered_stream) == -1
-		    || camel_stream_flush((CamelStream *)filtered_stream) == -1) {
-			camel_exception_setv(&mm->ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Error saving messages to: %s:\n %s"), m->path, strerror(errno));
-			g_free(from);
-			camel_object_unref((CamelObject *)message);
-			break;
-		}
-		g_free(from);
-		camel_object_unref(message);
-	}
-
-	camel_object_unref(filtered_stream);
-	camel_object_unref(stream);
-}
-
-static void save_messages_saved(struct _mail_msg *mm)
-{
-	struct _save_messages_msg *m = (struct _save_messages_msg *)mm;
-
-	if (m->done)
-		m->done(m->folder, m->uids, m->path, m->data);
-}
-
-static void save_messages_free(struct _mail_msg *mm)
-{
-	struct _save_messages_msg *m = (struct _save_messages_msg *)mm;
-	int i;
-
-	for (i=0;iuids->len;i++)
-		g_free(m->uids->pdata[i]);
-	g_ptr_array_free(m->uids, TRUE);
-	camel_object_unref(m->folder);
-	g_free(m->path);
-}
-
-static struct _mail_msg_op save_messages_op = {
-	save_messages_desc,
-	save_messages_save,
-	save_messages_saved,
-	save_messages_free,
-};
-
-int
-mail_save_messages(CamelFolder *folder, GPtrArray *uids, const char *path,
-		   void (*done) (CamelFolder *folder, GPtrArray *uids, char *path, void *data), void *data)
-{
-	struct _save_messages_msg *m;
-	int id;
-
-	m = mail_msg_new(&save_messages_op, NULL, sizeof(*m));
-	m->folder = folder;
-	camel_object_ref(folder);
-	m->uids = uids;
-	m->path = g_strdup(path);
-	m->data = data;
-	m->done = done;
-
-	id = m->msg.seq;
-	e_thread_put(mail_thread_new, (EMsg *)m);
-
-	return id;
-}
-
-/* ** SAVE PART ******************************************************* */
-
-struct _save_part_msg {
-	struct _mail_msg msg;
-
-	CamelMimePart *part;
-	char *path;
-	void (*done)(CamelMimePart *part, char *path, int saved, void *data);
-	void *data;
-};
-
-static char *save_part_desc(struct _mail_msg *mm, int done)
-{
-	return g_strdup(_("Saving attachment"));
-}
-
-static void
-save_part_save (struct _mail_msg *mm)
-{
-	struct _save_part_msg *m = (struct _save_part_msg *)mm;
-	CamelMimeFilterCharset *charsetfilter;
-	CamelContentType *content_type;
-	CamelStream *filtered_stream;
-	CamelStream *stream_fs;
-	CamelDataWrapper *data;
-	const char *charset;
-	
-	stream_fs = camel_stream_fs_new_with_name (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0666);
-	if (stream_fs == NULL) {
-		camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot create output file: %s:\n %s"),
-				      m->path, g_strerror (errno));
-		return;
-	}
-	
-	/* we only convert text/ parts, and we only convert if we have to
-	   null charset param == us-ascii == utf8 always, and utf8 == utf8 obviously */
-	/* this will also let "us-ascii that isn't really" parts pass out in
-	   proper format, without us trying to treat it as what it isn't, which is
-	   the same algorithm camel uses */
-	
-	data = camel_medium_get_content_object (CAMEL_MEDIUM (m->part));
-	content_type = camel_mime_part_get_content_type (m->part);
-	if (header_content_type_is (content_type, "text", "*")
-	    && (charset = header_content_type_param (content_type, "charset"))
-	    && g_strcasecmp (charset, "utf-8") != 0) {
-		charsetfilter = camel_mime_filter_charset_new_convert ("utf-8", charset);
-		filtered_stream = (CamelStream *) camel_stream_filter_new_with_stream (stream_fs);
-		camel_object_unref (CAMEL_OBJECT (stream_fs));
-		if (charsetfilter) {
-			camel_stream_filter_add (CAMEL_STREAM_FILTER (filtered_stream), CAMEL_MIME_FILTER (charsetfilter));
-			camel_object_unref (charsetfilter);
-		}
-	} else {
-		filtered_stream = stream_fs;
-	}
-	
-	if (camel_data_wrapper_write_to_stream (data, filtered_stream) == -1
-	    || camel_stream_flush (filtered_stream) == -1)
-		camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not write data: %s"),
-				      g_strerror (errno));
-	
-	camel_object_unref (filtered_stream);
-}
-
-static void
-save_part_saved (struct _mail_msg *mm)
-{
-	struct _save_part_msg *m = (struct _save_part_msg *)mm;
-	
-	if (m->done)
-		m->done (m->part, m->path, !camel_exception_is_set (&mm->ex), m->data);
-}
-
-static void
-save_part_free (struct _mail_msg *mm)
-{
-	struct _save_part_msg *m = (struct _save_part_msg *)mm;
-
-	camel_object_unref (m->part);
-	g_free (m->path);
-}
-
-static struct _mail_msg_op save_part_op = {
-	save_part_desc,
-	save_part_save,
-	save_part_saved,
-	save_part_free,
-};
-
-int
-mail_save_part (CamelMimePart *part, const char *path,
-		void (*done)(CamelMimePart *part, char *path, int saved, void *data), void *data)
-{
-	struct _save_part_msg *m;
-	int id;
-	
-	m = mail_msg_new (&save_part_op, NULL, sizeof (*m));
-	m->part = part;
-	camel_object_ref (part);
-	m->path = g_strdup (path);
-	m->data = data;
-	m->done = done;
-	
-	id = m->msg.seq;
-	e_thread_put (mail_thread_queued, (EMsg *)m);
-	
-	return id;
-}
-
-
-/* ** PREPARE OFFLINE ***************************************************** */
-
-struct _prep_offline_msg {
-	struct _mail_msg msg;
-
-	CamelOperation *cancel;
-	char *uri;
-	void (*done)(const char *uri, void *data);
-	void *data;
-};
-
-static void prep_offline_do(struct _mail_msg *mm)
-{
-	struct _prep_offline_msg *m = (struct _prep_offline_msg *)mm;
-	CamelFolder *folder;
-
-	if (m->cancel)
-		camel_operation_register(m->cancel);
-
-	folder = mail_tool_uri_to_folder(m->uri, 0, &mm->ex);
-	if (folder) {
-		if (CAMEL_IS_DISCO_FOLDER(folder)) {
-			camel_disco_folder_prepare_for_offline((CamelDiscoFolder *)folder,
-							       "(match-all (or (not (system-flag \"Seen\")) (system-flag \"Flagged\")))",
-							       &mm->ex);
-		}
-		/* prepare_for_offline should do this? */
-		/* of course it should all be atomic, but ... */
-		camel_folder_sync(folder, FALSE, NULL);
-		camel_object_unref(folder);
-	}
-
-	if (m->cancel)
-		camel_operation_unregister(m->cancel);
-}
-
-static void prep_offline_done(struct _mail_msg *mm)
-{
-	struct _prep_offline_msg *m = (struct _prep_offline_msg *)mm;
-
-	if (m->done)
-		m->done(m->uri, m->data);
-}
-
-static void prep_offline_free(struct _mail_msg *mm)
-{
-	struct _prep_offline_msg *m = (struct _prep_offline_msg *)mm;
-
-	if (m->cancel)
-		camel_operation_unref(m->cancel);
-	g_free(m->uri);
-}
-
-static struct _mail_msg_op prep_offline_op = {
-	NULL, /* DO NOT CHANGE THIS, IT MUST BE NULL FOR CANCELLATION TO WORK */
-	prep_offline_do,
-	prep_offline_done,
-	prep_offline_free,
-};
-
-void
-mail_prep_offline(const char *uri,
-		  CamelOperation *cancel,
-		  void (*done)(const char *, void *data),
-		  void *data)
-{
-	struct _prep_offline_msg *m;
-
-	m = mail_msg_new(&prep_offline_op, NULL, sizeof(*m));
-	m->cancel = cancel;
-	if (cancel)
-		camel_operation_ref(cancel);
-	m->uri = g_strdup(uri);
-	m->data = data;
-	m->done = done;
-
-	e_thread_put(mail_thread_queued, (EMsg *)m);
-}
-
-/* ** GO OFFLINE ***************************************************** */
-
-struct _set_offline_msg {
-	struct _mail_msg msg;
-
-	CamelStore *store;
-	gboolean offline;
-	void (*done)(CamelStore *store, void *data);
-	void *data;
-};
-
-static char *set_offline_desc(struct _mail_msg *mm, int done)
-{
-	struct _set_offline_msg *m = (struct _set_offline_msg *)mm;
-	char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE);
-	char *msg;
-
-	msg = g_strdup_printf(m->offline?_("Disconnecting from %s"):_("Reconnecting to %s"),
-			      service_name);
-	g_free(service_name);
-	return msg;
-}
-
-static void set_offline_do(struct _mail_msg *mm)
-{
-	struct _set_offline_msg *m = (struct _set_offline_msg *)mm;
-
-	if (CAMEL_IS_DISCO_STORE (m->store)) {
-		if (!m->offline) {
-			camel_disco_store_set_status (CAMEL_DISCO_STORE (m->store),
-						      CAMEL_DISCO_STORE_ONLINE,
-						      &mm->ex);
-			return;
-		} else if (camel_disco_store_can_work_offline (CAMEL_DISCO_STORE (m->store))) {
-			camel_disco_store_set_status (CAMEL_DISCO_STORE (m->store),
-						      CAMEL_DISCO_STORE_OFFLINE,
-						      &mm->ex);
-			return;
-		}
-	}
-
-	if (m->offline)
-		camel_service_disconnect (CAMEL_SERVICE (m->store),
-					  TRUE, &mm->ex);
-}
-
-static void set_offline_done(struct _mail_msg *mm)
-{
-	struct _set_offline_msg *m = (struct _set_offline_msg *)mm;
-
-	if (m->done)
-		m->done(m->store, m->data);
-}
-
-static void set_offline_free(struct _mail_msg *mm)
-{
-	struct _set_offline_msg *m = (struct _set_offline_msg *)mm;
-
-	camel_object_unref(m->store);
-}
-
-static struct _mail_msg_op set_offline_op = {
-	set_offline_desc,
-	set_offline_do,
-	set_offline_done,
-	set_offline_free,
-};
-
-void
-mail_store_set_offline (CamelStore *store, gboolean offline,
-			void (*done)(CamelStore *, void *data),
-			void *data)
-{
-	struct _set_offline_msg *m;
-
-	/* Cancel any pending connect first so the set_offline_op
-	 * thread won't get queued behind a hung connect op.
-	 */
-	if (offline)
-		camel_service_cancel_connect (CAMEL_SERVICE (store));
-
-	m = mail_msg_new(&set_offline_op, NULL, sizeof(*m));
-	m->store = store;
-	camel_object_ref(store);
-	m->offline = offline;
-	m->data = data;
-	m->done = done;
-
-	e_thread_put(mail_thread_queued, (EMsg *)m);
-}
-
-/* ** Execute Shell Command ***************************************************** */
-
-void
-mail_execute_shell_command (CamelFilterDriver *driver, int argc, char **argv, void *data)
-{
-	if (argc <= 0)
-		return;
-	
-	gnome_execute_async_fds (NULL, argc, argv, TRUE);
-}
diff --git a/mail/mail-ops.h b/mail/mail-ops.h
deleted file mode 100644
index e2024108cc..0000000000
--- a/mail/mail-ops.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Authors: 
- *  Peter Williams 
- *  Michael Zucchi 
- *
- * Copyright 2000, 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef MAIL_OPS_H
-#define MAIL_OPS_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include "camel/camel-folder.h"
-#include "camel/camel-filter-driver.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-operation.h"
-
-#include "evolution-storage.h"	/*EvolutionStorage */
-#include "e-util/e-msgport.h"
-
-void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info,
-		       void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok,
-				    const char *appended_uid, void *data),
-		       void *data);
-
-void mail_transfer_messages (CamelFolder *source, GPtrArray *uids,
-			     gboolean delete_from_source,
-			     const char *dest_uri,
-			     guint32 dest_flags,
-			     void (*done) (gboolean ok, void *data),
-			     void *data);
-
-/* get a single message, asynchronously */
-void mail_get_message (CamelFolder *folder, const char *uid,
-		       void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data),
-		       void *data,
-		       EThread *thread);
-
-/* get several messages */
-void mail_get_messages (CamelFolder *folder, GPtrArray *uids,
-			void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, void *data),
-			void *data);
-
-/* same for a folder */
-int mail_get_folder (const char *uri, guint32 flags,
-		     void (*done) (char *uri, CamelFolder *folder, void *data), void *data,
-		     EThread *thread);
-
-/* and for a store */
-int mail_get_store (const char *uri,
-		    void (*done) (char *uri, CamelStore *store, void *data), void *data);
-
-/* build an attachment */
-void mail_build_attachment (CamelFolder *folder, GPtrArray *uids,
-			    void (*done)(CamelFolder *folder, GPtrArray *messages,
-					 CamelMimePart *part, char *subject, void *data),
-			    void *data);
-
-void mail_sync_folder (CamelFolder *folder,
-		       void (*done) (CamelFolder *folder, void *data),
-		       void *data);
-
-void mail_refresh_folder (CamelFolder *folder,
-			  void (*done) (CamelFolder *folder, void *data),
-			  void *data);
-
-void mail_expunge_folder (CamelFolder *folder,
-			  void (*done) (CamelFolder *folder, void *data),
-			  void *data);
-
-/* get folder info asynchronously */
-int mail_get_folderinfo (CamelStore *store,
-			 void (*done)(CamelStore *store, CamelFolderInfo *info, void *data),
-			 void *data);
-
-/* remove an existing folder */
-void mail_remove_folder (const char *uri,
-			 void (*done) (char *uri, gboolean removed, void *data),
-			 void *data);
-
-/* transfer (copy/move) a folder */
-void mail_xfer_folder (const char *src_uri, const char *dest_uri, gboolean remove_source,
-		       void (*done) (char *src_uri, char *dest_uri, gboolean remove_source,
-				     CamelFolder *folder, void *data),
-		       void *data);
-
-/* save messages */
-int mail_save_messages (CamelFolder *folder, GPtrArray *uids, const char *path,
-			void (*done) (CamelFolder *folder, GPtrArray *uids, char *path, void *data),
-			void *data);
-
-int mail_save_part (CamelMimePart *part, const char *path,
-		    void (*done)(CamelMimePart *part, char *path, int saved, void *data),
-		    void *data);
-
-int mail_send_mail (const char *uri, CamelMimeMessage *message,
-		    void (*done) (char *uri, CamelMimeMessage *message, gboolean sent, void *data),
-		    void *data);
-
-/* scan subfolders and add them to the storage, synchronous */
-/* FIXME: Move this to component-factory.c */
-void mail_scan_subfolders (CamelStore *store, EvolutionStorage *storage);
-/* not sure about this one though */
-int mail_update_subfolders (CamelStore *store, EvolutionStorage *storage,
-			    void (*done)(CamelStore *, void *data),
-			    void *data);
-
-/* yeah so this is messy, but it does a lot, maybe i can consolidate all user_data's to be the one */
-void mail_send_queue (CamelFolder *queue, const char *destination,
-		      const char *type, CamelOperation *cancel,
-		      CamelFilterGetFolderFunc get_folder, void *get_data,
-		      CamelFilterStatusFunc *status, void *status_data,
-		      void (*done)(char *destination, void *data),
-		      void *data);
-
-void mail_fetch_mail (const char *source, int keep,
-		      const char *type, CamelOperation *cancel,
-		      CamelFilterGetFolderFunc get_folder, void *get_data,
-		      CamelFilterStatusFunc *status, void *status_data,
-		      void (*done)(char *source, void *data),
-		      void *data);
-
-void mail_filter_folder (CamelFolder *source_folder, GPtrArray *uids,
-			 const char *type, gboolean notify,
-			 CamelOperation *cancel);
-
-/* convenience function for above */
-void mail_filter_on_demand (CamelFolder *folder, GPtrArray *uids);
-
-/* Work Offline */
-void mail_prep_offline(const char *uri, CamelOperation *cancel,
-		       void (*done)(const char *, void *data),
-		       void *data);
-void mail_store_set_offline(CamelStore *store, gboolean offline,
-			    void (*done)(CamelStore *, void *data),
-			    void *data);
-
-/* filter driver execute shell command async callback */
-void mail_execute_shell_command (CamelFilterDriver *driver, int argc, char **argv, void *data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* MAIL_OPS_H */
diff --git a/mail/mail-preferences.c b/mail/mail-preferences.c
deleted file mode 100644
index b10c006d22..0000000000
--- a/mail/mail-preferences.c
+++ /dev/null
@@ -1,470 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast 
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-
-#include "mail-preferences.h"
-
-#include 
-#include 
-#include "widgets/misc/e-charset-picker.h"
-
-#include 
-
-#include "gal/util/e-iconv.h"
-
-#include "mail-config.h"
-
-
-static void mail_preferences_class_init (MailPreferencesClass *class);
-static void mail_preferences_init       (MailPreferences *dialog);
-static void mail_preferences_finalise   (GObject *obj);
-
-static GtkVBoxClass *parent_class = NULL;
-
-
-GtkType
-mail_preferences_get_type (void)
-{
-	static GType type = 0;
-	
-	if (!type) {
-		GTypeInfo type_info = {
-			sizeof (MailPreferencesClass),
-			NULL, NULL,
-			(GClassInitFunc) mail_preferences_class_init,
-			NULL, NULL,
-			sizeof (MailPreferences),
-			0,
-			(GInstanceInitFunc) mail_preferences_init,
-		};
-		
-		type = g_type_register_static (gtk_vbox_get_type (), "MailPreferences", &type_info, 0);
-	}
-	
-	return type;
-}
-
-static void
-mail_preferences_class_init (MailPreferencesClass *klass)
-{
-	GObjectClass *object_class;
-	
-	object_class = (GObjectClass *) klass;
-	parent_class = g_type_class_ref (gtk_vbox_get_type ());
-	
-	object_class->finalize = mail_preferences_finalise;
-}
-
-static void
-mail_preferences_init (MailPreferences *preferences)
-{
-	preferences->gconf = gconf_client_get_default ();
-}
-
-static void
-mail_preferences_finalise (GObject *obj)
-{
-	MailPreferences *prefs = (MailPreferences *) obj;
-	
-	g_object_unref (prefs->gui);
-	g_object_unref (prefs->pman);
-	g_object_unref (prefs->gconf);
-	
-        ((GObjectClass *)(parent_class))->finalize (obj);
-}
-
-
-static void
-colorpicker_set_color (GnomeColorPicker *color, guint32 rgb)
-{
-	gnome_color_picker_set_i8 (color, (rgb & 0xff0000) >> 16, (rgb & 0xff00) >> 8, rgb & 0xff, 0xff);
-}
-
-static guint32
-colorpicker_get_color (GnomeColorPicker *color)
-{
-	guint8 r, g, b, a;
-	guint32 rgb = 0;
-	
-	gnome_color_picker_get_i8 (color, &r, &g, &b, &a);
-	
-	rgb   = r;
-	rgb <<= 8;
-	rgb  |= g;
-	rgb <<= 8;
-	rgb  |= b;
-	
-	return rgb;
-}
-
-static void
-toggle_button_toggled (GtkWidget *widget, gpointer user_data)
-{
-	MailPreferences *prefs = (MailPreferences *) user_data;
-	
-	if (prefs->control)
-		evolution_config_control_changed (prefs->control);
-}
-
-static void
-entry_changed (GtkWidget *widget, gpointer user_data)
-{
-	MailPreferences *prefs = (MailPreferences *) user_data;
-	
-	if (prefs->control)
-		evolution_config_control_changed (prefs->control);
-}
-
-static void
-color_set (GtkWidget *widget, guint r, guint g, guint b, guint a, gpointer user_data)
-{
-	MailPreferences *prefs = (MailPreferences *) user_data;
-	
-	if (prefs->control)
-		evolution_config_control_changed (prefs->control);
-}
-
-static void
-restore_labels_clicked (GtkWidget *widget, gpointer user_data)
-{
-	MailPreferences *prefs = (MailPreferences *) user_data;
-	int i;
-	
-	for (i = 0; i < 5; i++) {
-		gtk_entry_set_text (prefs->labels[i].name, _(label_defaults[i].name));
-		colorpicker_set_color (prefs->labels[i].color, label_defaults[i].color);
-	}
-}
-
-static void
-menu_changed (GtkWidget *widget, gpointer user_data)
-{
-	MailPreferences *prefs = (MailPreferences *) user_data;
-	
-	if (prefs->control)
-		evolution_config_control_changed (prefs->control);
-}
-
-static void
-option_menu_connect (GtkOptionMenu *omenu, gpointer user_data)
-{
-	GtkWidget *menu, *item;
-	GList *items;
-	
-	menu = gtk_option_menu_get_menu (omenu);
-	
-	items = GTK_MENU_SHELL (menu)->children;
-	while (items) {
-		item = items->data;
-		g_signal_connect (item, "activate", G_CALLBACK (menu_changed), user_data);
-		items = items->next;
-	}
-}
-
-static void
-mail_preferences_construct (MailPreferences *prefs)
-{
-	GtkWidget *widget, *toplevel, *menu;
-	const char *text;
-	GSList *list, *l;
-	GdkColor colour;
-	GladeXML *gui;
-	gboolean bool;
-	guint32 rgb;
-	int i, val;
-	char *buf;
-	char *names[][2] = {
-		{ "anim_check", "chkShowAnimatedImages" },
-		{ "magic_links_check", "chkAutoDetectLinks" },
-		{ NULL, NULL }
-	};
-	
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "preferences_tab", NULL);
-	prefs->gui = gui;
-	
-	/* get our toplevel widget */
-	toplevel = glade_xml_get_widget (gui, "toplevel");
-	
-	/* reparent */
-	gtk_widget_ref (toplevel);
-	gtk_container_remove (GTK_CONTAINER (toplevel->parent), toplevel);
-	gtk_container_add (GTK_CONTAINER (prefs), toplevel);
-	gtk_widget_unref (toplevel);
-	
-	/* General tab */
-	
-	/* Message Display */
-	prefs->timeout_toggle = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkMarkTimeout"));
-	bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/display/mark_seen", NULL);
-	gtk_toggle_button_set_active (prefs->timeout_toggle, bool);
-	g_signal_connect (prefs->timeout_toggle, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
-	
-	prefs->timeout = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spinMarkTimeout"));
-	val = gconf_client_get_int (prefs->gconf, "/apps/evolution/mail/display/mark_seen_timeout", NULL);
-	gtk_spin_button_set_value (prefs->timeout, (1.0 * val) / 1000.0);
-	g_signal_connect (prefs->timeout, "changed", G_CALLBACK (entry_changed), prefs);
-	
-	prefs->charset = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuCharset"));
-	buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/format/charset", NULL);
-	menu = e_charset_picker_new (buf ? buf : e_iconv_locale_charset ());
-	gtk_option_menu_set_menu (prefs->charset, GTK_WIDGET (menu));
-	option_menu_connect (prefs->charset, prefs);
-	g_free (buf);
-	
-	prefs->citation_highlight = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkHighlightCitations"));
-	bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/display/mark_citations", NULL);
-	gtk_toggle_button_set_active (prefs->citation_highlight, bool);
-	g_signal_connect (prefs->citation_highlight, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
-	
-	prefs->citation_color = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, "colorpickerHighlightCitations"));
-	buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/citation_colour", NULL);
-	gdk_color_parse (buf ? buf : "#737373", &colour);
-	rgb = ((colour.red & 0xff00) << 8) | (colour.green & 0xff00) | ((colour.blue & 0xff00) >> 8);
-	colorpicker_set_color (prefs->citation_color, rgb);
-	g_signal_connect (prefs->citation_color, "color-set", G_CALLBACK (color_set), prefs);
-	g_free (buf);
-	
-	/* Deleting Mail */
-	prefs->empty_trash = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkEmptyTrashOnExit"));
-	bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/trash/empty_on_exit", NULL);
-	gtk_toggle_button_set_active (prefs->empty_trash, bool);
-	g_signal_connect (prefs->empty_trash, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
-	
-	prefs->confirm_expunge = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkConfirmExpunge"));
-	bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/prompts/expunge", NULL);
-	gtk_toggle_button_set_active (prefs->confirm_expunge, bool);
-	g_signal_connect (prefs->confirm_expunge, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
-	
-	/* New Mail Notification */
-	val = gconf_client_get_int (prefs->gconf, "/apps/evolution/mail/notify/type", NULL);
-	prefs->notify_not = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radNotifyNot"));
-	gtk_toggle_button_set_active (prefs->notify_not, val == MAIL_CONFIG_NOTIFY_NOT);
-	g_signal_connect (prefs->notify_not, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
-	
-	prefs->notify_beep = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radNotifyBeep"));
-	gtk_toggle_button_set_active (prefs->notify_beep, val == MAIL_CONFIG_NOTIFY_BEEP);
-	g_signal_connect (prefs->notify_beep, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
-	
-	prefs->notify_play_sound = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radNotifyPlaySound"));
-	gtk_toggle_button_set_active (prefs->notify_play_sound, val == MAIL_CONFIG_NOTIFY_PLAY_SOUND);
-	g_signal_connect (prefs->notify_play_sound, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
-	
-	prefs->notify_sound_file = GNOME_FILE_ENTRY (glade_xml_get_widget (gui, "fileNotifyPlaySound"));
-	buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/notify/sound", NULL);
-	gtk_entry_set_text (GTK_ENTRY (gnome_file_entry_gtk_entry (prefs->notify_sound_file)), buf ? buf : "");
-	g_signal_connect (gnome_file_entry_gtk_entry (prefs->notify_sound_file), "changed",
-			  G_CALLBACK (entry_changed), prefs);
-	g_free (buf);
-	
-	/* HTML Mail tab */
-	
-	/* Loading Images */
-	val = gconf_client_get_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", NULL);
-	prefs->images_never = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radImagesNever"));
-	gtk_toggle_button_set_active (prefs->images_never, val == MAIL_CONFIG_HTTP_NEVER);
-	g_signal_connect (prefs->images_never, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
-	
-	prefs->images_sometimes = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radImagesSometimes"));
-	gtk_toggle_button_set_active (prefs->images_sometimes, val == MAIL_CONFIG_HTTP_SOMETIMES);
-	g_signal_connect (prefs->images_sometimes, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
-	
-	prefs->images_always = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radImagesAlways"));
-	gtk_toggle_button_set_active (prefs->images_always, val == MAIL_CONFIG_HTTP_ALWAYS);
-	g_signal_connect (prefs->images_always, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
-	
-#warning "gtkhtml prop manager"
-#if 0	
-	prefs->pman = GTK_HTML_PROPMANAGER (gtk_html_propmanager_new (prefs->gconf));
-	g_signal_connect (prefs->pman, "changed", G_CALLBACK (toggle_button_toggled), prefs);
-	g_object_ref (prefs->pman);
-	
-	gtk_html_propmanager_set_names (prefs->pman, names);
-	gtk_html_propmanager_set_gui (prefs->pman, gui, NULL);
-	for (i = 0; names[i][0] != NULL; i++) {
-		widget = glade_xml_get_widget (gui, names[i][1]);
-		g_signal_connect (widget, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
-	}
-#endif
-	
-	prefs->prompt_unwanted_html = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkPromptWantHTML"));
-	bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/prompts/unwanted_html", NULL);
-	gtk_toggle_button_set_active (prefs->prompt_unwanted_html, bool);
-	g_signal_connect (prefs->prompt_unwanted_html, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
-	
-	l = list = gconf_client_get_list (prefs->gconf, "/apps/evolution/mail/labels", GCONF_VALUE_STRING, NULL);
-	
-	/* Labels and Colours tab */
-	for (i = 0; i < 5; i++) {
-		char *widget_name, *label, *p;
-		
-		widget_name = g_strdup_printf ("txtLabel%d", i);
-		prefs->labels[i].name = GTK_ENTRY (glade_xml_get_widget (gui, widget_name));
-		g_free (widget_name);
-		
-		widget_name = g_strdup_printf ("colorLabel%d", i);
-		prefs->labels[i].color = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, widget_name));
-		g_free (widget_name);
-		
-		label = l ? (char *) l->data : g_strdup (_(label_defaults[i].name));
-		if ((p = strrchr (label, ':'))) {
-			*p++ = '\0';
-			gdk_color_parse (p, &colour);
-			rgb = ((colour.red & 0xff00) << 8) | (colour.green & 0xff00) | ((colour.blue & 0xff) >> 8);
-		} else {
-			rgb = label_defaults[i].color;
-		}
-		
-		gtk_entry_set_text (prefs->labels[i].name, label);
-		g_free (label);
-		
-		g_signal_connect (prefs->labels[i].name, "changed", G_CALLBACK (entry_changed), prefs);
-		
-		colorpicker_set_color (prefs->labels[i].color, rgb);
-		g_signal_connect (prefs->labels[i].color, "color_set", G_CALLBACK (color_set), prefs);
-		
-		if (l != NULL)
-			l = l->next;
-	}
-	
-	/* this is in case somehow the gconf list is longer than 5... */
-	while (l != NULL) {
-		g_free (l->data);
-		l = l->next;
-	}
-	
-	g_slist_free (list);
-	
-	prefs->restore_labels = GTK_BUTTON (glade_xml_get_widget (gui, "cmdRestoreLabels"));
-	g_signal_connect (prefs->restore_labels, "clicked", G_CALLBACK (restore_labels_clicked), prefs);
-}
-
-
-GtkWidget *
-mail_preferences_new (void)
-{
-	MailPreferences *new;
-	
-	new = (MailPreferences *) g_object_new (mail_preferences_get_type (), NULL);
-	mail_preferences_construct (new);
-	
-	return (GtkWidget *) new;
-}
-
-
-void
-mail_preferences_apply (MailPreferences *prefs)
-{
-	GtkWidget *entry, *menu;
-	char *string, buf[20];
-	const char *cstring;
-	GSList *list, *l;
-	guint32 rgb;
-	int i, val;
-	
-	/* General tab */
-	
-	/* Message Display */
-	gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/display/mark_seen",
-			       gtk_toggle_button_get_active (prefs->timeout_toggle), NULL);
-	
-	val = (int) (gtk_spin_button_get_value (prefs->timeout) * 1000.0);
-	gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/mark_seen_timeout", val, NULL);
-	
-	menu = gtk_option_menu_get_menu (prefs->charset);
-	if (!(string = e_charset_picker_get_charset (menu)))
-		string = g_strdup (e_iconv_locale_charset ());
-	
-	gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/format/charset", string, NULL);
-	g_free (string);
-	
-	gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/display/mark_citations",
-			       gtk_toggle_button_get_active (prefs->citation_highlight), NULL);
-	
-	rgb = colorpicker_get_color (prefs->citation_color);
-	g_snprintf (buf, sizeof (buf), "#%0.6x", rgb);
-	gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/display/citation_colour", buf, NULL);
-	
-	/* Deleting Mail */
-	gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/trash/empty_on_exit",
-			       gtk_toggle_button_get_active (prefs->empty_trash), NULL);
-	
-	gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/prompts/expunge",
-			       gtk_toggle_button_get_active (prefs->confirm_expunge), NULL);
-	
-	/* New Mail Notification */
-	if (gtk_toggle_button_get_active (prefs->notify_not))
-		val = MAIL_CONFIG_NOTIFY_NOT;
-	else if (gtk_toggle_button_get_active (prefs->notify_beep))
-		val = MAIL_CONFIG_NOTIFY_BEEP;
-	else
-		val = MAIL_CONFIG_NOTIFY_PLAY_SOUND;
-	
-	gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/notify/type", val, NULL);
-	
-	entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (prefs->notify_sound_file));
-	cstring = gtk_entry_get_text (GTK_ENTRY (entry));
-	gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/notify/sound", cstring, NULL);
-	
-	/* HTML Mail */
-	if (gtk_toggle_button_get_active (prefs->images_always))
-		val = MAIL_CONFIG_HTTP_ALWAYS;
-	else if (gtk_toggle_button_get_active (prefs->images_sometimes))
-		val = MAIL_CONFIG_HTTP_SOMETIMES;
-	else
-		val = MAIL_CONFIG_HTTP_NEVER;
-	
-	gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", val, NULL);
-	
-#warning "gtkhtml propmanager"
-#if 0	
-	gtk_html_propmanager_apply (prefs->pman);
-#endif
-	
-	gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/prompts/unwanted_html",
-			       gtk_toggle_button_get_active (prefs->prompt_unwanted_html), NULL);
-	
-	/* Labels and Colours */
-	list = NULL;
-	for (i = 4; i >= 0; i--) {
-		cstring = gtk_entry_get_text (prefs->labels[i].name);
-		rgb = colorpicker_get_color (prefs->labels[i].color);
-		string = g_strdup_printf ("%s:#%0.6x", cstring, rgb);
-		list = g_slist_prepend (list, string);
-	}
-	
-	gconf_client_set_list (prefs->gconf, "/apps/evolution/mail/labels", GCONF_VALUE_STRING, list, NULL);
-	
-	l = list;
-	while (l != NULL) {
-		g_free (l->data);
-		l = l->next;
-	}
-	g_slist_free (list);
-	
-	gconf_client_suggest_sync (prefs->gconf, NULL);
-}
diff --git a/mail/mail-preferences.h b/mail/mail-preferences.h
deleted file mode 100644
index 10cfc9fb67..0000000000
--- a/mail/mail-preferences.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast 
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifndef __MAIL_PREFERENCES_H__
-#define __MAIL_PREFERENCES_H__
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#warning "gtkhtml-propmanger"
-/*#include */
-
-#include "evolution-config-control.h"
-
-#include 
-
-#define MAIL_PREFERENCES_TYPE        (mail_preferences_get_type ())
-#define MAIL_PREFERENCES(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), MAIL_PREFERENCES_TYPE, MailPreferences))
-#define MAIL_PREFERENCES_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), MAIL_PREFERENCES_TYPE, MailPreferencesClass))
-#define IS_MAIL_PREFERENCES(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), MAIL_PREFERENCES_TYPE))
-#define IS_MAIL_PREFERENCES_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MAIL_PREFERENCES_TYPE))
-
-typedef struct _MailPreferences MailPreferences;
-typedef struct _MailPreferencesClass MailPreferencesClass;
-
-struct _MailPreferences {
-	GtkVBox parent_object;
-	
-	GNOME_Evolution_Shell shell;
-	
-	EvolutionConfigControl *control;
-	
-	GladeXML *gui;
-	GConfClient *gconf;
-	
-	/* General tab */
-	
-	/* Message Display */
-	GtkToggleButton *timeout_toggle;
-	GtkSpinButton *timeout;
-	GtkOptionMenu *charset;
-	GtkToggleButton *citation_highlight;
-	GnomeColorPicker *citation_color;
-	
-	/* Deleting Mail */
-	GtkToggleButton *empty_trash;
-	GtkToggleButton *confirm_expunge;
-	
-	/* New Mail Notification */
-	GtkToggleButton *notify_not;
-	GtkToggleButton *notify_beep;
-	GtkToggleButton *notify_play_sound;
-	GnomeFileEntry *notify_sound_file;
-	
-	/* HTML Mail tab */
-	
-	/* Loading Images */
-	GtkToggleButton *images_always;
-	GtkToggleButton *images_sometimes;
-	GtkToggleButton *images_never;
-	
-	GtkToggleButton *show_animated;
-	GtkToggleButton *autodetect_links;
-	GtkToggleButton *prompt_unwanted_html;
-
-	/* GtkHTML Properties */
-	struct _GtkHTMLPropmanager *pman;
-	
-	/* Labels and Colours tab */
-	struct {
-		GtkEntry *name;
-		GnomeColorPicker *color;
-	} labels[5];
-	GtkButton *restore_labels;
-};
-
-struct _MailPreferencesClass {
-	GtkVBoxClass parent_class;
-	
-	/* signals */
-	
-};
-
-
-GtkType mail_preferences_get_type (void);
-
-GtkWidget *mail_preferences_new (void);
-
-void mail_preferences_apply (MailPreferences *prefs);
-
-/* needed by global config */
-#define MAIL_PREFERENCES_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_Preferences_ConfigControl"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __MAIL_PREFERENCES_H__ */
diff --git a/mail/mail-search-dialogue.c b/mail/mail-search-dialogue.c
deleted file mode 100644
index 1bce657546..0000000000
--- a/mail/mail-search-dialogue.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- *  Copyright (C) 2000, 2001 Ximian, Inc.
- *
- *  Authors: Not Zed 
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "mail-search-dialogue.h"
-
-static void mail_search_dialogue_class_init	(MailSearchDialogueClass *class);
-static void mail_search_dialogue_init	(MailSearchDialogue *gspaper);
-static void mail_search_dialogue_finalise	(GObject *obj);
-
-static GtkDialogClass *parent_class;
-
-GType
-mail_search_dialogue_get_type (void)
-{
-	static GType type = 0;
-	
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (MailSearchDialogueClass),
-			NULL, /* base_class_init */
-			NULL, /* base_class_finalize */
-			(GClassInitFunc) mail_search_dialogue_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof (MailSearchDialogue),
-			0,
-			(GInstanceInitFunc) mail_search_dialogue_init,
-		};
-		
-		type = g_type_register_static (gtk_dialog_get_type (), "MailSearchDialogue", &info, 0);
-	}
-	
-	return type;
-}
-
-static void
-mail_search_dialogue_class_init (MailSearchDialogueClass *class)
-{
-	GObjectClass *object_class;
-	
-	object_class = (GObjectClass *)class;
-	parent_class = g_type_class_ref(gtk_dialog_get_type ());
-
-	object_class->finalize = mail_search_dialogue_finalise;
-	/* override methods */
-
-}
-
-static void
-mail_search_dialogue_construct (MailSearchDialogue *o, FilterRule *rule)
-{
-	FilterPart *part;
-	GtkDialog *dialogue = GTK_DIALOG (o);
-	
-	g_object_set(dialogue,
-		     "allow_shrink", FALSE,
-		     "allow_grow", TRUE,
-		     "default_width", 500,
-		     "default_height", 400, NULL);
-	
-	o->context = rule_context_new ();
-	rule_context_add_part_set (o->context, "partset", filter_part_get_type (),
-				   rule_context_add_part, rule_context_next_part);
-	rule_context_load (o->context, EVOLUTION_DATADIR "/evolution/vfoldertypes.xml", "");
-	if (rule) {
-		o->rule = rule;
-		o->guts = filter_rule_get_widget (o->rule, o->context);
-	} else {
-		o->rule = filter_rule_new ();
-		part = rule_context_next_part (o->context, NULL);
-		if (part == NULL) {
-			g_warning ("Problem loading search: no parts to load");
-			o->guts = gtk_entry_new ();
-		} else {
-			filter_rule_add_part (o->rule, filter_part_clone (part));
-			o->guts = filter_rule_get_widget (o->rule, o->context);
-		}
-	}
-	
-	gtk_widget_show (o->guts);
-	gtk_box_pack_start (GTK_BOX (dialogue->vbox), o->guts, TRUE, TRUE, 0);
-}
-
-static void
-mail_search_dialogue_init (MailSearchDialogue *o)
-{
-	GtkDialog *dialogue = GTK_DIALOG (o);
-	
-	gtk_dialog_add_buttons (dialogue,
-				GTK_STOCK_OK,
-				GTK_RESPONSE_OK,
-				_("_Search"),
-				GTK_RESPONSE_APPLY,
-				GTK_STOCK_CANCEL,
-				GTK_RESPONSE_CANCEL,
-				NULL);
-	gtk_dialog_set_default_response (dialogue, GTK_RESPONSE_OK);
-}
-
-
-static void
-mail_search_dialogue_finalise (GObject *obj)
-{
-	MailSearchDialogue *o = (MailSearchDialogue *)obj;
-	
-	if (o->context)
-		g_object_unref(o->context);
-	if (o->rule)
-		g_object_unref(o->rule);
-	
-        ((GObjectClass *)(parent_class))->finalize(obj);
-}
-
-/**
- * mail_search_dialogue_new:
- *
- * Create a new MailSearchDialogue object.
- * 
- * Return value: A new #MailSearchDialogue object.
- **/
-MailSearchDialogue *
-mail_search_dialogue_new ()
-{
-	MailSearchDialogue *o = (MailSearchDialogue *)g_object_new(mail_search_dialogue_get_type(), NULL);
-	mail_search_dialogue_construct (o, NULL);
-	return o;
-}
-
-MailSearchDialogue *
-mail_search_dialogue_new_with_rule (FilterRule *rule)
-{
-	MailSearchDialogue *o = (MailSearchDialogue *)g_object_new (mail_search_dialogue_get_type (), NULL);
-	if (rule)
-		g_object_ref((rule));
-	mail_search_dialogue_construct (o, rule);
-	return o;
-}
-
-/**
- * mail_search_dialogue_get_query:
- * @msd: 
- * 
- * Get the query string represting the current search criterea.
- * 
- * Return value: 
- **/
-char *
-mail_search_dialogue_get_query (MailSearchDialogue *msd)
-{
-	GString *out = g_string_new ("");
-	char *ret;
-	
-	filter_rule_build_code (msd->rule, out);
-	ret = out->str;
-	g_string_free (out, FALSE);
-	return ret;
-}
diff --git a/mail/mail-search-dialogue.h b/mail/mail-search-dialogue.h
deleted file mode 100644
index 0bb0e7cb80..0000000000
--- a/mail/mail-search-dialogue.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Not Zed 
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _MAIL_SEARCH_DIALOGUE_H
-#define _MAIL_SEARCH_DIALOGUE_H
-
-#include 
-#include 
-
-#include "filter/rule-context.h"
-#include "filter/filter-rule.h"
-
-#define MAIL_SEARCH_DIALOGUE(obj)	G_TYPE_CHECK_INSTANCE_CAST (obj, mail_search_dialogue_get_type (), MailSearchDialogue)
-#define MAIL_SEARCH_DIALOGUE_CLASS(klass)	G_TYPE_CHECK_CLASS_CAST (klass, mail_search_dialogue_get_type (), MailSearchDialogueClass)
-#define IS_MAIL_SEARCH_DIALOGUE(obj)      G_TYPE_CHECK_INSTANCE_TYPE (obj, mail_search_dialogue_get_type ())
-
-typedef struct _MailSearchDialogue	MailSearchDialogue;
-typedef struct _MailSearchDialogueClass	MailSearchDialogueClass;
-
-struct _MailSearchDialogue {
-	GtkDialog parent;
-
-	RuleContext *context;
-	FilterRule *rule;
-	GtkWidget *guts;
-};
-
-struct _MailSearchDialogueClass {
-	GtkDialogClass parent_class;
-
-	/* virtual methods */
-
-	/* signals */
-};
-
-GType mail_search_dialogue_get_type (void);
-MailSearchDialogue *mail_search_dialogue_new (void);
-MailSearchDialogue *mail_search_dialogue_new_with_rule (FilterRule *rule);
-
-/* methods */
-char *mail_search_dialogue_get_query (MailSearchDialogue *msd);
-
-#endif /* ! _MAIL_SEARCH_DIALOGUE_H */
-
diff --git a/mail/mail-search.c b/mail/mail-search.c
deleted file mode 100644
index 3e5b8260b8..0000000000
--- a/mail/mail-search.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * mail-search.c
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge 
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include "mail-search.h"
-#include "e-searching-tokenizer.h"
-#include 
-#include 
-#include 
-
-static GtkObjectClass *parent_class;
-
-static void
-mail_search_finalise (GObject *obj)
-{
-	MailSearch *ms = MAIL_SEARCH (obj);
-
-	g_signal_handler_disconnect(ms->mail->html->engine->ht, ms->match_handler);
-	g_signal_handler_disconnect(ms->mail->html->engine->ht, ms->begin_handler);
-
-	g_free (ms->last_search);
-	g_object_unref((ms->mail));
-
-	((GObjectClass *)parent_class)->finalize(obj);
-}
-
-static void
-mail_search_class_init (MailSearchClass *klass)
-{
-	GObjectClass *object_class = (GObjectClass *) klass;
-
-	parent_class = GTK_OBJECT_CLASS (g_type_class_ref(gtk_dialog_get_type ()));
-	
-	object_class->finalize = mail_search_finalise;
-}
-
-static void
-mail_search_init (MailSearch *ms)
-{
-
-}
-
-GtkType
-mail_search_get_type (void)
-{
-	static GType mail_search_type = 0;
-
-	if (! mail_search_type) {
-		GTypeInfo mail_search_info = {
-			sizeof (MailSearchClass),
-			NULL, NULL,
-			(GClassInitFunc) mail_search_class_init,
-			NULL, NULL,
-			sizeof (MailSearch),
-			0,
-			(GInstanceInitFunc) mail_search_init,
-		};
-
-		mail_search_type = g_type_register_static (GTK_TYPE_DIALOG, "MailSearch", &mail_search_info, 0);
-	}
-
-	return mail_search_type;
-}
-
-/*
- *  Convenience
- */
-
-static ESearchingTokenizer *
-mail_search_tokenizer (MailSearch *ms)
-{
-	return E_SEARCHING_TOKENIZER (ms->mail->html->engine->ht);
-}
-
-static void
-mail_search_redisplay_message (MailSearch *ms)
-{
-	mail_display_redisplay (ms->mail, FALSE);
-}
-
-static void
-mail_search_set_subject (MailSearch *ms, const char *subject)
-{
-	char *utf8_subject = NULL;
-	
-	if (subject && *subject) {
-		utf8_subject = g_strdup (subject);
-		
-		if (g_utf8_validate (utf8_subject, -1, NULL)) {
-#define ARBITRARY_CUTOFF 40
-			if (g_utf8_strlen (utf8_subject, -1) > ARBITRARY_CUTOFF + 3) {
-				char *p = g_utf8_offset_to_pointer (utf8_subject, ARBITRARY_CUTOFF);
-				
-				strcpy (p, "...");
-			}
-		} else {
-			/* If the subject contains bad utf8, don't show anything in the frame label. */
-			g_free (utf8_subject);
-			utf8_subject = NULL;
-		}
-	} else {
-		utf8_subject = g_strdup (_("(Untitled Message)"));
-	}
-	
-	gtk_frame_set_label (GTK_FRAME (ms->msg_frame), utf8_subject);
-	
-	g_free (utf8_subject);
-}
-
-/*
- *  Construct Objects
- */
-
-static void
-toggled_case_cb (GtkToggleButton *b, MailSearch *ms)
-{
-	ms->case_sensitive = gtk_toggle_button_get_active (b);
-	
-	e_searching_tokenizer_set_primary_case_sensitivity (mail_search_tokenizer (ms),
-							    ms->case_sensitive);
-	mail_search_redisplay_message (ms);
-	
-}
-
-#if 0
-static void
-toggled_fwd_cb (GtkToggleButton *b, MailSearch *ms)
-{
-	ms->search_forward = gtk_toggle_button_get_active (b);
-	gtk_html_engine_search_set_forward (ms->mail->html, ms->search_forward);
-}
-#endif
-
-static void
-dialog_destroy_cb (GtkWidget *w, MailSearch *ms)
-{
-	ESearchingTokenizer *st = mail_search_tokenizer (ms);
-	
-	e_searching_tokenizer_set_primary_search_string (st, NULL);
-	mail_search_redisplay_message (ms);
-}
-
-static void
-dialog_clicked_cb (GtkWidget *widget, gint button_number, MailSearch *ms)
-{
-	ESearchingTokenizer *st = mail_search_tokenizer (ms);
-	
-	if (button_number == 0) {        /* "Search" */
-		char *search_text;
-		
-		search_text = gtk_editable_get_chars (GTK_EDITABLE (ms->entry), 0, -1);
-		g_strstrip (search_text);
-		
-		if (search_text && *search_text) {
-			if (ms->last_search && !strcmp (ms->last_search, search_text)) {
-				
-				if (! gtk_html_engine_search_next (ms->mail->html)) {
-					g_free (ms->last_search);
-					ms->last_search = NULL;
-				}
-			} else {
-				g_free (ms->last_search);
-				ms->last_search = NULL;
-				
-				e_searching_tokenizer_set_primary_search_string (st, search_text);
-				e_searching_tokenizer_set_primary_case_sensitivity (st, ms->case_sensitive);
-				
-				mail_search_redisplay_message (ms);
-				
-				if (gtk_html_engine_search (ms->mail->html, search_text,
-							    ms->case_sensitive, ms->search_forward,
-							    FALSE)) {
-					ms->last_search = g_strdup (search_text);
-				}
-			}
-		}
-		
-		g_free (search_text);
-	} else if (button_number == 1) { /* "Close"  */
-		gtk_widget_destroy (widget);
-	}
-}
-
-static void
-begin_cb (ESearchingTokenizer *st, char *foo, MailSearch *ms)
-{
-	const char *subject;
-	
-	if (ms && ms->mail && ms->mail->current_message) {
-		subject = ms->mail->current_message->subject;
-		
-		if (subject == NULL)
-			subject = _("Untitled Message");
-	} else {
-		subject = _("Empty Message");
-	}
-	
-	gtk_label_set_text (GTK_LABEL (ms->count_label), "0");
-	mail_search_set_subject (ms, subject);
-}
-
-static void
-match_cb (ESearchingTokenizer *st, MailSearch *ms)
-{
-	char buf[16];
-	
-	g_snprintf (buf, 16, "%d", e_searching_tokenizer_match_count (st));
-	gtk_label_set_text (GTK_LABEL (ms->count_label), buf);
-}
-
-static void
-entry_run_search(GtkWidget *w, MailSearch *ms)
-{
-	/* run search when enter pressed on widget */
-	gtk_dialog_response ((GtkDialog *) ms, GTK_RESPONSE_ACCEPT);
-}
-
-void
-mail_search_construct (MailSearch *ms, MailDisplay *mail)
-{
-	GtkWidget *find_hbox;
-	GtkWidget *matches_hbox;
-	GtkWidget *toggles_hbox;
-	GtkWidget *frame_vbox;
-	GtkWidget *entry;
-	GtkWidget *count_label;
-	GtkWidget *case_check;
-#if 0
-	GtkWidget *fwd_check;
-#endif
-	GtkWidget *button;
-	GtkWidget *msg_hbox;
-	GtkWidget *msg_frame;
-	
-	g_return_if_fail (ms != NULL && IS_MAIL_SEARCH (ms));
-	g_return_if_fail (mail != NULL && IS_MAIL_DISPLAY (mail));
-	
-	/* Basic set-up */
-	
-	ms->mail = mail;
-	g_object_ref (mail);
-	
-	gtk_window_set_title ((GtkWindow *) ms, _("Find in Message"));
-	
-	button = gtk_button_new_from_stock (GTK_STOCK_FIND);
-	gtk_button_set_label ((GtkButton *) button, _("Search"));
-	gtk_dialog_add_action_widget ((GtkDialog*) ms, button, GTK_RESPONSE_ACCEPT);
-	gtk_dialog_add_button ((GtkDialog *) ms, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-	gtk_dialog_set_default_response ((GtkDialog *) ms, GTK_RESPONSE_ACCEPT);
-	
-	ms->search_forward = TRUE;
-	ms->case_sensitive = FALSE;
-	
-	ms->begin_handler = g_signal_connect (ms->mail->html->engine->ht, "begin",
-					      G_CALLBACK (begin_cb), ms);
-	ms->match_handler = g_signal_connect (ms->mail->html->engine->ht, "match",
-					      G_CALLBACK (match_cb), ms);
-	
-	/* Construct the dialog contents. */
-	
-	msg_hbox     = gtk_hbox_new (FALSE, 0);
-	find_hbox    = gtk_hbox_new (FALSE, 0);
-	matches_hbox = gtk_hbox_new (FALSE, 0);
-	toggles_hbox = gtk_hbox_new (FALSE, 0);
-	frame_vbox   = gtk_vbox_new (FALSE, 0);
-	
-	entry       = gtk_entry_new ();
-	count_label = gtk_label_new ("0");
-	
-	msg_frame   = gtk_frame_new (NULL);	
-	
-	case_check  = gtk_check_button_new_with_label (_("Case Sensitive"));
-#if 0
-	fwd_check   = gtk_check_button_new_with_label (_("Search Forward"));
-#endif
-	
-	ms->entry       = entry;
-	ms->count_label = count_label;
-	
-	ms->msg_frame   = msg_frame;
-	
-	if (mail->current_message->subject && *mail->current_message->subject)
-		mail_search_set_subject (ms, mail->current_message->subject);
-	else
-		mail_search_set_subject (ms, NULL);
-	
-#if 0
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fwd_check),  ms->search_forward);
-#endif
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (case_check), ms->case_sensitive);
-	
-  	gtk_box_pack_start (GTK_BOX (msg_hbox), GTK_WIDGET (msg_frame), FALSE, FALSE, 3);
-	
-	gtk_box_pack_start (GTK_BOX (find_hbox), gtk_label_new (_("Find:")), FALSE, FALSE, 3);
-	gtk_box_pack_start (GTK_BOX (find_hbox), entry, TRUE, TRUE, 3);
-	gtk_box_pack_start (GTK_BOX (matches_hbox), gtk_hbox_new (FALSE, 0), TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (matches_hbox), gtk_label_new (_("Matches:")), FALSE, FALSE, 3);
-	gtk_box_pack_start (GTK_BOX (matches_hbox), count_label, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (matches_hbox), gtk_hbox_new (FALSE, 0), TRUE, TRUE, 0);
-	
-	gtk_box_pack_start (GTK_BOX (toggles_hbox), case_check, FALSE, FALSE, 4);
-	
-	/*
-	 * Disabling the forward/backward search button because there are problems with it
-	 * (related to how gtkhtml handles searches), the GUI freeze is upon us, and I
-	 * don't know if they'll get resolved for 1.0.  Hopefully getting this fixed can
-	 * be a 1.1 item.
-	 */
-
-#if 0
-	gtk_box_pack_start (GTK_BOX (toggles_hbox), fwd_check,  FALSE, FALSE, 4);
-#endif
-	
-	gtk_box_pack_start (GTK_BOX (frame_vbox), find_hbox, TRUE, TRUE, 8);
-  	gtk_box_pack_start (GTK_BOX (frame_vbox), matches_hbox, TRUE, TRUE, 0); 
-  	gtk_box_pack_start (GTK_BOX (frame_vbox), toggles_hbox, TRUE, TRUE, 0);
-	
-	gtk_container_add (GTK_CONTAINER (msg_frame), GTK_WIDGET (frame_vbox));
-	
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (ms)->vbox), msg_hbox, TRUE, TRUE, 0); 	
-	
-	gtk_widget_grab_focus (entry); /* Give focus to entry by default */ 
-	g_signal_connect (entry, "activate", G_CALLBACK (entry_run_search), ms);
-	gnome_window_icon_set_from_file (GTK_WINDOW (ms), EVOLUTION_ICONSDIR "/find-message.xpm");
-	
-	gtk_widget_show_all (msg_hbox);
-	gtk_widget_show_all (find_hbox);
-	gtk_widget_show_all (matches_hbox);
-	gtk_widget_show_all (toggles_hbox);
-	
-	/* Hook up signals */
-	
-	g_signal_connect (case_check, "toggled", G_CALLBACK (toggled_case_cb), ms);
-#if 0
-	g_signal_connect (fwd_check, "toggled", G_CALLBACK (toggled_fwd_cb), ms);
-#endif
-	g_signal_connect (ms, "clicked", G_CALLBACK (dialog_clicked_cb), ms);
-	
-	g_object_weak_ref ((GObject *) ms, (GWeakNotify) dialog_destroy_cb, ms);
-	g_object_weak_ref ((GObject *) ms->mail, (GWeakNotify) gtk_widget_destroy, ms);
-}
-
-GtkWidget *
-mail_search_new (MailDisplay *mail)
-{
-	GtkWidget *widget;
-	
-	g_return_val_if_fail (mail && IS_MAIL_DISPLAY (mail), NULL);
-	
-	widget = g_object_new (mail_search_get_type (), NULL);
-	mail_search_construct (MAIL_SEARCH (widget), mail);
-	
-	return widget;
-}
-
diff --git a/mail/mail-search.h b/mail/mail-search.h
deleted file mode 100644
index 590fabb1ba..0000000000
--- a/mail/mail-search.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/*
- * mail-search.h
- *
- * Copyright (C) 2001 Ximian, Inc.
- *
- * Developed by Jon Trowbridge 
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA.
- */
-
-#ifndef _MAIL_SEARCH_H_
-#define _MAIL_SEARCH_H_
-
-#ifdef _cplusplus
-extern "C" {
-#pragma }
-#endif /* _cplusplus */
-
-#include 
-#include "mail-display.h"
-
-#define MAIL_SEARCH_TYPE        (mail_search_get_type ())
-#define MAIL_SEARCH(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), MAIL_SEARCH_TYPE, MailSearch))
-#define MAIL_SEARCH_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), MAIL_SEARCH_TYPE, MailSearch))
-#define IS_MAIL_SEARCH(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), MAIL_SEARCH_TYPE))
-#define IS_MAIL_SEARCH_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MAIL_SEARCH_TYPE))
-
-typedef struct _MailSearch      MailSearch;
-typedef struct _MailSearchClass MailSearchClass;
-
-struct _MailSearch {
-	GtkDialog parent;
-	
-	MailDisplay *mail;
-
-	GtkWidget *entry;
-	GtkWidget *msg_frame;
-	GtkWidget *count_label;
-
-	gboolean search_forward, case_sensitive;
-	gchar *last_search;
-
-	guint begin_handler;
-	guint match_handler;
-};
-
-struct _MailSearchClass {
-	GtkDialogClass parent_class;
-
-};
-
-GtkType    mail_search_get_type (void);
-
-void       mail_search_construct (MailSearch *, MailDisplay *);
-GtkWidget *mail_search_new       (MailDisplay *);
-
-
-#ifdef _cplusplus
-}
-#endif /* _cplusplus */
-
-#endif /* _MAIL_SEARCH_H_ */
-
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
deleted file mode 100644
index 81f2eaf8c2..0000000000
--- a/mail/mail-send-recv.c
+++ /dev/null
@@ -1,936 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Michael Zucchi 
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-
-/* for the dialogue stuff */
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "filter/filter-filter.h"
-#include "camel/camel-filter-driver.h"
-#include "camel/camel-folder.h"
-#include "camel/camel-operation.h"
-
-#include "evolution-storage.h"
-
-#include "mail.h"
-#include "mail-mt.h"
-#include "mail-config.h"
-#include "mail-session.h"
-#include "mail-tools.h"
-#include "mail-ops.h"
-#include "mail-send-recv.h"
-#include "mail-folder-cache.h"
-
-#define d(x)
-
-/* ms between status updates to the gui */
-#define STATUS_TIMEOUT (250)
-
-/* send/receive email */
-
-/* ********************************************************************** */
-/*  This stuff below is independent of the stuff above */
-
-/* this stuff is used to keep track of which folders filters have accessed, and
-   what not. the thaw/refreeze thing doesn't really seem to work though */
-struct _folder_info {
-	char *uri;
-	CamelFolder *folder;
-	time_t update;
-	int count;		/* how many times updated, to slow it down as we go, if we have lots */
-};
-
-struct _send_data {
-	GList *infos;
-
-	GtkDialog *gd;
-	int cancelled;
-
-	CamelFolder *inbox;	/* since we're never asked to update this one, do it ourselves */
-	time_t inbox_update;
-
-	GMutex *lock;
-	GHashTable *folders;
-
-	GHashTable *active;	/* send_info's by uri */
-};
-
-typedef enum {
-	SEND_RECEIVE,		/* receiver */
-	SEND_SEND,		/* sender */
-	SEND_UPDATE,		/* imap-like 'just update folder info' */
-	SEND_INVALID
-} send_info_t ;
-
-typedef enum {
-	SEND_ACTIVE,
-	SEND_CANCELLED,
-	SEND_COMPLETE
-} send_state_t;
-
-struct _send_info {
-	send_info_t type;		/* 0 = fetch, 1 = send */
-	CamelOperation *cancel;
-	char *uri;
-	int keep;
-	send_state_t state;
-	GtkProgressBar *bar;
-	GtkButton *stop;
-	GtkLabel *status;
-
-	int timeout_id;
-	char *what;
-	int pc;
-
-	/*time_t update;*/
-	struct _send_data *data;
-};
-
-static struct _send_data *send_data = NULL;
-static GtkWidget *send_recv_dialogue = NULL;
-
-static struct _send_data *setup_send_data(void)
-{
-	struct _send_data *data;
-	
-	if (send_data == NULL) {
-		send_data = data = g_malloc0(sizeof(*data));
-		data->lock = g_mutex_new();
-		data->folders = g_hash_table_new(g_str_hash, g_str_equal);
-		data->inbox = mail_tool_get_local_inbox(NULL);
-		data->active = g_hash_table_new(g_str_hash, g_str_equal);
-	}
-	return send_data;
-}
-
-static void
-receive_cancel(GtkButton *button, struct _send_info *info)
-{
-	if (info->state == SEND_ACTIVE) {
-		camel_operation_cancel(info->cancel);
-		if (info->status)
-			gtk_label_set_text(info->status, _("Cancelling..."));
-		info->state = SEND_CANCELLED;
-	}
-	if (info->stop)
-		gtk_widget_set_sensitive((GtkWidget *)info->stop, FALSE);
-}
-
-static void
-free_folder_info(void *key, struct _folder_info *info, void *data)
-{
-	/*camel_folder_thaw (info->folder);	*/
-	mail_sync_folder(info->folder, NULL, NULL);
-	camel_object_unref(info->folder);
-	g_free(info->uri);
-}
-
-static void free_send_info(void *key, struct _send_info *info, void *data)
-{
-	d(printf("Freeing send info %p\n", info));
-	g_free(info->uri);
-	camel_operation_unref(info->cancel);
-	if (info->timeout_id != 0)
-		gtk_timeout_remove(info->timeout_id);
-	g_free(info->what);
-	g_free(info);
-}
-
-static void
-free_send_data(void)
-{
-	struct _send_data *data = send_data;
-
-	g_assert(g_hash_table_size(data->active) == 0);
-
-	if (data->inbox) {
-		mail_sync_folder(data->inbox, NULL, NULL);
-		/*camel_folder_thaw (data->inbox);		*/
-		camel_object_unref(data->inbox);
-	}
-
-	g_list_free(data->infos);
-	g_hash_table_foreach(data->active, (GHFunc)free_send_info, NULL);
-	g_hash_table_destroy(data->active);
-	g_hash_table_foreach(data->folders, (GHFunc)free_folder_info, NULL);
-	g_hash_table_destroy(data->folders);
-	g_mutex_free(data->lock);
-	g_free(data);
-	send_data = NULL;
-}
-
-static void cancel_send_info(void *key, struct _send_info *info, void *data)
-{
-	receive_cancel(info->stop, info);
-}
-
-static void hide_send_info(void *key, struct _send_info *info, void *data)
-{
-	info->stop = NULL;
-	info->bar = NULL;
-	info->status = NULL;
-
-	if (info->timeout_id != 0) {
-		gtk_timeout_remove (info->timeout_id);
-		info->timeout_id = 0;
-	}
-}
-
-static void
-dialog_destroy_cb (struct _send_data *data, GObject *deadbeef)
-{
-	g_hash_table_foreach (data->active, (GHFunc) hide_send_info, NULL);
-	data->gd = NULL;
-}
-
-static void
-dialogue_response(GtkDialog *gd, int button, struct _send_data *data)
-{
-	switch(button) {
-	case GTK_RESPONSE_CANCEL:
-		d(printf("cancelled whole thing\n"));
-		if (!data->cancelled) {
-			data->cancelled = TRUE;
-			g_hash_table_foreach(data->active, (GHFunc)cancel_send_info, NULL);
-		}
-		gtk_dialog_set_response_sensitive(gd, GTK_RESPONSE_CANCEL, FALSE);
-		break;
-	default:
-		/* FIXME: check this works */
-		d(printf("hiding dialogue\n"));
-		gtk_widget_destroy((GtkWidget *)gd);
-		g_object_unref(gd);
-#if 0
-		g_hash_table_foreach(data->active, (GHFunc)hide_send_info, NULL);
-		data->gd = NULL;
-#endif
-		break;
-	}
-}
-
-static void operation_status(CamelOperation *op, const char *what, int pc, void *data);
-static int operation_status_timeout(void *data);
-
-static char *
-format_url(const char *internal_url)
-{
-	CamelURL *url;
-       	char *pretty_url;
-
-	url = camel_url_new(internal_url, NULL);
-	if (url->host)
-		pretty_url = g_strdup_printf(_("Server: %s, Type: %s"), url->host, url->protocol);
-	else if (url->path)
-		pretty_url = g_strdup_printf(_("Path: %s, Type: %s"), url->path, url->protocol);
-	else 
-		pretty_url = g_strdup_printf(_("Type: %s"), url->protocol);
-
-	camel_url_free(url);
-
-        return pretty_url;
-}
-
-static send_info_t get_receive_type(const char *url)
-{
-	CamelProvider *provider;
-
-	provider = camel_session_get_provider (session, url, NULL);
-	if (!provider)
-		return SEND_INVALID;
-	
-	if (provider->object_types[CAMEL_PROVIDER_STORE]) {
-		if (provider->flags & CAMEL_PROVIDER_IS_STORAGE)
-			return SEND_UPDATE;
-		else
-			return SEND_RECEIVE;
-	} else if (provider->object_types[CAMEL_PROVIDER_TRANSPORT]) {
-		return SEND_SEND;
-	}
-	
-	return SEND_INVALID;
-}
-
-static struct _send_data *
-build_dialogue (const GSList *accounts, CamelFolder *outbox, const char *destination)
-{
-	GtkDialog *gd;
-	GtkTable *table;
-	int row, num_sources;
-	GList *list = NULL;
-	struct _send_data *data;
-        GtkWidget *send_icon, *recv_icon; 
-	GtkLabel *label, *status_label;
-	GtkProgressBar *bar;
-	GtkButton *stop;
-	GtkHSeparator *line;
-	struct _send_info *info;
-	char *pretty_url; 
-	const GSList *l;
-	
-	gd = (GtkDialog *)send_recv_dialogue = gtk_dialog_new_with_buttons(_("Send & Receive Mail"), NULL, 0, NULL);
-	stop = (GtkButton *)gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-	gtk_button_set_label(stop, _("Cancel All"));
-	gtk_dialog_add_action_widget(gd, (GtkWidget *)stop, GTK_RESPONSE_CANCEL);
-	g_object_set(gd, "resizable", FALSE, NULL);
-	gnome_window_icon_set_from_file (GTK_WINDOW (gd), EVOLUTION_ICONSDIR "/send-receive.xpm");
-	
-	num_sources = 0;
-	l = accounts;
-	while (l != NULL) {
-		MailConfigAccount *account = l->data;
-		
-		if (account->source && account->source->url)
-			num_sources++;
-		
-		l = l->next;
-	}
-	
-	table = (GtkTable *)gtk_table_new (num_sources, 4, FALSE);
-       	gtk_box_pack_start (GTK_BOX (gd->vbox), GTK_WIDGET (table), TRUE, TRUE, 0);
-	
-	/* must bet setup after send_recv_dialogue as it may re-trigger send-recv button */
-	data = setup_send_data ();
-	
-	row = 0;
-	while (accounts) {
-		MailConfigAccount *account = accounts->data;
-		MailConfigService *source;
-		
-		source = account->source;
-		if (!account->enabled || !source || !source->url) {
-			accounts = accounts->next;
-			continue;
-		}
-		
-		/* see if we have an outstanding download active */
-		info = g_hash_table_lookup (data->active, source->url);
-		if (info == NULL) {
-			send_info_t type;
-			
-			type = get_receive_type (source->url);
-			if (type == SEND_INVALID) {
-				accounts = accounts->next;
-				continue;
-			}
-			
-			info = g_malloc0 (sizeof (*info));
-			info->type = type;
-			
-			d(printf("adding source %s\n", source->url));
-			
-			info->uri = g_strdup (source->url);
-			info->keep = source->keep_on_server;
-			info->cancel = camel_operation_new (operation_status, info);
-			info->state = SEND_ACTIVE;
-			info->timeout_id = gtk_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
-			
-			g_hash_table_insert (data->active, info->uri, info);
-			list = g_list_prepend (list, info);
-		} else if (info->bar != NULL) {
-			/* incase we get the same source pop up again */
-			accounts = accounts->next;
-			continue;
-		} else if (info->timeout_id == 0)
-			info->timeout_id = gtk_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
-		
-		recv_icon = gtk_image_new_from_file (EVOLUTION_BUTTONSDIR "/receive-24.png");
-		
-	       	pretty_url = format_url (source->url);
-		label = (GtkLabel *)gtk_label_new (pretty_url);
-		g_free (pretty_url);
-		
-		bar = (GtkProgressBar *)gtk_progress_bar_new ();
-		
-		stop = (GtkButton *)gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-		status_label = (GtkLabel *)gtk_label_new ((info->type == SEND_UPDATE) ? _("Updating...") :
-							  _("Waiting..."));
-		
-		/* g_object_set(data->label, "bold", TRUE, NULL); */
-		gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
-		gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5);
-		
-	        gtk_table_attach (table, (GtkWidget *)recv_icon, 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 3, 1);
-		gtk_table_attach (table, (GtkWidget *)label, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 3, 1);
-		gtk_table_attach (table, (GtkWidget *)bar, 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 3, 1);
-		gtk_table_attach (table, (GtkWidget *)stop, 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 3, 1);
-		gtk_table_attach (table, (GtkWidget *)status_label, 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 3, 1);
-		
-		info->bar = bar;
-		info->status = status_label;
-		info->stop = stop;
-		info->data = data;
-                
-		g_signal_connect(stop, "clicked", G_CALLBACK(receive_cancel), info);
-		accounts = accounts->next;
-		row = row + 2;
-	}
-	
-	line = (GtkHSeparator *)gtk_hseparator_new ();
-	gtk_table_attach (table, GTK_WIDGET (line), 0, 4, row, row+1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 3, 3);
-	row++;
-	gtk_widget_show_all (GTK_WIDGET (table));
-	
-	if (outbox && destination) {
-		info = g_hash_table_lookup (data->active, destination);
-		if (info == NULL) {
-			info = g_malloc0 (sizeof (*info));
-			info->type = SEND_SEND;
-			d(printf("adding dest %s\n", destination));
-			
-			info->uri = g_strdup (destination);
-			info->keep = FALSE;
-			info->cancel = camel_operation_new (operation_status, info);
-			info->state = SEND_ACTIVE;
-			info->timeout_id = gtk_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
-			
-			g_hash_table_insert (data->active, info->uri, info);
-			list = g_list_prepend (list, info);
-		} else if (info->timeout_id == 0)
-			info->timeout_id = gtk_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info);
-		
-		send_icon  = gtk_image_new_from_file (EVOLUTION_BUTTONSDIR "/send-24.png");
-		
-		pretty_url = format_url (destination);
-		label = (GtkLabel *)gtk_label_new (pretty_url);
-		g_free (pretty_url);
-		
-		bar = (GtkProgressBar *)gtk_progress_bar_new ();
-		stop = (GtkButton *)gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-		status_label = (GtkLabel *)gtk_label_new (_("Waiting..."));
-		
-		gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
-		gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5);
-		
-		gtk_table_attach (table, GTK_WIDGET (send_icon), 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 3, 1);
-		gtk_table_attach (table, GTK_WIDGET (label), 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 3, 1);
-		gtk_table_attach (table, GTK_WIDGET (bar), 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 3, 1);
-		gtk_table_attach (table, GTK_WIDGET (stop), 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 3, 1);
-		gtk_table_attach (table, GTK_WIDGET (status_label), 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 3, 1);
-		
-		info->bar = bar;
-		info->stop = stop;
-		info->data = data;
-		info->status = status_label;
-		
-		g_signal_connect(stop, "clicked", G_CALLBACK(receive_cancel), info);
-		gtk_widget_show_all (GTK_WIDGET (table));
-	}
-	
-	gtk_widget_show (GTK_WIDGET (gd));
-	
-	g_signal_connect (gd, "response", G_CALLBACK (dialogue_response), data);
-	
-	g_object_weak_ref ((GObject *) gd, (GWeakNotify) dialog_destroy_cb, data);
-	
-	data->infos = list;
-	data->gd = gd;
-	
-	return data;
-}
-
-static void
-update_folders(char *uri, struct _folder_info *info, void *data)
-{
-	time_t now = *((time_t *)data);
-
-	d(printf("checking update for folder: %s\n", info->uri));
-
-	/* let it flow through to the folders every 10 seconds */
-	/* we back off slowly as we progress */
-	if (now > info->update+10+info->count*5) {
-		d(printf("upating a folder: %s\n", info->uri));
-		/*camel_folder_thaw(info->folder);
-		  camel_folder_freeze(info->folder);*/
-		info->update = now;
-		info->count++;
-	}
-}
-
-static void set_send_status(struct _send_info *info, const char *desc, int pc)
-{
-	/* FIXME: LOCK */
-	g_free(info->what);
-	info->what = g_strdup(desc);
-	info->pc = pc;
-}
-
-static void
-receive_status (CamelFilterDriver *driver, enum camel_filter_status_t status, int pc, const char *desc, void *data)
-{
-	struct _send_info *info = data;
-	time_t now = time(0);
-
-	/* let it flow through to the folder, every now and then too? */
-	g_hash_table_foreach(info->data->folders, (GHFunc)update_folders, &now);
-
-	if (info->data->inbox && now > info->data->inbox_update+20) {
-		d(printf("updating inbox too\n"));
-		/* this doesn't seem to work right :( */
-		/*camel_folder_thaw(info->data->inbox);
-		  camel_folder_freeze(info->data->inbox);*/
-		info->data->inbox_update = now;
-	}
-
-	/* we just pile them onto the port, assuming it can handle it.
-	   We could also have a receiver port and see if they've been processed
-	   yet, so if this is necessary its not too hard to add */
-	/* the mail_gui_port receiver will free everything for us */
-	switch (status) {
-	case CAMEL_FILTER_STATUS_START:
-	case CAMEL_FILTER_STATUS_END:
-		set_send_status(info, desc, pc);
-		break;
-	default:
-		break;
-	}
-}
-
-static int operation_status_timeout(void *data)
-{
-	struct _send_info *info = data;
-
-	if (info->bar) {
-		gtk_progress_bar_set_fraction((GtkProgressBar *)info->bar, (gfloat)(info->pc/100.0));
-		gtk_label_set_text(info->status, info->what);
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-/* for camel operation status */
-static void operation_status(CamelOperation *op, const char *what, int pc, void *data)
-{
-	struct _send_info *info = data;
-
-	/*printf("Operation '%s', percent %d\n");*/
-	switch (pc) {
-	case CAMEL_OPERATION_START:
-		pc = 0;
-		break;
-	case CAMEL_OPERATION_END:
-		pc = 100;
-		break;
-	}
-
-	set_send_status(info, what, pc);
-}
-
-/* when receive/send is complete */
-static void
-receive_done (char *uri, void *data)
-{
-	struct _send_info *info = data;
-
-	if (info->bar) {
-		gtk_progress_bar_set_fraction((GtkProgressBar *)info->bar, (gfloat)1.0);
-
-		switch(info->state) {
-		case SEND_CANCELLED:
-			gtk_label_set_text(info->status, _("Cancelled."));
-			break;
-		default:
-			info->state = SEND_COMPLETE;
-			gtk_label_set_text(info->status, _("Complete."));
-		}
-	}
-
-	if (info->stop)
-		gtk_widget_set_sensitive((GtkWidget *)info->stop, FALSE);
-
-	/* remove/free this active download */
-	d(printf("%s: freeing info %p\n", __FUNCTION__, info));
-	g_hash_table_remove(info->data->active, info->uri);
-	info->data->infos = g_list_remove(info->data->infos, info);
-
-	if (g_hash_table_size(info->data->active) == 0) {
-		if (info->data->gd)
-			gtk_widget_destroy((GtkWidget *)info->data->gd);
-		free_send_data();
-	}
-
-	free_send_info(NULL, info, NULL);
-}
-
-/* same for updating */
-static void
-receive_update_done(CamelStore *store, CamelFolderInfo *info, void *data)
-{
-	receive_done("", data);
-}
-
-/* although we dont do anythign smart here yet, there is no need for this interface to
-   be available to anyone else.
-   This can also be used to hook into which folders are being updated, and occasionally
-   let them refresh */
-static CamelFolder *
-receive_get_folder(CamelFilterDriver *d, const char *uri, void *data, CamelException *ex)
-{
-	struct _send_info *info = data;
-	CamelFolder *folder;
-	struct _folder_info *oldinfo;
-	char *oldkey;
-
-	g_mutex_lock(info->data->lock);
-	oldinfo = g_hash_table_lookup(info->data->folders, uri);
-	g_mutex_unlock(info->data->lock);
-	if (oldinfo) {
-		camel_object_ref(oldinfo->folder);
-		return oldinfo->folder;
-	}
-	folder = mail_tool_uri_to_folder (uri, 0, ex);
-	if (!folder)
-		return NULL;
-
-	/* we recheck that the folder hasn't snuck in while we were loading it... */
-	/* and we assume the newer one is the same, but unref the old one anyway */
-	g_mutex_lock(info->data->lock);
-	
-	if (g_hash_table_lookup_extended(info->data->folders, uri, (void **)&oldkey, (void **)&oldinfo)) {
-		camel_object_unref(oldinfo->folder);
-		oldinfo->folder = folder;
-	} else {
-		/*camel_folder_freeze (folder);		*/
-		oldinfo = g_malloc0(sizeof(*oldinfo));
-		oldinfo->folder = folder;
-		oldinfo->uri = g_strdup(uri);
-		g_hash_table_insert(info->data->folders, oldinfo->uri, oldinfo);
-	}
-	
-	camel_object_ref (folder);
-	
-	g_mutex_unlock(info->data->lock);
-	
-	return folder;
-}
-
-static void
-receive_update_got_folderinfo (CamelStore *store, CamelFolderInfo *info, void *data)
-{
-	receive_done ("", data);
-}
-
-static void
-receive_update_got_store (char *uri, CamelStore *store, void *data)
-{
-	struct _send_info *info = data;
-	
-	if (store) {
-		EvolutionStorage *storage = mail_lookup_storage (store);
-		
-		if (storage) {
-			mail_note_store(store, storage, CORBA_OBJECT_NIL, receive_update_done, info);
-			/*bonobo_object_unref (BONOBO_OBJECT (storage));*/
-		} else {
-			/* If we get here, store must be an external
-			 * storage other than /local. (Eg, Exchange).
-			 * Do a get_folder_info just to force it to
-			 * update itself.
-			 */
-			mail_get_folderinfo(store, receive_update_got_folderinfo, info);
-		}
-	} else {
-		receive_done ("", info);
-	}
-}
-
-void mail_send_receive (void)
-{
-	const GSList *accounts;
-	GList *scan;
-	struct _send_data *data;
-	extern CamelFolder *outbox_folder;
-	const MailConfigAccount *account;
-	
-	if (send_recv_dialogue != NULL) {
-		if (GTK_WIDGET_REALIZED(send_recv_dialogue)) {
-			gdk_window_show(send_recv_dialogue->window);
-			gdk_window_raise(send_recv_dialogue->window);
-		}
-		return;
-	}
-	
-	if (!camel_session_is_online (session))
-		return;
-	
-	if (!(accounts = mail_config_get_accounts ()))
-		return;
-	
-	account = mail_config_get_default_account ();
-	if (!account || !account->transport)
-		return;
-	
-	data = build_dialogue (accounts, outbox_folder, account->transport->url);
-	scan = data->infos;
-	while (scan) {
-		struct _send_info *info = scan->data;
-		
-		switch(info->type) {
-		case SEND_RECEIVE:
-			mail_fetch_mail(info->uri, info->keep,
-					FILTER_SOURCE_INCOMING,
-					info->cancel,
-					receive_get_folder, info,
-					receive_status, info,
-					receive_done, info);
-			break;
-		case SEND_SEND:
-			/* todo, store the folder in info? */
-			mail_send_queue(outbox_folder, info->uri,
-					FILTER_SOURCE_OUTGOING,
-					info->cancel,
-					receive_get_folder, info,
-					receive_status, info,
-					receive_done, info);
-			break;
-		case SEND_UPDATE:
-			/* FIXME: error reporting? */
-			mail_get_store(info->uri, receive_update_got_store, info);
-			break;
-		default:
-			g_assert_not_reached ();
-		}
-		scan = scan->next;
-	}
-}
-
-struct _auto_data {
-	char *uri;
-	int keep;		/* keep on server flag */
-	int period;		/* in seconds */
-	int timeout_id;
-};
-
-static GHashTable *auto_active;
-
-static gboolean
-auto_timeout(void *data)
-{
-	struct _auto_data *info = data;
-
-	if (camel_session_is_online(session))
-		mail_receive_uri(info->uri, info->keep);
-
-	return TRUE;
-}
-
-static void auto_setup_set(void *key, struct _auto_data *info, GHashTable *set)
-{
-	g_hash_table_insert(set, info->uri, info);
-}
-
-static void auto_clean_set(void *key, struct _auto_data *info, GHashTable *set)
-{
-	d(printf("removing auto-check for %s %p\n", info->uri, info));
-	g_hash_table_remove(set, info->uri);
-	gtk_timeout_remove(info->timeout_id);
-	g_free(info->uri);
-	g_free(info);
-}
-
-/* call to setup initial, and after changes are made to the config */
-/* FIXME: Need a cleanup funciton for when object is deactivated */
-void
-mail_autoreceive_setup (void)
-{
-	GHashTable *set_hash;
-	const GSList *accounts;
-	
-	if (!(accounts = mail_config_get_accounts ()))
-		return;
-	
-	if (auto_active == NULL)
-		auto_active = g_hash_table_new(g_str_hash, g_str_equal);
-	
-	set_hash = g_hash_table_new(g_str_hash, g_str_equal);
-	g_hash_table_foreach(auto_active, (GHFunc)auto_setup_set, set_hash);
-	
-	while (accounts) {
-		MailConfigAccount *account = accounts->data;
-		MailConfigService *source;
-		
-		source = account->source;
-		
-		if (account->enabled && source && source->url && source->auto_check) {
-			struct _auto_data *info;
-			
-			d(printf("setting up auto-receive mail for : %s\n", source->url));
-			
-			g_hash_table_remove(set_hash, source->url);
-			info = g_hash_table_lookup(auto_active, source->url);
-			if (info) {
-				info->keep = source->keep_on_server;
-				if (info->period != source->auto_check_time*60) {
-					info->period = source->auto_check_time*60;
-					gtk_timeout_remove(info->timeout_id);
-					info->timeout_id = gtk_timeout_add(info->period*1000, auto_timeout, info);
-				}
-			} else {
-				info = g_malloc0(sizeof(*info));
-				info->uri = g_strdup(source->url);
-				info->keep = source->keep_on_server;
-				info->period = source->auto_check_time*60;
-				info->timeout_id = gtk_timeout_add(info->period*1000, auto_timeout, info);
-				g_hash_table_insert(auto_active, info->uri, info);
-				/* If we do this at startup, it can cause the logon dialogue to be hidden,
-				   so lets not */
-				/*mail_receive_uri(source->url, source->keep_on_server);*/
-			}
-		}
-		
-		accounts = accounts->next;
-	}
-
-	g_hash_table_foreach(set_hash, (GHFunc)auto_clean_set, auto_active);
-	g_hash_table_destroy(set_hash);
-}
-
-/* we setup the download info's in a hashtable, if we later need to build the gui, we insert
-   them in to add them. */
-void
-mail_receive_uri (const char *uri, int keep)
-{
-	struct _send_info *info;
-	struct _send_data *data;
-	extern CamelFolder *outbox_folder;
-	send_info_t type;
-	
-	data = setup_send_data();
-	info = g_hash_table_lookup(data->active, uri);
-	if (info != NULL) {
-		d(printf("download of %s still in progress\n", uri));
-		return;
-	}
-	
-	d(printf("starting non-interactive download of '%s'\n", uri));
-	
-	type = get_receive_type (uri);
-	if (type == SEND_INVALID) {
-		d(printf ("unsupported provider: '%s'\n", uri));
-		return;
-	}
-	
-	info = g_malloc0 (sizeof (*info));
-	info->type = type;
-	info->bar = NULL;
-	info->status = NULL;
-	info->uri = g_strdup (uri);
-	info->keep = keep;
-	info->cancel = camel_operation_new (operation_status, info);
-	info->stop = NULL;
-	info->data = data;
-	info->state = SEND_ACTIVE;
-	info->timeout_id = 0;
-	
-	d(printf("Adding new info %p\n", info));
-	
-	g_hash_table_insert (data->active, info->uri, info);
-	
-	switch (info->type) {
-	case SEND_RECEIVE:
-		mail_fetch_mail (info->uri, info->keep,
-				 FILTER_SOURCE_INCOMING,
-				 info->cancel,
-				 receive_get_folder, info,
-				 receive_status, info,
-				 receive_done, info);
-		break;
-	case SEND_SEND:
-		/* todo, store the folder in info? */
-		mail_send_queue (outbox_folder, info->uri,
-				 FILTER_SOURCE_OUTGOING,
-				 info->cancel,
-				 receive_get_folder, info,
-				 receive_status, info,
-				 receive_done, info);
-		break;
-	case SEND_UPDATE:
-		/* FIXME: error reporting? */
-		mail_get_store (info->uri, receive_update_got_store, info);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-void
-mail_send (void)
-{
-	extern CamelFolder *outbox_folder;
-	const MailConfigService *transport;
-	struct _send_info *info;
-	struct _send_data *data;
-	send_info_t type;
-	
-	transport = mail_config_get_default_transport ();
-	if (!transport || !transport->url)
-		return;
-	
-	data = setup_send_data ();
-	info = g_hash_table_lookup (data->active, transport->url);
-	if (info != NULL) {
-		d(printf("send of %s still in progress\n", transport->url));
-		return;
-	}
-	
-	d(printf("starting non-interactive send of '%s'\n", transport->url));
-	
-	type = get_receive_type (transport->url);
-	if (type == SEND_INVALID) {
-		d(printf ("unsupported provider: '%s'\n", transport->url));
-		return;
-	}
-	
-	info = g_malloc0 (sizeof (*info));
-	info->type = SEND_SEND;
-	info->bar = NULL;
-	info->status = NULL;
-	info->uri = g_strdup (transport->url);
-	info->keep = FALSE;
-	info->cancel = camel_operation_new (operation_status, info);
-	info->stop = NULL;
-	info->data = data;
-	info->state = SEND_ACTIVE;
-	info->timeout_id = 0;
-	
-	d(printf("Adding new info %p\n", info));
-	
-	g_hash_table_insert (data->active, info->uri, info);
-	
-	/* todo, store the folder in info? */
-	mail_send_queue (outbox_folder, info->uri,
-			 FILTER_SOURCE_OUTGOING,
-			 info->cancel,
-			 receive_get_folder, info,
-			 receive_status, info,
-			 receive_done, info);
-}
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
deleted file mode 100644
index a6db0e5eac..0000000000
--- a/mail/mail-send-recv.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Michael Zucchi 
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef MAIL_SEND_RECV_H
-#define MAIL_SEND_RECV_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include "mail-config.h"
-
-/* send/receive all uri's */
-void mail_send_receive(void);
-/* receive a single uri */
-void mail_receive_uri(const char *uri, int keep);
-void mail_send (void);
-/* setup auto receive stuff */
-void mail_autoreceive_setup(void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! MAIL_SEND_RECV_H */
diff --git a/mail/mail-session.c b/mail/mail-session.c
deleted file mode 100644
index 05375d992f..0000000000
--- a/mail/mail-session.c
+++ /dev/null
@@ -1,986 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* mail-session.c: handles the session information and resource manipulation */
-/*
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-#include 
-
-#include "camel/camel-filter-driver.h"
-#include "filter/filter-context.h"
-#include "filter/filter-filter.h"
-#include "mail.h"
-#include "mail-session.h"
-#include "mail-tools.h"
-#include "mail-mt.h"
-#include "mail-ops.h"
-#include "e-util/e-passwords.h"
-#include "e-util/e-msgport.h"
-
-#define d(x)
-
-CamelSession *session;
-
-
-#define MAIL_SESSION_TYPE     (mail_session_get_type ())
-#define MAIL_SESSION(obj)     (CAMEL_CHECK_CAST((obj), MAIL_SESSION_TYPE, MailSession))
-#define MAIL_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), MAIL_SESSION_TYPE, MailSessionClass))
-#define MAIL_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), MAIL_SESSION_TYPE))
-
-#define MAIL_SESSION_LOCK(s, l) (e_mutex_lock(((MailSession *)s)->l))
-#define MAIL_SESSION_UNLOCK(s, l) (e_mutex_unlock(((MailSession *)s)->l))
-
-typedef struct _MailSession {
-	CamelSession parent_object;
-
-	gboolean interactive;
-	FILE *filter_logfile;
-
-	EMutex *lock;
-
-	MailAsyncEvent *async;
-
-	/* must all be accessed with lock held ! */
-	unsigned int timeout_id;/* next camel timneout id */
-	EDList timeouts;	/* list of struct _timeout_data's of current or pending removed timeouts */
-} MailSession;
-
-typedef struct _MailSessionClass {
-	CamelSessionClass parent_class;
-
-} MailSessionClass;
-
-static char *get_password(CamelSession *session, const char *prompt, gboolean secret, CamelService *service, const char *item, CamelException *ex);
-static void forget_password(CamelSession *session, CamelService *service, const char *item, CamelException *ex);
-static gboolean alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel);
-static guint register_timeout(CamelSession *session, guint32 interval, CamelTimeoutCallback cb, gpointer camel_data);
-static gboolean remove_timeout(CamelSession *session, guint handle);
-static CamelFilterDriver *get_filter_driver(CamelSession *session, const char *type, CamelException *ex);
-
-static void
-init (MailSession *session)
-{
-	session->lock = e_mutex_new(E_MUTEX_REC);
-	session->timeout_id = 1; /* first timeout id */
-	session->async = mail_async_event_new();
-	e_dlist_init(&session->timeouts);
-}
-
-static void
-finalise (MailSession *session)
-{
-	mail_async_event_destroy(session->async);
-	e_mutex_destroy(session->lock);
-}
-
-static void
-class_init (MailSessionClass *mail_session_class)
-{
-	CamelSessionClass *camel_session_class = CAMEL_SESSION_CLASS (mail_session_class);
-	
-	/* virtual method override */
-	camel_session_class->get_password = get_password;
-	camel_session_class->forget_password = forget_password;
-	camel_session_class->alert_user = alert_user;
-	camel_session_class->get_filter_driver = get_filter_driver;
-}
-
-static CamelType
-mail_session_get_type (void)
-{
-	static CamelType mail_session_type = CAMEL_INVALID_TYPE;
-	
-	if (mail_session_type == CAMEL_INVALID_TYPE) {
-		mail_session_type = camel_type_register (
-			camel_session_get_type (),
-			"MailSession",
-			sizeof (MailSession),
-			sizeof (MailSessionClass),
-			(CamelObjectClassInitFunc) class_init,
-			NULL,
-			(CamelObjectInitFunc) init,
-			(CamelObjectFinalizeFunc) finalise);
-	}
-	
-	return mail_session_type;
-}
-
-
-static char *
-make_key (CamelService *service, const char *item)
-{
-	char *key;
-	
-	if (service)
-		key = camel_url_to_string (service->url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
-	else
-		key = g_strdup (item);
-	
-	return key;
-}
-
-/* ********************************************************************** */
-
-static GtkDialog *password_dialog = NULL;
-static EDList password_list = E_DLIST_INITIALISER(password_list);
-
-struct _pass_msg {
-	struct _mail_msg msg;
-	
-	CamelSession *session;
-	const char *prompt;
-	gboolean secret;
-	CamelService *service;
-	const char *item;
-	CamelException *ex;
-	
-	char *service_url;
-	char *key;
-	
-	MailConfigService *config_service;
-	GtkWidget *check;
-	GtkWidget *entry;
-	char *result;
-	int ismain;
-};
-
-static void do_get_pass(struct _mail_msg *mm);
-
-static void
-pass_response (GtkDialog *dialog, int button, void *data)
-{
-	struct _pass_msg *m = data;
-	
-	switch (button) {
-	case GTK_RESPONSE_OK: {
-		gboolean cache, remember;
-		
-		m->result = g_strdup (gtk_entry_get_text ((GtkEntry *) m->entry));
-		remember = cache = m->check ? gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (m->check)) : FALSE;
-		
-		if (m->service_url) {
-			if (m->service) {
-				mail_config_service_set_save_passwd (m->config_service, cache);
-				
-				/* set `cache' to TRUE because people don't want to have to
-				   re-enter their passwords for this session even if they told
-				   us not to cache their passwords in the dialog...*sigh* */
-				cache = TRUE;
-			}
-		} else {
-			/* we can't remember the password if it isn't for an account (pgp?) */
-			remember = FALSE;
-		}
-		
-		if (cache) {
-			/* cache the password for the session */
-			e_passwords_add_password (m->key, m->result);
-			
-			/* should we remember it between sessions? */
-			if (remember)
-				e_passwords_remember_password ("Mail", m->key);
-		}
-		break; }
-	default:
-		camel_exception_set (m->ex, CAMEL_EXCEPTION_USER_CANCEL, _("User canceled operation."));
-		break;
-	}
-	
-	gtk_widget_destroy ((GtkWidget *) dialog);
-	
-	password_dialog = NULL;
-	e_msgport_reply ((EMsg *)m);
-	
-	if ((m = (struct _pass_msg *) e_dlist_remhead (&password_list)))
-		do_get_pass ((struct _mail_msg *) m);
-}
-
-static void
-request_password (struct _pass_msg *m)
-{
-	const MailConfigAccount *mca = NULL;
-	char *title;
-	
-	/* If we already have a password_dialog up, save this request till later */
-	if (!m->ismain && password_dialog) {
-		e_dlist_addtail (&password_list, (EDListNode *)m);
-		return;
-	}
-	
-	if (m->service_url) {
-		if ((mca = mail_config_get_account_by_source_url (m->service_url)))
-			m->config_service = mca->source;
-		else if ((mca = mail_config_get_account_by_transport_url (m->service_url)))
-			m->config_service = mca->transport;
-	}
-	
-	if (mca)
-		title = g_strdup_printf (_("Enter Password for %s"), mca->name);
-	else
-		title = g_strdup (_("Enter Password"));
-	
-	password_dialog = (GtkDialog *) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_QUESTION,
-								GTK_BUTTONS_OK_CANCEL, "%s", m->prompt);
-	
-	g_signal_connect (password_dialog, "response", G_CALLBACK (pass_response), m);
-	gtk_window_set_title (GTK_WINDOW (password_dialog), title);
-	g_free (title);
-	
-	m->entry = gtk_entry_new ();
-	gtk_entry_set_visibility ((GtkEntry *) m->entry, !m->secret);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (password_dialog)->vbox), m->entry, TRUE, FALSE, 0);
-	gtk_widget_show (m->entry);
-	
-	if (m->service_url == NULL || m->service != NULL) {
-		m->check = gtk_check_button_new_with_mnemonic (m->service_url? _("_Remember this password") :
-							       _("_Remember this password for the remainder of this session"));
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (m->check), m->config_service->save_passwd);
-		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (password_dialog)->vbox), m->check, TRUE, FALSE, 0);
-		gtk_widget_show (m->check);
-	}
-	
-	if (m->ismain)
-		gtk_dialog_run (password_dialog);
-	else
-		gtk_widget_show ((GtkWidget *) password_dialog);
-}
-
-static void
-do_get_pass(struct _mail_msg *mm)
-{
-	struct _pass_msg *m = (struct _pass_msg *)mm;
-	MailSession *mail_session = MAIL_SESSION (m->session);
-	
-	if (!strcmp (m->item, "popb4smtp_uri")) {
-		char *url = camel_url_to_string(m->service->url, 0);
-		const MailConfigAccount *account = mail_config_get_account_by_transport_url(url);
-		
-		g_free(url);
-		if (account)
-			m->result = g_strdup(account->source->url);
-	} else if (m->key) {
-		m->result = e_passwords_get_password ("Mail", m->key);
-		if (m->result == NULL) {
-			if (mail_session->interactive) {
-				request_password(m);
-				return;
-			}
-		}
-	}
-
-	e_msgport_reply((EMsg *)mm);
-}
-
-static void
-do_free_pass(struct _mail_msg *mm)
-{
-	struct _pass_msg *m = (struct _pass_msg *)mm;
-
-	g_free(m->service_url);
-	g_free(m->key);
-}
-
-static struct _mail_msg_op get_pass_op = {
-	NULL,
-	do_get_pass,
-	NULL,
-	do_free_pass,
-};
-
-static char *
-get_password (CamelSession *session, const char *prompt, gboolean secret, CamelService *service, const char *item, CamelException *ex)
-{
-	struct _pass_msg *m, *r;
-	EMsgPort *pass_reply;
-	char *ret;
-
-	/* We setup an async request and send it off, and wait for it to return */
-	/* If we're really in main, we dont of course ...
-	   ... but this shouldn't be allowed because of locking issues */
-	pass_reply = e_msgport_new ();
-	m = mail_msg_new(&get_pass_op, pass_reply, sizeof(struct _pass_msg));
-	m->ismain = pthread_self() == mail_gui_thread;
-	m->session = session;
-	m->prompt = prompt;
-	m->secret = secret;
-	m->service = service;
-	m->item = item;
-	m->ex = ex;
-	if (service)
-		m->service_url = camel_url_to_string (service->url, CAMEL_URL_HIDE_ALL);
-	m->key = make_key(service, item);
-
-	if (m->ismain)
-		do_get_pass((struct _mail_msg *)m);
-	else {
-		extern EMsgPort *mail_gui_port2;
-
-		e_msgport_put(mail_gui_port2, (EMsg *)m);
-	}
-	
-	e_msgport_wait(pass_reply);
-	r = (struct _pass_msg *)e_msgport_get(pass_reply);
-	g_assert(m == r);
-
-	ret = m->result;
-	mail_msg_free(m);
-	e_msgport_destroy(pass_reply);
-	
-	return ret;
-}
-
-static void
-main_forget_password (CamelSession *session, CamelService *service, const char *item, CamelException *ex)
-{
-	char *key = make_key (service, item);
-	
-	e_passwords_forget_password ("Mail", key);
-	
-	g_free (key);
-}
-
-static void
-forget_password (CamelSession *session, CamelService *service, const char *item, CamelException *ex)
-{
-	mail_call_main(MAIL_CALL_p_pppp, (MailMainFunc)main_forget_password,
-		       session, service, item, ex);
-}
-
-/* ********************************************************************** */
-
-static GtkDialog *message_dialog;
-static EDList message_list = E_DLIST_INITIALISER(password_list);
-
-struct _user_message_msg {
-	struct _mail_msg msg;
-
-	CamelSessionAlertType type;
-	const char *prompt;
-
-	unsigned int allow_cancel:1;
-	unsigned int result:1;
-	unsigned int ismain:1;
-};
-
-static void do_user_message (struct _mail_msg *mm);
-
-/* clicked, send back the reply */
-static void
-user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *m)
-{
-	gtk_widget_destroy ((GtkWidget *) dialog);
-	
-	message_dialog = NULL;
-	
-	/* if !allow_cancel, then we've already replied */
-	if (m->allow_cancel) {
-		m->result = button == GTK_RESPONSE_OK;
-		e_msgport_reply((EMsg *)m);
-	}
-	
-	/* check for pendings */
-	if ((m = (struct _user_message_msg *)e_dlist_remhead(&message_list)))
-		do_user_message((struct _mail_msg *)m);
-}
-
-static void
-do_user_message (struct _mail_msg *mm)
-{
-	struct _user_message_msg *m = (struct _user_message_msg *)mm;
-	GtkMessageType msg_type;
-	
-	if (!m->ismain && message_dialog != NULL) {
-		e_dlist_addtail (&message_list, (EDListNode *)m);
-		return;
-	}
-	
-	switch (m->type) {
-	case CAMEL_SESSION_ALERT_INFO:
-		msg_type = GTK_MESSAGE_INFO;
-		break;
-	case CAMEL_SESSION_ALERT_WARNING:
-		msg_type = GTK_MESSAGE_WARNING;
-		break;
-	case CAMEL_SESSION_ALERT_ERROR:
-		msg_type = GTK_MESSAGE_ERROR;
-		break;
-	default:
-		msg_type = GTK_MESSAGE_INFO;
-	}
-	
-	message_dialog = (GtkDialog *) gtk_message_dialog_new (
-		NULL, 0, msg_type,
-		m->allow_cancel ? GTK_BUTTONS_OK_CANCEL : GTK_BUTTONS_OK,
-		m->prompt);
-	gtk_dialog_set_default_response (message_dialog, m->allow_cancel ? GTK_RESPONSE_CANCEL : GTK_RESPONSE_OK);
-	g_object_set ((GObject *) message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL);
-	
-	/* We only need to wait for the result if we allow cancel otherwise show but send result back instantly */
-	if (m->allow_cancel) {
-		g_signal_connect (message_dialog, "response", G_CALLBACK (user_message_response), m);
-		if (m->ismain)
-			gtk_dialog_run (message_dialog);
-		else
-			gtk_widget_show ((GtkWidget *) message_dialog);
-	} else {
-		gtk_widget_show ((GtkWidget *) message_dialog);
-		m->result = TRUE;
-		e_msgport_reply ((EMsg *)m);
-	}
-}
-
-static struct _mail_msg_op user_message_op = { NULL, do_user_message, NULL, NULL };
-
-static gboolean
-alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel)
-{
-	MailSession *mail_session = MAIL_SESSION (session);
-	struct _user_message_msg *m, *r;
-	EMsgPort *user_message_reply;
-	gboolean ret;
-
-	if (!mail_session->interactive)
-		return FALSE;
-
-	user_message_reply = e_msgport_new ();	
-	m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m));
-	m->ismain = pthread_self() == mail_gui_thread;
-	m->type = type;
-	m->prompt = prompt;
-	m->allow_cancel = cancel;
-
-	if (m->ismain)
-		do_user_message((struct _mail_msg *)m);
-	else {
-		extern EMsgPort *mail_gui_port2;
-
-		e_msgport_put(mail_gui_port2, (EMsg *)m);
-	}
-
-	e_msgport_wait(user_message_reply);
-	r = (struct _user_message_msg *)e_msgport_get(user_message_reply);
-	g_assert(m == r);
-
-	ret = m->result;
-	mail_msg_free(m);
-	e_msgport_destroy(user_message_reply);
-
-	return ret;
-}
-
-/* ******************** */
-
-struct _timeout_data {
-	struct _timeout_data *next;
-	struct _timeout_data *prev;
-
-	CamelSession *session;
-
-	guint32 interval;
-
-	CamelTimeoutCallback cb;
-	void *camel_data;
-
-	guint id;		/* the camel 'id' */
-	guint timeout_id;	/* the gtk 'id' */
-
-	unsigned int busy:1;		/* on if its currently running */
-	unsigned int removed:1;		/* if its been removed since */
-};
-
-struct _timeout_msg {
-	struct _mail_msg msg;
-
-	CamelSession *session;
-	unsigned int id;
-	int result;
-};
-
-static struct _timeout_data *
-find_timeout(EDList *list, unsigned int id)
-{
-	struct _timeout_data *td, *tn;
-
-	td = (struct _timeout_data *)list->head;
-	tn = td->next;
-	while (tn) {
-		if (td->id == id)
-			return td;
-		td = tn;
-		tn = tn->next;
-	}
-
-	return NULL;
-}
-
-static void
-timeout_timeout (struct _mail_msg *mm)
-{
-	struct _timeout_msg *m = (struct _timeout_msg *)mm;
-	MailSession *ms = (MailSession *)m->session;
-	struct _timeout_data *td;
-
-	MAIL_SESSION_LOCK(ms, lock);
-	td = find_timeout(&ms->timeouts, m->id);
-	if (td && !td->removed) {
-		if (td->busy) {
-			g_warning("Timeout event dropped, still busy with last one");
-		} else {
-			td->busy = TRUE;
-			m->result = td->cb(td->camel_data);
-			td->busy = FALSE;
-			td->removed = !m->result;
-		}
-	}
-	MAIL_SESSION_UNLOCK(ms, lock);
-}
-
-static void
-timeout_done (struct _mail_msg *mm)
-{
-	struct _timeout_msg *m = (struct _timeout_msg *) mm;
-	MailSession *ms = (MailSession *) m->session;
-	struct _timeout_data *td;
-	
-	if (!m->result) {
-		MAIL_SESSION_LOCK(ms, lock);
-		td = find_timeout (&ms->timeouts, m->id);
-		if (td) {
-			e_dlist_remove ((EDListNode *) td);
-			if (td->timeout_id)
-				gtk_timeout_remove (td->timeout_id);
-			g_free (td);
-		}
-		MAIL_SESSION_UNLOCK(ms, lock);
-	}
-}
-
-static void
-timeout_free (struct _mail_msg *mm)
-{
-	struct _timeout_msg *m = (struct _timeout_msg *)mm;
-	
-	camel_object_unref (m->session);
-}
-
-static struct _mail_msg_op timeout_op = {
-	NULL,
-	timeout_timeout,
-	timeout_done,
-	timeout_free,
-};
-
-static gboolean 
-camel_timeout (gpointer data)
-{
-	struct _timeout_data *td = data;
-	struct _timeout_msg *m;
-	
-	/* stop if we are removed pending */
-	if (td->removed)
-		return FALSE;
-	
-	m = mail_msg_new (&timeout_op, NULL, sizeof (*m));
-	
-	m->session = td->session;
-	camel_object_ref (td->session);
-	m->id = td->id;
-	
-	e_thread_put (mail_thread_queued, (EMsg *)m);
-	
-	return TRUE;
-}
-
-static void
-main_register_timeout (CamelSession *session, void *event_data, void *data)
-{
-	MailSession *ms = (MailSession *)session;
-	unsigned int handle = (unsigned int)event_data;
-	struct _timeout_data *td;
-	
-	MAIL_SESSION_LOCK(session, lock);
-	td = find_timeout (&ms->timeouts, handle);
-	if (td) {
-		if (td->removed) {
-			e_dlist_remove ((EDListNode *) td);
-			if (td->timeout_id)
-				gtk_timeout_remove (td->timeout_id);
-			g_free (td);
-		} else {
-			td->timeout_id = gtk_timeout_add (td->interval, camel_timeout, td);
-		}
-	}
-	MAIL_SESSION_UNLOCK(session, lock);
-	
-	camel_object_unref (ms);
-}
-
-static guint
-register_timeout (CamelSession *session, guint32 interval, CamelTimeoutCallback cb, gpointer camel_data)
-{
-	struct _timeout_data *td;
-	MailSession *ms = (MailSession *) session;
-	guint ret;
-	
-	MAIL_SESSION_LOCK(session, lock);
-	
-	ret = ms->timeout_id;
-	ms->timeout_id++;
-	
-	/* just debugging, the timeout code now ignores excessive events anyway */
-	if (interval < 100)
-		g_warning ("Timeout requested %d is small, may cause performance problems", interval);
-	
-	td = g_malloc (sizeof (*td));
-	td->cb = cb;
-	td->camel_data = camel_data;
-	td->interval = interval;
-	td->id = ret;
-	td->session = session;
-	td->removed = FALSE;
-	td->busy = FALSE;
-	e_dlist_addhead (&ms->timeouts, (EDListNode *) td);
-	
-	MAIL_SESSION_UNLOCK(session, lock);
-	
-	camel_object_ref (ms);
-	mail_async_event_emit (ms->async, MAIL_ASYNC_GUI, (MailAsyncFunc) main_register_timeout,
-			       (CamelObject *) session, (void *) ret, NULL);
-
-	return ret;
-}
-
-static void
-main_remove_timeout (CamelSession *session, void *event_data, void *data)
-{
-	MailSession *ms = (MailSession *) session;
-	unsigned int handle = (unsigned int) event_data;
-	struct _timeout_data *td;
-	
-	MAIL_SESSION_LOCK(session, lock);
-	td = find_timeout (&ms->timeouts, handle);
-	if (td) {
-		e_dlist_remove ((EDListNode *) td);
-		if (td->timeout_id)
-			gtk_timeout_remove (td->timeout_id);
-		g_free (td);
-	}
-	MAIL_SESSION_UNLOCK(session, lock);
-	
-	camel_object_unref (ms);
-}
-
-static gboolean
-remove_timeout (CamelSession *session, guint handle)
-{
-	MailSession *ms = (MailSession *)session;
-	struct _timeout_data *td;
-	int remove = FALSE;
-	
-	MAIL_SESSION_LOCK(session, lock);
-	td = find_timeout (&ms->timeouts, handle);
-	if (td && !td->removed) {
-		td->removed = TRUE;
-		remove = TRUE;
-	}
-	MAIL_SESSION_UNLOCK(session, lock);
-	
-	if (remove) {
-		camel_object_ref (ms);
-		mail_async_event_emit (ms->async, MAIL_ASYNC_GUI, (MailAsyncFunc) main_remove_timeout,
-				       (CamelObject *) session, (void *) handle, NULL);
-	} else
-		g_warning ("Removing a timeout i dont know about (or twice): %d", handle);
-
-	return TRUE;
-}
-
-static CamelFolder *
-get_folder (CamelFilterDriver *d, const char *uri, void *data, CamelException *ex)
-{
-	return mail_tool_uri_to_folder (uri, 0, ex);
-}
-
-static void
-session_play_sound (CamelFilterDriver *driver, const char *filename, gpointer user_data)
-{
-	if (!filename || !*filename)
-		gdk_beep ();
-	else
-		gnome_sound_play (filename);
-}
-
-static void
-session_system_beep (CamelFilterDriver *driver, gpointer user_data)
-{
-	gdk_beep ();
-}
-
-static CamelFilterDriver *
-main_get_filter_driver (CamelSession *session, const char *type, CamelException *ex)
-{
-	CamelFilterDriver *driver;
-	GString *fsearch, *faction;
-	FilterRule *rule = NULL;
-	char *user, *system;
-	GConfClient *gconf;
-	RuleContext *fc;
-	long notify;
-	
-	gconf = gconf_client_get_default ();
-	
-	user = g_strdup_printf ("%s/filters.xml", evolution_dir);
-	system = EVOLUTION_DATADIR "/evolution/filtertypes.xml";
-	fc = (RuleContext *) filter_context_new ();
-	rule_context_load (fc, system, user);
-	g_free (user);
-	
-	driver = camel_filter_driver_new (session);
-	camel_filter_driver_set_folder_func (driver, get_folder, NULL);
-	
-	if (gconf_client_get_bool (gconf, "/apps/evolution/mail/filters/log", NULL)) {
-		MailSession *ms = (MailSession *) session;
-		
-		if (ms->filter_logfile == NULL) {
-			char *filename;
-			
-			filename = gconf_client_get_string (gconf, "/apps/evolution/mail/filters/logfile", NULL);
-			if (filename) {
-				ms->filter_logfile = fopen (filename, "a+");
-				g_free (filename);
-			}
-		}
-		
-		if (ms->filter_logfile)
-			camel_filter_driver_set_logfile (driver, ms->filter_logfile);
-	}
-	
-	camel_filter_driver_set_shell_func (driver, mail_execute_shell_command, NULL);
-	camel_filter_driver_set_play_sound_func (driver, session_play_sound, NULL);
-	camel_filter_driver_set_system_beep_func (driver, session_system_beep, NULL);
-	
-	fsearch = g_string_new ("");
-	faction = g_string_new ("");
-	
-	/* add the new-mail notification rule first to be sure that it gets invoked */
-	
-	/* FIXME: we need a way to distinguish between filtering new
-           mail and re-filtering a folder because both use the
-           "incoming" filter type */
-	notify = gconf_client_get_bool (gconf, "/apps/evolution/mail/notify/type", NULL);
-	if (notify != MAIL_CONFIG_NOTIFY_NOT && !strcmp (type, "incoming")) {
-		char *filename;
-		
-		g_string_truncate (faction, 0);
-		
-		g_string_append (faction, "(only-once \"new-mail-notification\" ");
-		
-		switch (notify) {
-		case MAIL_CONFIG_NOTIFY_PLAY_SOUND:
-			filename = gconf_client_get_string (gconf, "/apps/evolution/mail/notify/sound", NULL);
-			if (filename) {
-				g_string_append_printf (faction, "\"(play-sound \\\"%s\\\")\"", filename);
-				g_free (filename);
-				break;
-			}
-			/* fall through */
-		case MAIL_CONFIG_NOTIFY_BEEP:
-			g_string_append (faction, "\"(beep)\"");
-			break;
-		default:
-			break;
-		}
-		
-		g_string_append (faction, ")");
-		
-		camel_filter_driver_add_rule (driver, "new-mail-notification", "(begin #t)", faction->str);
-	}
-	
-	/* add the user-defined rules next */
-	while ((rule = rule_context_next_rule (fc, rule, type))) {
-		g_string_truncate (fsearch, 0);
-		g_string_truncate (faction, 0);
-		
-		filter_rule_build_code (rule, fsearch);
-		filter_filter_build_action ((FilterFilter *) rule, faction);
-		
-		camel_filter_driver_add_rule (driver, rule->name, fsearch->str, faction->str);
-	}
-	
-	g_string_free (fsearch, TRUE);
-	g_string_free (faction, TRUE);
-	
-	g_object_unref (fc);
-	
-	return driver;
-}
-
-static CamelFilterDriver *
-get_filter_driver (CamelSession *session, const char *type, CamelException *ex)
-{
-	return (CamelFilterDriver *) mail_call_main (MAIL_CALL_p_ppp, (MailMainFunc) main_get_filter_driver,
-						     session, type, ex);
-}
-
-char *
-mail_session_get_password (const char *url_string)
-{
-	CamelURL *url;
-	char *simple_url;
-	char *passwd;
-	
-	url = camel_url_new (url_string, NULL);
-	simple_url = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
-	camel_url_free (url);
-	
-	passwd = e_passwords_get_password ("Mail", simple_url);
-	
-	g_free (simple_url);
-	
-	return passwd;
-}
-
-void
-mail_session_add_password (const char *url_string,
-			   const char *passwd)
-{
-	CamelURL *url;
-	char *simple_url;
-	
-	url = camel_url_new (url_string, NULL);
-	simple_url = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
-	camel_url_free (url);
-	
-	e_passwords_add_password (simple_url, passwd);
-	
-	g_free (simple_url);
-}
-
-void
-mail_session_remember_password (const char *url_string)
-{
-	CamelURL *url;
-	char *simple_url;
-	
-	url = camel_url_new (url_string, NULL);
-	simple_url = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
-	camel_url_free (url);
-	
-	e_passwords_remember_password ("Mail", simple_url);
-	
-	g_free (simple_url);
-}
-
-void
-mail_session_forget_password (const char *key)
-{
-	e_passwords_forget_password ("Mail", key);
-}
-
-void
-mail_session_init (void)
-{
-	char *camel_dir;
-	
-	if (camel_init (evolution_dir, TRUE) != 0)
-		exit (0);
-	
-	session = CAMEL_SESSION (camel_object_new (MAIL_SESSION_TYPE));
-	
-	camel_dir = g_strdup_printf ("%s/mail", evolution_dir);
-	camel_session_construct (session, camel_dir);
-	
-	/* The shell will tell us to go online. */
-	camel_session_set_online ((CamelSession *) session, FALSE);
-	
-	g_free (camel_dir);
-}
-
-gboolean
-mail_session_get_interactive (void)
-{
-	return MAIL_SESSION (session)->interactive;
-}
-
-void
-mail_session_set_interactive (gboolean interactive)
-{
-	MAIL_SESSION (session)->interactive = interactive;
-	
-	if (!interactive) {
-		struct _pass_msg *pm;
-		struct _user_message_msg *um;
-		
-		d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n"));
-		
-		/* clear out pending password requests */
-		while ((pm = (struct _pass_msg *) e_dlist_remhead (&password_list))) {
-			d(printf ("Flushing password request : %s\n", pm->prompt));
-			e_msgport_reply ((EMsg *) pm);
-		}
-		
-		/* destroy the current */
-		if (password_dialog) {
-			d(printf ("Destroying password dialogue\n"));
-			gtk_widget_destroy ((GtkWidget *) password_dialog);
-		}
-		
-		/* same for pending user messages */
-		while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) {
-			d(printf ("Flusing message request: %s\n", um->prompt));
-			e_msgport_reply((EMsg *) um);
-		}
-		
-		/* and the current */
-		if (message_dialog) {
-			d(printf("Destroying message dialogue\n"));
-			gtk_widget_destroy ((GtkWidget *) message_dialog);
-		}
-	}
-}
-
-void
-mail_session_forget_passwords (BonoboUIComponent *uih, void *user_data,
-			       const char *path)
-{
-	e_passwords_forget_passwords ();
-}
-
-
-void
-mail_session_flush_filter_log (void)
-{
-	MailSession *ms = (MailSession *) session;
-	
-	if (ms->filter_logfile)
-		fflush (ms->filter_logfile);
-}
diff --git a/mail/mail-session.h b/mail/mail-session.h
deleted file mode 100644
index 72a2757fc4..0000000000
--- a/mail/mail-session.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast 
- *
- *  Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef MAIL_SESSION_H
-#define MAIL_SESSION_H
-
-#include 
-#include 
-#include 
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-void mail_session_init (void);
-gboolean mail_session_get_interactive (void);
-void mail_session_set_interactive (gboolean interactive);
-char *mail_session_request_dialog (const char *prompt, gboolean secret,
-				   const char *key, gboolean async);
-gboolean mail_session_accept_dialog (const char *prompt, const char *key,
-				     gboolean async);
-char *mail_session_get_password (const char *url);
-void mail_session_add_password (const char *url, const char *passwd);
-void mail_session_forget_passwords (BonoboUIComponent *uih, void *user_data,
-				    const char *path);
-void mail_session_remember_password (const char *url);
-
-void mail_session_forget_password (const char *key);
-
-void mail_session_flush_filter_log (void);
-
-extern CamelSession *session;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! MAIL_SESSION_H */
diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c
deleted file mode 100644
index ce97e403fd..0000000000
--- a/mail/mail-signature-editor.c
+++ /dev/null
@@ -1,384 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Radek Doulik 
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-#include 
-
-#include 
-
-#include "e-msg-composer.h"
-#include "mail-signature-editor.h"
-#include "mail-config.h"
-
-/*
- * Signature editor
- *
- */
-
-struct _ESignatureEditor {
-	GtkWidget *win;
-	GtkWidget *control;
-	GtkWidget *name_entry;
-	GtkWidget *info_frame;
-	
-	MailConfigSignature *sig;
-	gboolean html;
-
-	GNOME_GtkHTML_Editor_Engine engine;
-};
-typedef struct _ESignatureEditor ESignatureEditor;
-
-#define E_SIGNATURE_EDITOR(o) ((ESignatureEditor *) o)
-
-#define DEFAULT_WIDTH 600
-#define DEFAULT_HEIGHT 350
-
-enum { REPLY_YES = 0, REPLY_NO, REPLY_CANCEL };
-
-static void
-destroy_editor (ESignatureEditor *editor)
-{
-	gtk_widget_destroy (editor->win);
-	g_free (editor);
-}
-
-static void
-menu_file_save_error (BonoboUIComponent *uic, CORBA_Environment *ev)
-{
-	const char *err;
-	
-	/* errno is set if the rename() fails in menu_file_save_cb */
-	
-	err = ev->_major != CORBA_NO_EXCEPTION ? bonobo_exception_get_text (ev) : g_strerror (errno);
-	
-	e_notice (GTK_WINDOW (uic), GTK_MESSAGE_ERROR,
-		  _("Could not save signature file: %s"), err);
-	
-	g_warning ("Exception while saving signature: %s", err);
-}
-
-static void
-menu_file_save_cb (BonoboUIComponent *uic,
-		   void *data,
-		   const char *path)
-{
-	ESignatureEditor *editor;
-	CORBA_Environment ev;
-	char *filename, *base;
-	char *dirname;
-	
-	editor = E_SIGNATURE_EDITOR (data);
-	
-	printf ("editor->sig->filename = %s\n", editor->sig->filename);
-	dirname = g_path_get_dirname (editor->sig->filename);
-	printf ("dirname = %s\n", dirname);
-	base = g_path_get_basename (editor->sig->filename);
-	printf ("basename = %s\n", base);
-	filename = g_strdup_printf ("%s/.#%s", dirname, base);
-	printf ("filename = %s\n", filename);
-	g_free (dirname);
-	g_free(base);
-
-	CORBA_exception_init (&ev);
-	
-	if (editor->html) {
-		Bonobo_PersistFile pfile_iface;
-		
-		pfile_iface = Bonobo_Unknown_queryInterface(bonobo_widget_get_objref (BONOBO_WIDGET (editor->control)),
-							    "IDL:Bonobo/PersistFile:1.0", NULL);
-		Bonobo_PersistFile_save (pfile_iface, filename, &ev);
-	} else {
-		Bonobo_PersistStream pstream_iface;
-		Bonobo_Stream stream;
-		char *uri;
-
-		uri = g_strdup_printf("file://%s", uri);
-		stream = bonobo_get_object (uri, "IDL:Bonobo/Stream:1.0", NULL);
-		g_free(uri);
-
-		/* FIXME: truncate? */
-		
-		pstream_iface = Bonobo_Unknown_queryInterface
-			(bonobo_widget_get_objref (BONOBO_WIDGET (editor->control)),
-			 "IDL:Bonobo/PersistStream:1.0", NULL);
-		
-		Bonobo_PersistStream_save (pstream_iface, stream, "text/plain", &ev);
-
-		bonobo_object_release_unref(stream, NULL);
-	}
-	
-	if (ev._major != CORBA_NO_EXCEPTION || rename (filename, editor->sig->filename) == -1) {
-		menu_file_save_error (uic, &ev);
-		unlink (filename);
-	}
-	
-	g_free (filename);
-	
-	CORBA_exception_free (&ev);
-	
-	mail_config_signature_set_html (editor->sig, editor->html);
-	mail_config_signature_emit_event (MAIL_CONFIG_SIG_EVENT_CONTENT_CHANGED, editor->sig);
-}
-
-static void
-exit_dialog_cb (int reply, ESignatureEditor *editor)
-{
-	switch (reply) {
-	case GTK_RESPONSE_YES:
-		menu_file_save_cb (NULL, editor, NULL);
-		break;
-	case GTK_RESPONSE_NO:
-		destroy_editor (editor);
-		break;
-	}
-}
-
-static void
-do_exit (ESignatureEditor *editor)
-{
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-	if (GNOME_GtkHTML_Editor_Engine_hasUndo (editor->engine, &ev)) {
-		GtkWidget *dialog;
-		gint button;
-		
-		dialog = gtk_message_dialog_new(GTK_WINDOW (editor->win),
-						GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL,
-						GTK_MESSAGE_QUESTION,
-						GTK_BUTTONS_YES_NO,
-						_("This signature has been changed, but hasn't been saved.\n"
-						  "\nDo you wish to save your changes?"));
-		gtk_dialog_add_button((GtkDialog *)dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-		gtk_window_set_title((GtkWindow *)dialog, _("Save signature"));
-		gtk_dialog_set_default_response((GtkDialog *)dialog, GTK_RESPONSE_YES);
-
-		button = gtk_dialog_run((GtkDialog *)dialog);
-		gtk_widget_destroy(dialog);
-
-		exit_dialog_cb (button, editor);
-	} else
-		destroy_editor (editor);
-	CORBA_exception_free (&ev);
-}
-
-static int
-delete_event_cb (GtkWidget *w, GdkEvent *event, ESignatureEditor *editor)
-{
-	do_exit (editor);
-	
-	return FALSE;
-}
-
-static void
-menu_file_close_cb (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	ESignatureEditor *editor;
-	
-	editor = E_SIGNATURE_EDITOR (data);
-	do_exit (editor);
-}
-
-static void
-menu_file_save_close_cb (BonoboUIComponent *uic, gpointer data, const gchar *path)
-{
-	ESignatureEditor *editor;
-	
-	editor = E_SIGNATURE_EDITOR (data);
-
-	menu_file_save_cb (uic, editor, path);
-	destroy_editor (editor);
-}
-
-static void
-menu_help (BonoboUIComponent *uih, void *data, const char *path)
-{
-	gnome_help_display ("usage-mail-getnsend-send.html", "HTML-SIGNATURE-HOWTO", NULL);
-}
-
-static BonoboUIVerb verbs [] = {
-
-	BONOBO_UI_VERB ("FileSave",       menu_file_save_cb),
-	BONOBO_UI_VERB ("FileClose",      menu_file_close_cb),
-	BONOBO_UI_VERB ("FileSaveClose",  menu_file_save_close_cb),
-	BONOBO_UI_VERB ("HelpSigEditor",  menu_help),
-
-	BONOBO_UI_VERB_END
-};
-
-static void
-load_signature (ESignatureEditor *editor)
-{
-	CORBA_Environment ev;
-	
-	if (editor->html) {
-		Bonobo_PersistFile pfile_iface;
-		
-		pfile_iface = Bonobo_Unknown_queryInterface(bonobo_widget_get_objref (BONOBO_WIDGET (editor->control)),
-							    "IDL:Bonobo/PersistFile:1.0", NULL);
-		CORBA_exception_init (&ev);
-		Bonobo_PersistFile_load (pfile_iface, editor->sig->filename, &ev);
-		CORBA_exception_free (&ev);
-	} else {
-		Bonobo_PersistStream pstream_iface;
-		BonoboStream *stream;
-		gchar *data, *html;
-		
-		data = e_msg_composer_get_sig_file_content (editor->sig->filename, FALSE);
-		html = g_strdup_printf ("
    \n%s", data);
-		g_free (data);
-		
-		pstream_iface = Bonobo_Unknown_queryInterface
-			(bonobo_widget_get_objref (BONOBO_WIDGET (editor->control)),
-			 "IDL:Bonobo/PersistStream:1.0", NULL);
-		CORBA_exception_init (&ev);
-		stream = bonobo_stream_mem_create (html, strlen (html), TRUE, FALSE);
-		
-		if (stream == NULL) {
-			g_warning ("Couldn't create memory stream\n");
-		} else {
-			BonoboObject *stream_object;
-			Bonobo_Stream corba_stream;
-			
-			stream_object = BONOBO_OBJECT (stream);
-			corba_stream = bonobo_object_corba_objref (stream_object);
-			Bonobo_PersistStream_load (pstream_iface, corba_stream,
-						   "text/html", &ev);
-		}
-		
-		Bonobo_Unknown_unref (pstream_iface, &ev);
-		CORBA_Object_release (pstream_iface, &ev);
-		CORBA_exception_free (&ev);
-		bonobo_object_unref (BONOBO_OBJECT (stream));
-		
-		g_free (html);
-	}
-}
-
-static void
-sig_name_changed (GtkWidget *w, ESignatureEditor *editor)
-{
-	mail_config_signature_set_name (editor->sig, gtk_entry_get_text(GTK_ENTRY (editor->name_entry)));
-}
-
-static void
-format_html_cb (BonoboUIComponent           *component,
-		const char                  *path,
-		Bonobo_UIComponent_EventType type,
-		const char                  *state,
-		gpointer                     data)
-
-{
-	ESignatureEditor *editor = (ESignatureEditor *) data;
-
-	if (type != Bonobo_UIComponent_STATE_CHANGED)
-		return;
-	
-	editor->html = atoi (state);
-	bonobo_widget_set_property (BONOBO_WIDGET (editor->control), "FormatHTML", TC_CORBA_boolean, editor->html, NULL);
-}
-
-void
-mail_signature_editor (MailConfigSignature *sig)
-{
-	CORBA_Environment ev;
-	ESignatureEditor *editor;
-	BonoboUIComponent *component;
-	BonoboUIContainer *container;
-	GtkWidget *vbox, *hbox, *label, *frame, *vbox1;
-	
-	if (!sig->filename || !*sig->filename)
-		return;
-	
-	editor = g_new0 (ESignatureEditor, 1);
-	
-	editor->sig = sig;
-	editor->html = sig->html;
-	
-	editor->win = bonobo_window_new ("e-sig-editor", _("Edit signature"));
-	gtk_window_set_default_size (GTK_WINDOW (editor->win), DEFAULT_WIDTH, DEFAULT_HEIGHT);
-	g_object_set(editor->win, "allow_shrink", FALSE, "allow_grow", TRUE, NULL);
-
-	container = bonobo_window_get_ui_container (BONOBO_WINDOW(editor->win));
-	
-	component = bonobo_ui_component_new_default ();
-	bonobo_ui_component_set_container (component, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL);
-	bonobo_ui_component_add_verb_list_with_data (component, verbs, editor);
-	bonobo_ui_util_set_ui (component, EVOLUTION_DATADIR, "evolution-signature-editor.xml", "evolution-signature-editor", NULL);
-	
-	editor->control = bonobo_widget_new_control ("OAFIID:GNOME_GtkHTML_Editor:3.0",
-						     bonobo_ui_component_get_container (component));
-	
-	if (editor->control == NULL) {
-		g_warning ("Cannot get 'OAFIID:GNOME_GtkHTML_Editor:3.0'.");
-		
-		destroy_editor (editor);
-		return;
-	}
-
-	editor->engine = (GNOME_GtkHTML_Editor_Engine) Bonobo_Unknown_queryInterface
-		(bonobo_widget_get_objref (BONOBO_WIDGET (editor->control)), "IDL:GNOME/GtkHTML/Editor/Engine:1.0", NULL);
-	
-	load_signature (editor);
-
-	bonobo_ui_component_set_prop (component, "/commands/FormatHtml", "state", editor->html ? "1" : "0", NULL);
-	bonobo_ui_component_add_listener (component, "FormatHtml", format_html_cb, editor);
-
-	g_signal_connect(editor->win, "delete_event",
-			 G_CALLBACK (delete_event_cb), editor);
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	hbox = gtk_hbox_new (FALSE, 4);
-	vbox1 = gtk_vbox_new (FALSE, 3);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox1), 3);
-	label = gtk_label_new (_("Enter a name for this signature."));
-	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
-	gtk_box_pack_start (GTK_BOX (vbox1), label, FALSE, TRUE, 0);
-	label = gtk_label_new (_("Name:"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
-	editor->name_entry = gtk_entry_new ();
-	gtk_entry_set_text(GTK_ENTRY (editor->name_entry), sig->name);
-	g_signal_connect(editor->name_entry, "changed", G_CALLBACK (sig_name_changed), editor);
-	gtk_box_pack_start_defaults (GTK_BOX (hbox), editor->name_entry);
-	frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
-	gtk_box_pack_start (GTK_BOX (vbox1), hbox, FALSE, TRUE, 0);
-	gtk_container_add (GTK_CONTAINER (frame), vbox1);
-	gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
-	gtk_widget_show_all (vbox);
-	gtk_box_pack_start_defaults (GTK_BOX (vbox), editor->control);
-
-	bonobo_window_set_contents (BONOBO_WINDOW (editor->win), vbox);
-	bonobo_widget_set_property (BONOBO_WIDGET (editor->control), "FormatHTML", TC_CORBA_boolean, editor->html, NULL);
-	gtk_widget_show (GTK_WIDGET (editor->win));
-	gtk_widget_show (GTK_WIDGET (editor->control));
-
-	CORBA_exception_init (&ev);
-	GNOME_GtkHTML_Editor_Engine_runCommand (editor->engine, "grab-focus", &ev);
-	CORBA_exception_free (&ev);
-}
diff --git a/mail/mail-signature-editor.h b/mail/mail-signature-editor.h
deleted file mode 100644
index 60a5e6ae04..0000000000
--- a/mail/mail-signature-editor.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors:
- *    Radek Doulik 
- *
- *  Copyright 2001, 2002 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef MAIL_SIGNATURE_EDITOR_H
-#define MAIL_SIGNATURE_EDITOR_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include 
-#include 
-
-void mail_signature_editor (MailConfigSignature *sig);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
diff --git a/mail/mail-summary.c b/mail/mail-summary.c
deleted file mode 100644
index 2c42c01fb5..0000000000
--- a/mail/mail-summary.c
+++ /dev/null
@@ -1,521 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-summary.c
- *
- * Authors: Iain Holmes 
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-
-#include "camel.h"
-#include "mail.h"
-#include "mail-tools.h"
-#include "mail-ops.h"
-#include "mail-vfolder.h"
-#include "mail-summary.h"
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-#include "evolution-storage-listener.h"
-
-#include "filter/vfolder-context.h"
-
-#include 
-#include 
-#include 
-
-typedef struct {
-	CamelFolder *folder;
-
-	char *name;
-	char *uri;
-	int total, unread;
-} FolderSummary;
-
-typedef struct {
-	BonoboObject *component;
-	BonoboObject *view;
-	EvolutionStorageListener *listener;
-
-	GHashTable *folder_to_summary;
-	FolderSummary **folders;
-	int numfolders;
-
-	char *title;
-	char *icon;
-
-	guint idle;
-	gboolean in_summary;
-} MailSummary;
-
-#define SUMMARY_IN() g_print ("IN: %s: %d\n", __FUNCTION__, __LINE__);
-#define SUMMARY_OUT() g_print ("OUT: %s: %d\n", __FUNCTION__, __LINE__);
-
-static int queue_len = 0;
-
-extern char *evolution_dir;
-extern EvolutionStorage *vfolder_storage;
-
-#define MAIN_READER main_compipe[0]
-#define MAIN_WRITER main_compipe[1]
-#define DISPATCH_READER dispatch_compipe[0]
-#define DISPATCH_WRITER dispatch_compipe[1]
-
-static int main_compipe[2] = {-1, -1};
-static int dispatch_compipe[2] = {-1, -1};
-
-GIOChannel *summary_chan_reader = NULL;
-
-static gboolean do_changed (MailSummary *summary);
-
-enum {
-	PROPERTY_TITLE,
-	PROPERTY_ICON
-};
-
-/* Read a message from the pipe */
-static gboolean
-read_msg (GIOChannel *source,
-	  GIOCondition condition,
-	  gpointer user_data)
-{
-	MailSummary *summary;
-	int size;
-
-	summary = g_new0 (MailSummary, 1);
-	g_io_channel_read (source, (gchar *) summary,
-			   sizeof (MailSummary) / sizeof (gchar), &size);
-
-	if (size != sizeof (MailSummary)) {
-		g_warning (_("Incomplete message written on pipe!"));
-		return TRUE;
-	}
-
-	do_changed (summary);
-	g_free (summary);
-
-	return TRUE;
-}
-
-/* check_compipes: */
-static void
-check_compipes (void)
-{
-	if (MAIN_READER < 0) {
-		if (pipe (main_compipe) < 0) {
-			g_warning ("Call to pipe failed");
-			return;
-		}
-
-		summary_chan_reader = g_io_channel_unix_new (MAIN_READER);
-		g_io_add_watch (summary_chan_reader, G_IO_IN, read_msg, NULL);
-	}
-
-	if (DISPATCH_READER < 0) {
-		if (pipe (dispatch_compipe) < 0) {
-			g_warning ("Call to pipe failed");
-			return;
-		}
-	}
-}
-
-static void
-folder_free (FolderSummary *folder)
-{
-	g_free (folder->name);
-	g_free (folder->uri);
-}
-
-static void
-summary_free (MailSummary *summary)
-{
-	int i;
-
-	for (i = 0; i < summary->numfolders; i++){
-		folder_free (summary->folders[i]);
-	}
-
-	g_free (summary->folders);
-	g_free (summary->title);
-	g_free (summary->icon);
-
-	g_hash_table_destroy (summary->folder_to_summary);
-}
-
-static void
-view_destroy_cb (MailSummary *summary, GObject *deadbeef)
-{
-	summary_free (summary);
-	g_free (summary);
-}
-
-static char *
-generate_html_summary (MailSummary *summary)
-{
-	char *ret_html = NULL, *tmp;
-	FolderSummary *fs;
-	int i;
-
-	summary->in_summary = TRUE;
-	/* Inbox first */
-	fs = summary->folders[0];
-
-	g_print ("%p: %p\n", fs, fs->name);
-	g_print ("unread: %d\n", fs->unread);
-	g_print ("total: %d\n", fs->total);
-
-	tmp = g_strdup_printf ("",
-			       fs->name, fs->unread, fs->total);
-
-	ret_html = g_strdup (tmp);
-	for (i = 1; i < summary->numfolders; i++) {
-		char *tmp2; 
-
-		fs = summary->folders[i];
-		tmp2 = g_strdup_printf (""
-					"",
-					fs->uri, fs->name, fs->unread, fs->total);
-
-		tmp = ret_html;
-		ret_html = g_strconcat (ret_html, tmp2, NULL);
-		g_free (tmp);
-		g_free (tmp2);
-	}
-
-	tmp = ret_html;
-	ret_html = g_strconcat (ret_html, "
    %s:"
-			       "%d/%d
    %s:%d/%d
    ", NULL);
-	g_free (tmp);
-
-	summary->in_summary = FALSE;
-	return ret_html;
-}
-	
-static gboolean
-do_changed (MailSummary *summary)
-{
-	char *ret_html;
-
-	ret_html = generate_html_summary (summary);
-	executive_summary_html_view_set_html(EXECUTIVE_SUMMARY_HTML_VIEW(summary->view), (const char *) ret_html);
-	g_free (ret_html);
-
-	summary->idle = 0;
-	return TRUE;
-}
-
-/* These two callbacks are called from the Camel thread,
-   which can't make any CORBA calls, or else ORBit locks up,
-   and likewise the thread that can call ORBit, cannot call
-   camel.
-
-   So, when the callbacks are triggered, they generate a MailSummary
-   structure and write this onto a pipe. The ORBit calling thread
-   detects when something is written to the pipe and creates its own
-   MailSummary structure, and calls the appropriate CORBA calls.
-
-   Same theory as mail-threads.c, but a lot less complicated
-   as there is only one way communication, and only one type of message
-*/
-static void
-folder_changed_cb (CamelObject *folder,
-		   gpointer event_data,
-		   gpointer user_data)
-{
-	MailSummary *summary;
-	FolderSummary *fs;
-
-	summary = (MailSummary *) user_data;
-	fs = g_hash_table_lookup (summary->folder_to_summary, folder);
-	if (fs == NULL) {
-		g_warning ("%s: Unknown folder", __FUNCTION__);
-		return;
-	}
-
-	fs->total = camel_folder_get_message_count (fs->folder);
-	fs->unread = camel_folder_get_unread_message_count (fs->folder);
-
-	write (MAIN_WRITER, summary, sizeof (MailSummary));
-	queue_len++;
-
-	return;
-}
-
-static void
-message_changed_cb (CamelObject *folder,
-		    gpointer event_data,
-		    gpointer user_data)
-{
-	MailSummary *summary;
-	FolderSummary *fs;
-
-	summary = (MailSummary *)user_data;
-	fs = g_hash_table_lookup (summary->folder_to_summary, folder);
-	if (fs == NULL) {
-		g_warning ("%s: Unknown folder.", __FUNCTION__);
-		return;
-	}
-
-	fs->unread = camel_folder_get_unread_message_count (fs->folder);
-	fs->total = camel_folder_get_message_count (fs->folder);
-
-	write (MAIN_WRITER, summary, sizeof (MailSummary));
-	queue_len++;
-	
-	return;
-}
-
-static void
-generate_folder_summaries (MailSummary *summary)
-{
-	int numfolders = 1; /* Always at least the Inbox */
-	char *user, *system;
-	FilterRule *rule;
-	VfolderContext *context;
-	FolderSummary *fs;
-	CamelException *ex;
-	int i;
-
-	user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
-	system = EVOLUTION_DATADIR "/evolution/vfoldertypes.xml";
-
-	context = vfolder_context_new ();
-	rule_context_load ((RuleContext *)context, system, user);
-	g_free (user);
-
-	rule = NULL;
-	while ((rule = rule_context_next_rule ((RuleContext *)context, rule, NULL))){
-		g_print ("rule->name: %s\n", rule->name);
-		numfolders++;
-	}
-
-	if (summary->folders != NULL) {
-		int i;
-		
-		for (i = 0; i < summary->numfolders; i++){
-			folder_free (summary->folders[i]);
-		}
-		
-		g_free (summary->folders);
-	}
-
-	summary->folders = g_new (FolderSummary *, numfolders);
-
-	/* Inbox */
-	fs = summary->folders[0] = g_new (FolderSummary, 1);
-	fs->name = g_strdup ("Inbox");
-	g_print ("%p: %s(%p)\n", fs, fs->name, fs->name);
-	fs->uri = NULL;
-	ex = camel_exception_new ();
-	fs->folder = mail_tool_get_local_inbox (ex);
-
-	fs->total = camel_folder_get_message_count (fs->folder);
-	fs->unread = camel_folder_get_unread_message_count (fs->folder);
-	camel_exception_free (ex);
-	camel_object_hook_event (CAMEL_OBJECT (fs->folder), "folder_changed",
-				 (CamelObjectEventHookFunc) folder_changed_cb,
-				 summary);
-	camel_object_hook_event (CAMEL_OBJECT (fs->folder), "message_changed",
-				 (CamelObjectEventHookFunc) message_changed_cb,
-				 summary);
-	g_hash_table_insert (summary->folder_to_summary, fs->folder, fs);
-	
-
-	summary->numfolders = 1;
-
-	for (i = 1, rule = NULL; i < numfolders; i++) {
-		char *uri;
-
-		ex = camel_exception_new ();
-		fs = summary->folders[i] = g_new (FolderSummary, 1);
-		rule = rule_context_next_rule ((RuleContext *)context, rule, NULL);
-		fs->name = g_strdup (rule->name);
-
-		uri = g_strconcat ("vfolder:", rule->name, NULL);
-		fs->folder = vfolder_uri_to_folder (uri, ex);
-		fs->uri = g_strconcat ("evolution:/VFolders/", rule->name, NULL);
-		g_free (uri);
-
-		fs->total = camel_folder_get_message_count (fs->folder);
-		fs->unread = camel_folder_get_unread_message_count (fs->folder);
-
-		/* Connect to each folder */
-		camel_object_hook_event (CAMEL_OBJECT (fs->folder), 
-					 "folder_changed",
-					 (CamelObjectEventHookFunc) folder_changed_cb,
-					 summary);
-		camel_object_hook_event (CAMEL_OBJECT (fs->folder), 
-					 "message_changed",
-					 (CamelObjectEventHookFunc) message_changed_cb,
-					 summary);
-		g_hash_table_insert (summary->folder_to_summary, fs->folder, fs);
-		summary->numfolders++;
-
-		camel_exception_free (ex);
-	}
-
-	g_object_unref (context);
-}
-
-static void
-get_property (BonoboPropertyBag *bag,
-	      BonoboArg *arg,
-	      guint arg_id,
-	      CORBA_Environment *ev,
-	      gpointer user_data)
-{
-	MailSummary *summary = (MailSummary *) user_data;
-
-	switch (arg_id) {
-	case PROPERTY_TITLE:
-		BONOBO_ARG_SET_STRING (arg, summary->title);
-		break;
-
-	case PROPERTY_ICON:
-		BONOBO_ARG_SET_STRING (arg, summary->icon);
-		break;
-
-	default:
-		break;
-	}
-}
-
-/* This code may play with the threads wrongly...
-   if the mail component locks when you use the summary
-   remove this define */
-#define DETECT_NEW_VFOLDERS
-#ifdef DETECT_NEW_VFOLDERS
-
-/* Check that we can generate a new summary
-   and keep coming back until we can. */
-static gboolean
-idle_check (gpointer data)
-{
-	MailSummary *summary = (MailSummary *) data;
-
-	if (summary->in_summary == TRUE)
-		return TRUE;
-
-	generate_folder_summaries (summary);
-	write (MAIN_WRITER, summary, sizeof (MailSummary));
-	queue_len++;
-	summary->idle = 0;
-	
-	return FALSE;
-}
-
-static void
-new_folder_cb (EvolutionStorageListener *listener,
-	       const char *path,
-	       const GNOME_Evolution_Folder *folder,
-	       MailSummary *summary)
-{
-	g_print ("New folder: %s\n", path);
-
-	if (summary->idle == 0)
-		summary->idle = g_idle_add ((GSourceFunc) idle_check, summary);
-}
-
-static void
-removed_folder_cb (EvolutionStorageListener *listener,
-		   const char *path,
-		   MailSummary *summary)
-{
-	g_print ("Removed folder: %s\n", path);
-
-	if (summary->idle == 0)
-		summary->idle = g_idle_add ((GSourceFunc) idle_check, summary);
-}
-#endif
-
-BonoboObject *
-create_summary_view (ExecutiveSummaryComponentFactory *_factory,
-		     void *closure)
-{
-	GNOME_Evolution_Storage corba_local_objref;
-	GNOME_Evolution_StorageListener corba_object;
-	CORBA_Environment ev;
-	BonoboObject *component, *view;
-	BonoboPropertyBag *bag;
-	BonoboEventSource *event_source;
-	MailSummary *summary;
-
-	summary = g_new (MailSummary, 1);
-	summary->folders = 0;
-	summary->in_summary = FALSE;
-	summary->folder_to_summary = g_hash_table_new (NULL, NULL);
-	summary->title = e_utf8_from_locale_string (_("Mail Summary"));
-	summary->icon = g_strdup ("envelope.png");
-	summary->idle = 0;
-
-	check_compipes ();
-
-	component = executive_summary_component_new ();
-	summary->component = component;
-
-	event_source = bonobo_event_source_new ();
-
-	view = executive_summary_html_view_new_full (event_source);
-	bonobo_object_add_interface (component, view);
-	summary->view = view;
-	
-	g_object_weak_ref ((GObject *) view, (GWeakNotify) view_destroy_cb, summary);
-
-	bag = bonobo_property_bag_new_full (get_property, NULL, 
-					    event_source, summary);
-	bonobo_property_bag_add (bag,
-				 "window_title", PROPERTY_TITLE,
-				 BONOBO_ARG_STRING, NULL,
-				 "The title of this component's window", 
-				 BONOBO_PROPERTY_READABLE);
-	bonobo_property_bag_add (bag,
-				 "window_icon", PROPERTY_ICON,
-				 BONOBO_ARG_STRING, NULL,
-				 "The icon for this component's window", 
-				 BONOBO_PROPERTY_READABLE);
-	bonobo_object_add_interface (component, BONOBO_OBJECT(bag));
-
-#ifdef DETECT_NEW_VFOLDERS 
-	summary->listener = evolution_storage_listener_new ();
-	g_signal_connect((summary->listener), "new_folder",
-			    G_CALLBACK (new_folder_cb), summary);
-	g_signal_connect((summary->listener), "removed_folder",
-			    G_CALLBACK (removed_folder_cb), summary);
-
-	corba_object = evolution_storage_listener_corba_objref (summary->listener);
-
-	CORBA_exception_init (&ev);
-	corba_local_objref = bonobo_object_corba_objref (BONOBO_OBJECT (vfolder_storage));
-
-	GNOME_Evolution_Storage_addListener (corba_local_objref,
-					     corba_object, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		g_warning ("Cannot add a listener to the vfolder storage.");
-	}
-	CORBA_exception_free (&ev);
-#endif
-	
-	if (summary->idle == 0)
-		summary->idle = g_idle_add ((GSourceFunc) idle_check, summary);
-
-	return component;
-}
diff --git a/mail/mail-summary.h b/mail/mail-summary.h
deleted file mode 100644
index 462e440a1a..0000000000
--- a/mail/mail-summary.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-summary.h
- *
- * Authors: Iain Holmes 
- *
- * Copyright (C) 2000  Ximian, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __MAIL_SUMMARY_H__
-#define __MAIL_SUMMARY_H__
-
-#include 
-
-BonoboObject *create_summary_view (ExecutiveSummaryComponentFactory *factory,
-				   void *closure);
-
-#endif
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
deleted file mode 100644
index 83abe3e1a2..0000000000
--- a/mail/mail-tools.c
+++ /dev/null
@@ -1,498 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- * Authors: 
- *  Dan Winship 
- *  Peter Williams 
- *  Jeffrey Stedfast 
- *
- * Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-#include "mail-vfolder.h"
-#include "mail.h" /*session*/
-#include "mail-tools.h"
-#include "mail-local.h"
-#include "mail-mt.h"
-#include "mail-folder-cache.h"
-
-/* **************************************** */
-
-CamelFolder *
-mail_tool_get_local_inbox (CamelException *ex)
-{
-	CamelFolder *folder;
-	char *url;
-	
-	url = g_strdup_printf("file://%s/local/Inbox", evolution_dir);
-	folder = mail_tool_uri_to_folder (url, 0, ex);
-	g_free (url);
-	
-	return folder;
-}
-
-CamelFolder *
-mail_tool_get_inbox (const gchar *url, CamelException *ex)
-{
-	CamelStore *store;
-	CamelFolder *folder;
-	
-	store = camel_session_get_store (session, url, ex);
-	if (!store)
-		return NULL;
-	
-	folder = camel_store_get_inbox (store, ex);
-	camel_object_unref (store);
-	
-	return folder;
-}
-
-CamelFolder *
-mail_tool_get_trash (const gchar *url, int connect, CamelException *ex)
-{
-	CamelStore *store;
-	CamelFolder *trash;
-	
-	if (connect)
-		store = camel_session_get_store (session, url, ex);
-	else
-		store = (CamelStore *) camel_session_get_service (session, url, CAMEL_PROVIDER_STORE, ex);
-	
-	if (!store)
-		return NULL;
-	
-	if (connect || ((CamelService *) store)->status == CAMEL_SERVICE_CONNECTED)
-		trash = camel_store_get_trash (store, ex);
-	else
-		trash = NULL;
-	
-	camel_object_unref (store);
-	
-	return trash;
-}
-
-static char *
-mail_tool_get_local_movemail_path (const unsigned char *uri)
-{
-	unsigned char *safe_uri, *c;
-	char *path;
-	
-	safe_uri = g_strdup (uri);
-	for (c = safe_uri; *c; c++)
-		if (strchr ("/:;=|%&#!*^()\\, ", *c) || !isprint ((int) *c))
-			*c = '_';
-	
-	path = g_strdup_printf ("%s/local/Inbox/movemail.%s", evolution_dir, safe_uri);
-	g_free (safe_uri);
-	
-	return path;
-}
-
-/* why is this function so stupidly complex when allthe work is done elsehwere? */
-char *
-mail_tool_do_movemail (const char *source_url, CamelException *ex)
-{
-	char *dest_path;
-	const char *source;
-	struct stat sb;
-	
-	g_return_val_if_fail (strncmp (source_url, "mbox:", 5) == 0, NULL);
-	
-	/* Set up our destination. */
-	dest_path = mail_tool_get_local_movemail_path (source_url);
-	
-	/* Skip over "mbox:" plus host part (if any) of url. */
-	source = source_url + 5;
-	if (!strncmp (source, "//", 2))
-		source = strchr (source + 2, '/');
-	
-	/* Movemail from source (source_url) to dest_path */
-	camel_movemail (source, dest_path, ex);
-	
-	if (stat (dest_path, &sb) < 0 || sb.st_size == 0) {
-		unlink (dest_path); /* Clean up the movemail.foo file. */
-		g_free (dest_path);
-		return NULL;
-	}
-	
-	if (camel_exception_is_set (ex)) {
-		g_free (dest_path);
-		return NULL;
-	}
-	
-	return dest_path;
-}
-
-char *
-mail_tool_generate_forward_subject (CamelMimeMessage *msg)
-{
-	const char *subject;
-	char *fwd_subj;
-	const int max_subject_length = 1024;
-	
-	subject = camel_mime_message_get_subject(msg);
-	
-	if (subject && *subject) {
-		/* Truncate insanely long subjects */
-		if (strlen (subject) < max_subject_length) {
-			fwd_subj = g_strdup_printf ("[Fwd: %s]", subject);
-		} else {
-			/* We can't use %.*s because it depends on the locale being C/POSIX
-			   or UTF-8 to work correctly in glibc */
-			/*fwd_subj = g_strdup_printf ("[Fwd: %.*s...]", max_subject_length, subject);*/
-			fwd_subj = g_malloc (max_subject_length + 11);
-			memcpy (fwd_subj, "[Fwd: ", 6);
-			memcpy (fwd_subj + 6, subject, max_subject_length);
-			memcpy (fwd_subj + 6 + max_subject_length, "...]", 5);
-		}
-	} else {
-		const CamelInternetAddress *from;
-		char *fromstr;
-		
-		from = camel_mime_message_get_from (msg);
-		if (from) {
-			fromstr = camel_address_format (CAMEL_ADDRESS (from));
-			fwd_subj = g_strdup_printf ("[Fwd: %s]", fromstr);
-			g_free (fromstr);
-		} else
-			fwd_subj = g_strdup ("[Fwd: No Subject]");
-	}
-	
-	return fwd_subj;
-}
-
-XEvolution *
-mail_tool_remove_xevolution_headers (CamelMimeMessage *message)
-{
-	XEvolution *xev;
-	
-	xev = g_new (XEvolution, 1);
-	xev->flags = g_strdup (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution"));
-	xev->source = g_strdup (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Source"));
-	xev->transport = g_strdup (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Transport"));
-	xev->account = g_strdup (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Account"));
-	xev->fcc = g_strdup (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc"));
-	xev->format = g_strdup (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Format"));
-	xev->postto = g_strdup (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-PostTo"));
-	
-	/* rip off the X-Evolution* headers */
-	camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution");
-	camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution-Source");
-	camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution-Transport");
-	camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution-Account");
-	camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc");
-	camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution-Format");
-	camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution-PostTo");
-	
-	return xev;
-}
-
-void
-mail_tool_restore_xevolution_headers (CamelMimeMessage *message, XEvolution *xev)
-{
-	if (xev->flags)
-		camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution", xev->flags);
-	if (xev->source)
-		camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Source", xev->source);
-	if (xev->transport)
-		camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Transport", xev->transport);
-	if (xev->account)
-		camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Account", xev->account);
-	if (xev->fcc)
-		camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Fcc", xev->fcc);
-	if (xev->format)
-		camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-Format", xev->format);
-	if (xev->postto)
-		camel_medium_set_header (CAMEL_MEDIUM (message), "X-Evolution-PostTo", xev->postto);
-}
-
-void
-mail_tool_destroy_xevolution (XEvolution *xev)
-{
-	g_free (xev->flags);
-	g_free (xev->source);
-	g_free (xev->transport);
-	g_free (xev->account);
-	g_free (xev->format);
-	g_free (xev->fcc);
-	g_free (xev->postto);
-	g_free (xev);
-}
-
-CamelMimePart *
-mail_tool_make_message_attachment (CamelMimeMessage *message)
-{
-	CamelMimePart *part;
-	const char *subject;
-	XEvolution *xev;
-	char *desc;
-	
-	subject = camel_mime_message_get_subject (message);
-	if (subject)
-		desc = g_strdup_printf (_("Forwarded message - %s"), subject);
-	else
-		desc = g_strdup (_("Forwarded message"));
-	
-	/* rip off the X-Evolution headers */
-	xev = mail_tool_remove_xevolution_headers (message);
-	mail_tool_destroy_xevolution (xev);
-	
-	/* remove Bcc headers */
-	while (camel_medium_get_header (CAMEL_MEDIUM (message), "Bcc"))
-		camel_medium_remove_header (CAMEL_MEDIUM (message), "Bcc");
-	
-	part = camel_mime_part_new ();
-	camel_mime_part_set_disposition (part, "inline");
-	camel_mime_part_set_description (part, desc);
-	camel_medium_set_content_object (CAMEL_MEDIUM (part),
-					 CAMEL_DATA_WRAPPER (message));
-	camel_mime_part_set_content_type (part, "message/rfc822");
-	g_free (desc);
-	
-	return part;
-}
-
-CamelFolder *
-mail_tool_uri_to_folder (const char *uri, guint32 flags, CamelException *ex)
-{
-	CamelURL *url;
-	CamelStore *store = NULL;
-	CamelFolder *folder = NULL;
-	int offset = 0;
-	
-	g_return_val_if_fail (uri != NULL, NULL);
-	
-	/* This hack is still needed for file:/ since it's its own EvolutionStorage type */
-	if (!strncmp (uri, "vtrash:", 7))
-		offset = 7;
-	
-	url = camel_url_new (uri + offset, ex);
-	if (!url) {
-		return NULL;
-	}
-
-	store = camel_session_get_store (session, uri + offset, ex);
-	if (store) {
-		const char *name;
-		
-		/* if we have a fragment, then the path is actually used by the store,
-		   so the fragment is the path to the folder instead */
-		if (url->fragment) {
-			name = url->fragment;
-		} else {
-			if (url->path && *url->path)
-				name = url->path + 1;
-			else
-				name = "";
-		}
-		
-		if (offset)
-			folder = camel_store_get_trash (store, ex);
-		else
-			folder = camel_store_get_folder (store, name, flags, ex);
-		camel_object_unref (store);
-	}
-	
-	if (folder)
-		mail_note_folder (folder);
-	
-	camel_url_free (url);
-	
-	return folder;
-}
-
-/**
- * mail_tool_quote_message:
- * @message: mime message to quote
- * @fmt: credits format - example: "On %s, %s wrote:\n"
- * @Varargs: arguments
- *
- * Returns an allocated buffer containing the quoted message.
- */
-gchar *
-mail_tool_quote_message (CamelMimeMessage *message, const char *fmt, ...)
-{
-	CamelDataWrapper *contents;
-	gboolean want_plain;
-	char *text, *colour;
-	GConfClient *gconf;
-	
-	gconf = gconf_client_get_default ();
-	
-	contents = camel_medium_get_content_object (CAMEL_MEDIUM (message));
-	/* We pass "want_plain" for "cite", since if it's HTML, we'll
-	 * do the citing ourself below.
-	 */
-	/* FIXME the citing logic has changed and we basically never want_plain
-	 * to be true now, but I don't want to remove all that logic until I
-	 * am sure --Larry
-	 */
-	want_plain = FALSE;
-	text = mail_get_message_body (contents, want_plain, want_plain);
-	
-	/* Set the quoted reply text. */
-	if (text) {
-		char *sig, *p, *ret_text, *credits = NULL;
-		
-		/* look for the signature and strip it off */
-		sig = text;
-	        while ((p = strstr (sig, "\n-- \n")))
-			sig = p + 1;
-		
-		if (sig != text)
-			*sig = '\0';
-		
-		/* create credits */
-		if (fmt) {
-			va_list ap;
-			
-			va_start (ap, fmt);
-			credits = g_strdup_vprintf (fmt, ap);
-			va_end (ap);
-		}
-		
-		colour = gconf_client_get_string (gconf, "/apps/evolution/mail/display/citation_colour", NULL);
-		
-		ret_text = g_strdup_printf ("%s"
-					    "\n%s%s%s"
-					    "",
-					    credits ? credits : "",
-					    colour ? colour : "#737373",
-					    want_plain ? "" : "
    ",
-					    text,
-					    want_plain ? "" : "
    ");
-		
-		g_free (text);
-		g_free (colour);
-		g_free (credits);
-		
-		return ret_text;
-	}
-	
-	return NULL;
-}
-
-
-/**
- * mail_tool_forward_message:
- * @message: mime message to forward
- * @quoted: whether to forwarded it quoted (%TRUE) or inline (%FALSE)
- *
- * Returns an allocated buffer containing the forwarded message.
- */
-gchar *
-mail_tool_forward_message (CamelMimeMessage *message, gboolean quoted)
-{
-	char *title, *body, *ret;
-	gboolean send_html;
-	GConfClient *gconf;
-	
-	gconf = gconf_client_get_default ();
-	send_html = gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/send_html", NULL);
-	
-	body = mail_get_message_body (CAMEL_DATA_WRAPPER (message), !send_html, quoted);
-	title = _("Forwarded Message");
-	ret = g_strdup_printf ("-----%s-----
    %s", title, body ? body : "");
-	g_free (body);
-	
-	return ret;
-}
-
-
-/**
- * mail_tools_x_evolution_message_parse:
- * @in: GtkSelectionData->data
- * @inlen: GtkSelectionData->length
- * @uids: pointer to a gptrarray that will be filled with uids on success
- *
- * Parses the GtkSelectionData and returns a CamelFolder and a list of
- * UIDs specified by the selection.
- **/
-CamelFolder *
-mail_tools_x_evolution_message_parse (char *in, unsigned int inlen, GPtrArray **uids)
-{
-	/* format: "uri\0uid1\0uid2\0uid3\0...\0uidn" */
-	char *inptr, *inend;
-	CamelFolder *folder;
-	
-	if (in == NULL)
-		return NULL;
-	
-	folder = mail_tool_uri_to_folder (in, 0, NULL);
-	
-	if (!folder)
-		return NULL;
-	
-	/* split the uids */
-	inend = in + inlen;
-	inptr = in + strlen (in) + 1;
-	*uids = g_ptr_array_new ();
-	while (inptr < inend) {
-		char *start = inptr;
-		
-		while (inptr < inend && *inptr)
-			inptr++;
-		
-		g_ptr_array_add (*uids, g_strndup (start, inptr - start));
-		inptr++;
-	}
-	
-	return folder;
-}
-
-
-char *
-mail_tools_folder_to_url (CamelFolder *folder)
-{
-	char *service_url, *url;
-	const char *full_name;
-	CamelService *service;
-	
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-	
-	full_name = folder->full_name;
-	while (*full_name == '/')
-		full_name++;
-	
-	service = (CamelService *) folder->parent_store;
-	service_url = camel_url_to_string (service->url, CAMEL_URL_HIDE_ALL);
-	url = g_strdup_printf ("%s%s%s", service_url, service_url[strlen (service_url)-1] != '/' ? "/" : "",
-			       full_name);
-	g_free (service_url);
-	
-	return url;
-}
diff --git a/mail/mail-tools.h b/mail/mail-tools.h
deleted file mode 100644
index 6c74d291f8..0000000000
--- a/mail/mail-tools.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Author : 
- *  Peter Williams 
- *
- * Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef MAIL_TOOLS_H
-#define MAIL_TOOLS_H
-
-#include 
-#include  /*eek*/
-
-typedef struct _xevolution {
-	char *flags;
-	char *source;
-	char *transport;
-	char *account;
-	char *fcc;
-	char *format;
-	char *postto;
-} XEvolution;
-
-/* Get the CamelFolder for the local inbox */
-CamelFolder *mail_tool_get_local_inbox (CamelException *ex);
-
-/* Get the "inbox" for a url (uses global session) */
-CamelFolder *mail_tool_get_inbox (const char *url, CamelException *ex);
-
-/* Get the "trash" for a url (uses global session) */
-CamelFolder *mail_tool_get_trash (const char *url, int connect, CamelException *ex);
-
-/* Does a camel_movemail into the local movemail folder
- * and returns the path to the new movemail folder that was created. which shoudl be freed later */
-char *mail_tool_do_movemail (const char *source_url, CamelException *ex);
-
-/* Transfers all the messages from source into dest;
- * source is emptied and synced. */
-void mail_tool_move_folder_contents (CamelFolder *source, CamelFolder *dest, gboolean use_cache, CamelException *ex);
-
-XEvolution *mail_tool_remove_xevolution_headers (CamelMimeMessage *message);
-void mail_tool_restore_xevolution_headers (CamelMimeMessage *message, XEvolution *xev);
-void mail_tool_destroy_xevolution (XEvolution *xev);
-
-/* Generates the subject for a message forwarding @msg */
-gchar *mail_tool_generate_forward_subject (CamelMimeMessage *msg);
-
-/* Make a message into an attachment */
-CamelMimePart *mail_tool_make_message_attachment (CamelMimeMessage *message);
-
-/* Parse the ui into a real CamelFolder any way we know how. */
-CamelFolder *mail_tool_uri_to_folder (const char *uri, guint32 flags, CamelException *ex);
-
-GHashTable *mail_lookup_url_table (CamelMimeMessage *mime_message);
-
-gchar *mail_tool_quote_message (CamelMimeMessage *message, const char *fmt, ...);
-
-gchar *mail_tool_forward_message (CamelMimeMessage *message, gboolean quoted);
-
-CamelFolder *mail_tools_x_evolution_message_parse (char *in, unsigned int inlen, GPtrArray **uids);
-
-char *mail_tools_folder_to_url (CamelFolder *folder);
-
-#endif
diff --git a/mail/mail-types.h b/mail/mail-types.h
deleted file mode 100644
index 1cb0bdad06..0000000000
--- a/mail/mail-types.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-
-/* 
- * Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef MAIL_TYPES_H
-#define MAIL_TYPES_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-
-typedef struct  _FolderBrowser     FolderBrowser;
-typedef struct  _MessageBrowser    MessageBrowser;
-typedef struct  _SubscribeDialog   SubscribeDialog;
-typedef struct  _MessageList       MessageList;
-typedef struct  _MailDisplay       MailDisplay;
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* MAIL_TYPES_H */
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
deleted file mode 100644
index 43b47032a9..0000000000
--- a/mail/mail-vfolder.c
+++ /dev/null
@@ -1,977 +0,0 @@
-/*
-  Copyright 2000, 2001 Ximian Inc.
-
-  Author: Michael Zucchi 
-
-  code for managing vfolders
-
-  NOTE: dont run this through fucking indent.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-
-#include "evolution-shell-component.h"
-#include "folder-browser.h"
-#include "mail-vfolder.h"
-#include "mail-tools.h"
-#include "mail-autofilter.h"
-#include "mail-folder-cache.h"
-#include "mail.h"
-#include "mail-ops.h"
-#include "mail-mt.h"
-
-#include "gal/widgets/e-gui-utils.h"
-
-#include "camel/camel.h"
-#include "camel/camel-vee-folder.h"
-#include "camel/camel-vee-store.h"
-
-#include "filter/vfolder-context.h"
-#include "filter/vfolder-editor.h"
-
-#define d(x) /*(printf("%s(%d):%s: ",  __FILE__, __LINE__, __PRETTY_FUNCTION__), (x))*/
-
-static VfolderContext *context;	/* context remains open all time */
-static CamelStore *vfolder_store; /* the 1 static vfolder store */
-
-/* lock for accessing shared resources (below) */
-static pthread_mutex_t vfolder_lock = PTHREAD_MUTEX_INITIALIZER;
-
-static GList *source_folders_remote;	/* list of source folder uri's - remote ones */
-static GList *source_folders_local;	/* list of source folder uri's - local ones */
-static GHashTable *vfolder_hash;
-
-extern EvolutionShellClient *global_shell_client;
-
-/* more globals ... */
-extern char *evolution_dir;
-extern CamelSession *session;
-
-static void rule_changed(FilterRule *rule, CamelFolder *folder);
-
-#define LOCK() pthread_mutex_lock(&vfolder_lock);
-#define UNLOCK() pthread_mutex_unlock(&vfolder_lock);
-
-/* ********************************************************************** */
-
-struct _setup_msg {
-	struct _mail_msg msg;
-
-	CamelFolder *folder;
-	char *query;
-	GList *sources_uri;
-	GList *sources_folder;
-};
-
-static char *
-vfolder_setup_desc(struct _mail_msg *mm, int done)
-{
-	struct _setup_msg *m = (struct _setup_msg *)mm;
-
-	return g_strdup_printf(_("Setting up vfolder: %s"), m->folder->full_name);
-}
-
-static void
-vfolder_setup_do(struct _mail_msg *mm)
-{
-	struct _setup_msg *m = (struct _setup_msg *)mm;
-	GList *l, *list = NULL;
-	CamelFolder *folder;
-
-	d(printf("Setting up vfolder: %s\n", m->folder->full_name));
-
-	camel_vee_folder_set_expression((CamelVeeFolder *)m->folder, m->query);
-
-	l = m->sources_uri;
-	while (l) {
-		d(printf(" Adding uri: %s\n", (char *)l->data));
-		folder = mail_tool_uri_to_folder (l->data, 0, &mm->ex);
-		if (folder) {
-			list = g_list_append(list, folder);
-		} else {
-			g_warning("Could not open vfolder source: %s", (char *)l->data);
-			camel_exception_clear(&mm->ex);
-		}
-		l = l->next;
-	}
-
-	l = m->sources_folder;
-	while (l) {
-		d(printf(" Adding folder: %s\n", ((CamelFolder *)l->data)->full_name));
-		camel_object_ref(l->data);
-		list = g_list_append(list, l->data);
-		l = l->next;
-	}
-
-	camel_vee_folder_set_folders((CamelVeeFolder *)m->folder, list);
-
-	l = list;
-	while (l) {
-		camel_object_unref(l->data);
-		l = l->next;
-	}
-	g_list_free(list);
-}
-
-static void
-vfolder_setup_done(struct _mail_msg *mm)
-{
-	struct _setup_msg *m = (struct _setup_msg *)mm;
-
-	m = m;
-}
-
-static void
-vfolder_setup_free (struct _mail_msg *mm)
-{
-	struct _setup_msg *m = (struct _setup_msg *)mm;
-	GList *l;
-
-	camel_object_unref(m->folder);
-	g_free(m->query);
-
-	l = m->sources_uri;
-	while (l) {
-		g_free(l->data);
-		l = l->next;
-	}
-	g_list_free(m->sources_uri);
-
-	l = m->sources_folder;
-	while (l) {
-		camel_object_unref(l->data);
-		l = l->next;
-	}
-	g_list_free(m->sources_folder);
-}
-
-static struct _mail_msg_op vfolder_setup_op = {
-	vfolder_setup_desc,
-	vfolder_setup_do,
-	vfolder_setup_done,
-	vfolder_setup_free,
-};
-
-static int
-vfolder_setup(CamelFolder *folder, const char *query, GList *sources_uri, GList *sources_folder)
-{
-	struct _setup_msg *m;
-	int id;
-	
-	m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m));
-	m->folder = folder;
-	camel_object_ref(folder);
-	m->query = g_strdup(query);
-	m->sources_uri = sources_uri;
-	m->sources_folder = sources_folder;
-	
-	id = m->msg.seq;
-	e_thread_put(mail_thread_queued_slow, (EMsg *)m);
-
-	return id;
-}
-
-/* ********************************************************************** */
-
-struct _adduri_msg {
-	struct _mail_msg msg;
-
-	char *uri;
-	GList *folders;
-	int remove;
-};
-
-static char *
-vfolder_adduri_desc(struct _mail_msg *mm, int done)
-{
-	struct _adduri_msg *m = (struct _adduri_msg *)mm;
-
-	return g_strdup_printf(_("Updating vfolders for uri: %s"), m->uri);
-}
-
-static void
-vfolder_adduri_do(struct _mail_msg *mm)
-{
-	struct _adduri_msg *m = (struct _adduri_msg *)mm;
-	GList *l;
-	CamelFolder *folder = NULL;
-
-	d(printf("%s uri to vfolder: %s\n", m->remove?"Removing":"Adding", m->uri));
-
-	/* we dont try lookup the cache if we are removing it, its no longer there */
-	if (!m->remove && !mail_note_get_folder_from_uri(m->uri, &folder)) {
-		g_warning("Folder '%s' disappeared while I was adding/remove it to/from my vfolder", m->uri);
-		return;
-	}
-
-	if (folder == NULL)
-		folder = mail_tool_uri_to_folder (m->uri, 0, &mm->ex);
-
-	if (folder != NULL) {
-		l = m->folders;
-		while (l) {
-			if (m->remove)
-				camel_vee_folder_remove_folder((CamelVeeFolder *)l->data, folder);
-			else
-				camel_vee_folder_add_folder((CamelVeeFolder *)l->data, folder);
-			l = l->next;
-		}
-		camel_object_unref(folder);
-	}
-}
-
-static void
-vfolder_adduri_done(struct _mail_msg *mm)
-{
-	struct _adduri_msg *m = (struct _adduri_msg *)mm;
-
-	m = m;
-}
-
-static void
-vfolder_adduri_free (struct _mail_msg *mm)
-{
-	struct _adduri_msg *m = (struct _adduri_msg *)mm;
-
-	g_list_foreach(m->folders, (GFunc)camel_object_unref, NULL);
-	g_list_free(m->folders);
-	g_free(m->uri);
-}
-
-static struct _mail_msg_op vfolder_adduri_op = {
-	vfolder_adduri_desc,
-	vfolder_adduri_do,
-	vfolder_adduri_done,
-	vfolder_adduri_free,
-};
-
-static int
-vfolder_adduri(const char *uri, GList *folders, int remove)
-{
-	struct _adduri_msg *m;
-	int id;
-	
-	m = mail_msg_new(&vfolder_adduri_op, NULL, sizeof (*m));
-	m->folders = folders;
-	m->uri = g_strdup(uri);
-	m->remove = remove;
-	
-	id = m->msg.seq;
-	e_thread_put(mail_thread_queued_slow, (EMsg *)m);
-
-	return id;
-}
-
-/* ********************************************************************** */
-
-/* So, uh, apparently g_list_find_custom expect the compare func to return 0 to mean true? */
-static GList *
-my_list_find(GList *l, const char *uri, GCompareFunc cmp)
-{
-	while (l) {
-		if (cmp(l->data, uri))
-			break;
-		l = l->next;
-	}
-	return l;
-}
-
-static int
-uri_is_ignore(const char *uri, GCompareFunc uri_cmp)
-{
-	int found = FALSE;
-	const GSList *l;
-	MailConfigAccount *ac;
-	extern char *default_outbox_folder_uri, *default_sent_folder_uri, *default_drafts_folder_uri;
-
-	d(printf("checking '%s' against:\n  %s\n  %s\n  %s\n", uri, default_outbox_folder_uri, default_sent_folder_uri, default_drafts_folder_uri));
-
-	found = (default_outbox_folder_uri && uri_cmp(default_outbox_folder_uri, uri))
-		|| (default_sent_folder_uri && uri_cmp(default_sent_folder_uri, uri))
-		|| (default_drafts_folder_uri && uri_cmp(default_drafts_folder_uri, uri));
-
-	l = mail_config_get_accounts();
-	while (!found && l) {
-		ac = l->data;
-		d(printf("checkint sent_folder_uri '%s' == '%s'\n", ac->sent_folder_uri?ac->sent_folder_uri:"empty", uri));
-		found = (ac->sent_folder_uri && uri_cmp(ac->sent_folder_uri, uri))
-			|| (ac->drafts_folder_uri && uri_cmp(ac->drafts_folder_uri, uri));
-		l = l->next;
-	}
-
-	return found;
-}
-
-/* called when a new uri becomes (un)available */
-void
-mail_vfolder_add_uri(CamelStore *store, const char *uri, int remove)
-{
-	FilterRule *rule;
-	const char *source;
-	CamelVeeFolder *vf;
-	GList *folders = NULL, *link;
-	int remote = (((CamelService *)store)->provider->flags & CAMEL_PROVIDER_IS_REMOTE) != 0;
-	GCompareFunc uri_cmp = CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(store))->compare_folder_name;
-	int is_ignore;
-
-	if (CAMEL_IS_VEE_STORE(store) || !strncmp(uri, "vtrash:", 7) || context == NULL)
-		return;
-
-	g_assert(pthread_self() == mail_gui_thread);
-
-	is_ignore = uri_is_ignore(uri, uri_cmp);
-
-	LOCK();
-
-	d(printf("%s uri to check: %s\n", remove?"Removing":"Adding", uri));
-
-	/* maintain the source folders lists for changed rules later on */
-	if (remove) {
-		if (remote) {
-			if ((link = my_list_find(source_folders_remote, (void *)uri, uri_cmp)) != NULL) {
-				g_free(link->data);
-				source_folders_remote = g_list_remove_link(source_folders_remote, link);
-			}
-		} else {
-			if ((link = my_list_find(source_folders_local, (void *)uri, uri_cmp)) != NULL) {
-				g_free(link->data);
-				source_folders_local = g_list_remove_link(source_folders_local, link);
-			}
-		}
-	} else if (!is_ignore) {
-		/* we ignore drafts/sent/outbox here */
-		if (remote) {
-			if (my_list_find(source_folders_remote, (void *)uri, uri_cmp) == NULL)
-				source_folders_remote = g_list_prepend(source_folders_remote, g_strdup(uri));
-		} else {
-			if (my_list_find(source_folders_local, (void *)uri, uri_cmp) == NULL)
-				source_folders_local = g_list_prepend(source_folders_local, g_strdup(uri));
-		}
-	}
-
- 	rule = NULL;
-	while ((rule = rule_context_next_rule((RuleContext *)context, rule, NULL))) {
-		int found = FALSE;
-		
-		if (!rule->name) {
-			d(printf("invalid rule (%p): rule->name is set to NULL\n", rule));
-			continue;
-		}
-
-		/* dont auto-add any sent/drafts folders etc, they must be explictly listed as a source */
-		if (rule->source
-		    && !is_ignore
-		    && ((!strcmp(rule->source, "local") && !remote)
-			|| (!strcmp(rule->source, "remote_active") && remote)
-			|| (!strcmp(rule->source, "local_remote_active"))))
-			found = TRUE;
-		
-		/* we check using the store uri_cmp since its more accurate */
-		source = NULL;
-		while (!found && (source = vfolder_rule_next_source((VfolderRule *)rule, source)))
-			found = uri_cmp(uri, source);
-		
-		if (found) {
-			vf = g_hash_table_lookup(vfolder_hash, rule->name);
-			g_assert(vf);
-			camel_object_ref(vf);
-			folders = g_list_prepend(folders, vf);
-		}
-	}
-	
-	UNLOCK();
-	
-	if (folders != NULL)
-		vfolder_adduri(uri, folders, remove);
-}
-
-/* called when a uri is deleted from a store */
-void
-mail_vfolder_delete_uri(CamelStore *store, const char *uri)
-{
-	GCompareFunc uri_cmp = CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(store))->compare_folder_name;
-	FilterRule *rule;
-	const char *source;
-	CamelVeeFolder *vf;
-	GString *changed;
-
-	if (context == NULL || !strncmp(uri, "vtrash:", 7))
-		return;
-	
-	d(printf ("Deleting uri to check: %s\n", uri));
-	
-	g_assert (pthread_self() == mail_gui_thread);
-	
-	changed = g_string_new ("");
-	
-	LOCK();
-	
-	/* see if any rules directly reference this removed uri */
- 	rule = NULL;
-	while ((rule = rule_context_next_rule ((RuleContext *) context, rule, NULL))) {
-		source = NULL;
-		while ((source = vfolder_rule_next_source ((VfolderRule *) rule, source))) {
-			/* Remove all sources that match, ignore changed events though
-			   because the adduri call above does the work async */
-			if (uri_cmp (uri, source)) {
-				vf = g_hash_table_lookup (vfolder_hash, rule->name);
-				g_assert (vf != NULL);
-				g_signal_handlers_disconnect_matched (rule, G_SIGNAL_MATCH_FUNC|G_SIGNAL_MATCH_DATA, 0,
-								      0, NULL, rule_changed, vf);
-				vfolder_rule_remove_source ((VfolderRule *)rule, source);
-				g_signal_connect (rule, "changed", G_CALLBACK(rule_changed), vf);
-				g_string_append_printf (changed, "    %s\n", rule->name);
-				source = NULL;
-			}
-		}
-	}
-	
-	UNLOCK();
-	
-	if (changed->str[0]) {
-		GtkWidget *dialog;
-		char *user;
-		
-		dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
-						 _("The following vFolder(s):\n%s"
-						   "Used the removed folder:\n    '%s'\n"
-						   "And have been updated."),
-						 changed->str, uri);
-		g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
-		gtk_widget_show (dialog);
-		
-		user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
-		rule_context_save ((RuleContext *) context, user);
-		g_free (user);
-	}
-	
-	g_string_free (changed, TRUE);
-}
-
-/* called when a uri is renamed in a store */
-void
-mail_vfolder_rename_uri(CamelStore *store, const char *from, const char *to)
-{
-	GCompareFunc uri_cmp = CAMEL_STORE_CLASS(CAMEL_OBJECT_GET_CLASS(store))->compare_folder_name;
-	FilterRule *rule;
-	const char *source;
-	CamelVeeFolder *vf;
-	int changed = 0;
-
-	d(printf("vfolder rename uri: %s to %s\n", from, to));
-
-	if (context == NULL || !strncmp(from, "vtrash:", 7) || !strncmp(to, "vtrash:", 7))
-		return;
-
-	g_assert(pthread_self() == mail_gui_thread);
-
-	LOCK();
-
-	/* see if any rules directly reference this removed uri */
- 	rule = NULL;
-	while ( (rule = rule_context_next_rule((RuleContext *)context, rule, NULL)) ) {
-		source = NULL;
-		while ( (source = vfolder_rule_next_source((VfolderRule *)rule, source)) ) {
-			/* Remove all sources that match, ignore changed events though
-			   because the adduri call above does the work async */
-			if (uri_cmp(from, source)) {
-				d(printf("Vfolder '%s' used '%s' ('%s') now uses '%s'\n", rule->name, source, from, to));
-				vf = g_hash_table_lookup(vfolder_hash, rule->name);
-				g_assert(vf);
-				g_signal_handlers_disconnect_matched(rule, G_SIGNAL_MATCH_FUNC|G_SIGNAL_MATCH_DATA, 0,
-								     0, NULL, rule_changed, vf);
-				vfolder_rule_remove_source((VfolderRule *)rule, source);
-				vfolder_rule_add_source((VfolderRule *)rule, to);
-				g_signal_connect(rule, "changed", G_CALLBACK(rule_changed), vf);
-				changed++;
-				source = NULL;
-			}
-		}
-	}
-
-	UNLOCK();
-
-	if (changed) {
-		char *user;
-
-		d(printf("Vfolders updated from renamed folder\n"));
-		user = g_strdup_printf("%s/vfolders.xml", evolution_dir);
-		rule_context_save((RuleContext *)context, user);
-		g_free(user);
-	}
-}
-
-/* ********************************************************************** */
-
-static void context_rule_added(RuleContext *ctx, FilterRule *rule);
-
-static void
-rule_changed(FilterRule *rule, CamelFolder *folder)
-{
-	const char *sourceuri;
-	GList *l;
-	GList *sources_uri = NULL, *sources_folder = NULL;
-	GString *query;
-	int i;
-	CamelFolder *newfolder;
-
-	/* if the folder has changed name, then add it, then remove the old manually */
-	if (strcmp(folder->full_name, rule->name) != 0) {
-		char *key, *oldname;
-		CamelFolder *old;
-
-		LOCK();
-		d(printf("Changing folder name in hash table to '%s'\n", rule->name));
-		if (g_hash_table_lookup_extended(vfolder_hash, folder->full_name, (void **)&key, (void **)&old)) {
-			g_hash_table_remove(vfolder_hash, key);
-			g_free(key);
-			g_hash_table_insert(vfolder_hash, g_strdup(rule->name), folder);
-			UNLOCK();
-		} else {
-			UNLOCK();
-			g_warning("couldn't find a vfolder rule in our table? %s", folder->full_name);
-		}
-
-		/* TODO: make the folder->full_name var thread accessible */
-		oldname = g_strdup(folder->full_name);
-		camel_store_rename_folder(vfolder_store, oldname, rule->name, NULL);
-		g_free(oldname);
-	}
-
-	d(printf("Filter rule changed? for folder '%s'!!\n", folder->name));
-
-	/* find any (currently available) folders, and add them to the ones to open */
-	sourceuri = NULL;
-	while ( (sourceuri = vfolder_rule_next_source((VfolderRule *)rule, sourceuri)) ) {
-		if (mail_note_get_folder_from_uri(sourceuri, &newfolder)) {
-			if (newfolder)
-				sources_folder = g_list_append(sources_folder, newfolder);
-			else
-				sources_uri = g_list_append(sources_uri, g_strdup(sourceuri));
-		}
-	}
-
-	/* check the remote/local uri lists for any other uri's that should be looked at */
-	if (rule->source) {
-		LOCK();
-		for (i=0;i<2;i++) {
-			if (i==0 && (!strcmp(rule->source, "local") || !strcmp(rule->source, "local_remote_active")))
-				l = source_folders_local;
-			else if (i==1 && (!strcmp(rule->source, "remote_active") || !strcmp(rule->source, "local_remote_active")))
-				l = source_folders_remote;
-			else
-				l = NULL;
-
-			while (l) {
-				if (mail_note_get_folder_from_uri(l->data, &newfolder)) {
-					if (newfolder)
-						sources_folder = g_list_append(sources_folder, newfolder);
-					else
-						sources_uri = g_list_append(sources_uri, g_strdup(l->data));
-				} else {
-					d(printf("  -> No such folder?\n"));
-				}
-				l = l->next;
-			}
-		}
-		UNLOCK();
-	}
-
-	query = g_string_new("");
-	filter_rule_build_code(rule, query);
-
-	vfolder_setup(folder, query->str, sources_uri, sources_folder);
-
-	g_string_free(query, TRUE);
-}
-
-static void context_rule_added(RuleContext *ctx, FilterRule *rule)
-{
-	CamelFolder *folder;
-
-	d(printf("rule added: %s\n", rule->name));
-
-	/* this always runs quickly */
-	folder = camel_store_get_folder(vfolder_store, rule->name, 0, NULL);
-	if (folder) {
-		g_signal_connect(rule, "changed", G_CALLBACK(rule_changed), folder);
-
-		LOCK();
-		g_hash_table_insert(vfolder_hash, g_strdup(rule->name), folder);
-		UNLOCK();
-
-		mail_note_folder(folder);
-		rule_changed(rule, folder);
-	}
-}
-
-static void context_rule_removed(RuleContext *ctx, FilterRule *rule)
-{
-	char *key, *path;
-	CamelFolder *folder = NULL;
-
-	d(printf("rule removed; %s\n", rule->name));
-
-	/* TODO: remove from folder info cache? */
-
-	path = g_strdup_printf("/%s", rule->name);
-	evolution_storage_removed_folder(mail_lookup_storage(vfolder_store), path);
-	g_free(path);
-
-	LOCK();
-	if (g_hash_table_lookup_extended(vfolder_hash, rule->name, (void **)&key, (void **)&folder)) {
-		g_hash_table_remove(vfolder_hash, key);
-		g_free(key);
-	}
-	UNLOCK();
-
-	camel_store_delete_folder(vfolder_store, rule->name, NULL);
-	/* this must be unref'd after its deleted */
-	if (folder)
-		camel_object_unref(folder);
-}
-
-static void
-store_folder_created(CamelObject *o, void *event_data, void *data)
-{
-	CamelStore *store = (CamelStore *)o;
-	CamelFolderInfo *info = event_data;
-
-	store = store;
-	info = info;
-}
-
-static void
-store_folder_deleted(CamelObject *o, void *event_data, void *data)
-{
-	CamelStore *store = (CamelStore *)o;
-	CamelFolderInfo *info = event_data;
-	FilterRule *rule;
-	char *user;
-
-	d(printf("Folder deleted: %s\n", info->name));
-	store = store;
-
-	/* Warning not thread safe, but might be enough */
-
-	LOCK();
-
-	/* delete it from our list */
-	rule = rule_context_find_rule((RuleContext *)context, info->full_name, NULL);
-	if (rule) {
-		/* We need to stop listening to removed events, otherwise we'll try and remove it again */
-		g_signal_handlers_disconnect_matched(context, G_SIGNAL_MATCH_FUNC|G_SIGNAL_MATCH_DATA, 0,
-						     0, NULL, context_rule_removed, context);
-		rule_context_remove_rule((RuleContext *)context, rule);
-		g_object_unref(rule);
-		g_signal_connect(context, "rule_removed", G_CALLBACK(context_rule_removed), context);
-
-		user = g_strdup_printf("%s/vfolders.xml", evolution_dir);
-		rule_context_save((RuleContext *)context, user);
-		g_free(user);
-	} else {
-		g_warning("Cannot find rule for deleted vfolder '%s'", info->name);
-	}
-
-	UNLOCK();
-}
-
-static void
-store_folder_renamed(CamelObject *o, void *event_data, void *data)
-{
-	CamelStore *store = (CamelStore *)o;
-	CamelRenameInfo *info = event_data;
-	FilterRule *rule;
-	char *user;
-	char *key;
-	CamelFolder *folder;
-
-	store = store;
-
-	/* This should be more-or-less thread-safe */
-
-	d(printf("Folder renamed to '%s' from '%s'\n", info->new->full_name, info->old_base));
-
-	/* Folder is already renamed? */
-	LOCK();
-	d(printf("Changing folder name in hash table to '%s'\n", info->new->full_name));
-	if (g_hash_table_lookup_extended(vfolder_hash, info->old_base, (void **)&key, (void **)&folder)) {
-		g_hash_table_remove(vfolder_hash, key);
-		g_free(key);
-		g_hash_table_insert(vfolder_hash, g_strdup(info->new->full_name), folder);
-
-		rule = rule_context_find_rule((RuleContext *)context, info->old_base, NULL);
-		g_assert(rule);
-		g_signal_handlers_disconnect_matched(rule, G_SIGNAL_MATCH_FUNC|G_SIGNAL_MATCH_DATA, 0,
-						     0, NULL, rule_changed, folder);
-		filter_rule_set_name(rule, info->new->full_name);
-		g_signal_connect(rule, "changed", G_CALLBACK(rule_changed), folder);
-
-		user = g_strdup_printf("%s/vfolders.xml", evolution_dir);
-		rule_context_save((RuleContext *)context, user);
-		g_free(user);
-
-		UNLOCK();
-	} else {
-		UNLOCK();
-		g_warning("couldn't find a vfolder rule in our table? %s", info->new->full_name);
-	}
-}
-
-void
-vfolder_load_storage(GNOME_Evolution_Shell shell)
-{
-	char *user, *storeuri;
-	FilterRule *rule;
-
-	vfolder_hash = g_hash_table_new(g_str_hash, g_str_equal);
-
-	/* first, create the vfolder store, and set it up */
-	storeuri = g_strdup_printf("vfolder:%s/vfolder", evolution_dir);
-	vfolder_store = camel_session_get_store(session, storeuri, NULL);
-	if (vfolder_store == NULL) {
-		g_warning("Cannot open vfolder store - no vfolders available");
-		return;
-	}
-
-	camel_object_hook_event(vfolder_store, "folder_created",
-				(CamelObjectEventHookFunc)store_folder_created, NULL);
-	camel_object_hook_event(vfolder_store, "folder_deleted",
-				(CamelObjectEventHookFunc)store_folder_deleted, NULL);
-	camel_object_hook_event(vfolder_store, "folder_renamed",
-				(CamelObjectEventHookFunc)store_folder_renamed, NULL);
-
-	d(printf("got store '%s' = %p\n", storeuri, vfolder_store));
-	mail_load_storage_by_uri(shell, storeuri, _("VFolders"));
-
-	/* load our rules */
-	user = g_strdup_printf ("%s/vfolders.xml", evolution_dir);
-	context = vfolder_context_new ();
-	if (rule_context_load ((RuleContext *)context, EVOLUTION_DATADIR "/evolution/vfoldertypes.xml", user) != 0) {
-		g_warning("cannot load vfolders: %s\n", ((RuleContext *)context)->error);
-	}
-	g_free (user);
-	
-	g_signal_connect(context, "rule_added", G_CALLBACK(context_rule_added), context);
-	g_signal_connect(context, "rule_removed", G_CALLBACK(context_rule_removed), context);
-
-	/* and setup the rules we have */
-	rule = NULL;
-	while ( (rule = rule_context_next_rule((RuleContext *)context, rule, NULL)) ) {
-		if (rule->name)
-			context_rule_added((RuleContext *)context, rule);
-		else
-			d(printf("invalid rule (%p) encountered: rule->name is NULL\n", rule));
-	}
-
-	g_free(storeuri);
-}
-
-static GtkWidget *vfolder_editor = NULL;
-
-static void
-vfolder_editor_response (GtkWidget *dialog, int button, void *data)
-{
-	char *user;
-
-	user = alloca(strlen(evolution_dir)+16);
-	sprintf(user, "%s/vfolders.xml", evolution_dir);
-
-	switch(button) {
-	case GTK_RESPONSE_OK:
-		rule_context_save((RuleContext *)context, user);
-		break;
-	default:
-		rule_context_revert((RuleContext *)context, user);
-	}
-
-	vfolder_editor = NULL;
-
-	gtk_widget_destroy(dialog);
-}
-
-void
-vfolder_edit (void)
-{
-	if (vfolder_editor) {
-		gdk_window_raise (GTK_WIDGET (vfolder_editor)->window);
-		return;
-	}
-	
-	vfolder_editor = GTK_WIDGET (vfolder_editor_new (context));
-	gtk_window_set_title (GTK_WINDOW (vfolder_editor), _("vFolders"));
-	g_signal_connect(vfolder_editor, "response", G_CALLBACK(vfolder_editor_response), NULL);
-	gtk_dialog_add_button (GTK_DIALOG (vfolder_editor), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-
-	gtk_widget_show (vfolder_editor);
-}
-
-static void
-edit_rule_response(GtkWidget *w, int button, void *data)
-{
-	if (button == GTK_RESPONSE_OK) {
-		char *user;
-		FilterRule *rule = g_object_get_data (G_OBJECT (w), "rule");
-		FilterRule *orig = g_object_get_data (G_OBJECT (w), "orig");
-
-		filter_rule_copy(orig, rule);
-		user = g_strdup_printf("%s/vfolders.xml", evolution_dir);
-		rule_context_save((RuleContext *)context, user);
-		g_free(user);
-	}
-
-	gtk_widget_destroy(w);
-}
-
-void
-vfolder_edit_rule(const char *uri)
-{
-	GtkWidget *w;
-	GtkDialog *gd;
-	FilterRule *rule, *newrule;
-	CamelURL *url;
-
-	url = camel_url_new(uri, NULL);
-	if (url && url->fragment
-	    && (rule = rule_context_find_rule((RuleContext *)context, url->fragment, NULL))) {
-		g_object_ref((GtkObject *)rule);
-		newrule = filter_rule_clone(rule);
-
-		w = filter_rule_get_widget((FilterRule *)newrule, (RuleContext *)context);
-
-		gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("Edit VFolder"), NULL,
-							      GTK_DIALOG_DESTROY_WITH_PARENT,
-							      GTK_STOCK_OK,
-							      GTK_RESPONSE_OK,
-							      GTK_STOCK_CANCEL,
-							      GTK_RESPONSE_CANCEL,
-							      NULL);
-		gtk_dialog_set_default_response(gd, GTK_RESPONSE_OK);
-		g_object_set(gd, "allow_shrink", FALSE, "allow_grow", TRUE, NULL);
-		gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500);
-		gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
-		gtk_widget_show((GtkWidget *)gd);
-		g_object_set_data_full(G_OBJECT(gd), "rule", newrule, (GtkDestroyNotify)g_object_unref);
-		g_object_set_data_full(G_OBJECT(gd), "orig", rule, (GtkDestroyNotify)g_object_unref);
-		g_signal_connect(gd, "response", G_CALLBACK(edit_rule_response), NULL);
-		gtk_widget_show((GtkWidget *)gd);
-	} else {
-		e_notice (NULL, GTK_MESSAGE_WARNING,
-			  _("Trying to edit a vfolder '%s' which doesn't exist."), uri);
-	}
-
-	if (url)
-		camel_url_free(url);
-}
-
-static void
-new_rule_clicked(GtkWidget *w, int button, void *data)
-{
-	if (button == GTK_RESPONSE_OK) {
-		char *user;
-		FilterRule *rule = g_object_get_data((GObject *)w, "rule");
-
-		g_object_ref(rule);
-		rule_context_add_rule((RuleContext *)context, rule);
-		user = g_strdup_printf("%s/vfolders.xml", evolution_dir);
-		rule_context_save((RuleContext *)context, user);
-		g_free(user);
-	}
-
-	gtk_widget_destroy(w);
-}
-
-FilterPart *
-vfolder_create_part(const char *name)
-{
-	return rule_context_create_part((RuleContext *)context, name);
-}
-
-/* clones a filter/search rule into a matching vfolder rule (assuming the same system definitions) */
-FilterRule *
-vfolder_clone_rule(FilterRule *in)
-{
-	FilterRule *rule = (FilterRule *)vfolder_rule_new();
-	xmlNodePtr xml;
-
-	xml = filter_rule_xml_encode(in);
-	filter_rule_xml_decode(rule, xml, (RuleContext *)context);
-	xmlFreeNodeList(xml);
-
-	return rule;
-}
-
-/* adds a rule with a gui */
-void
-vfolder_gui_add_rule(VfolderRule *rule)
-{
-	GtkWidget *w;
-	GtkDialog *gd;
-
-	w = filter_rule_get_widget((FilterRule *)rule, (RuleContext *)context);
-
-	gd = (GtkDialog *)gtk_dialog_new_with_buttons(_("New VFolder"),
-						      NULL,
-						      GTK_DIALOG_DESTROY_WITH_PARENT,
-						      GTK_STOCK_OK,
-						      GTK_RESPONSE_OK,
-						      GTK_STOCK_CANCEL,
-						      GTK_RESPONSE_CANCEL,
-						      NULL);
-	gtk_dialog_set_default_response(gd, GTK_RESPONSE_OK);
-	g_object_set(gd, "allow_shrink", FALSE, "allow_grow", TRUE, NULL);
-	gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500);
-	gtk_box_pack_start((GtkBox *)gd->vbox, w, TRUE, TRUE, 0);
-	gtk_widget_show((GtkWidget *)gd);
-	g_object_set_data_full(G_OBJECT(gd), "rule", rule, (GtkDestroyNotify)g_object_unref);
-	g_signal_connect(gd, "response", G_CALLBACK(new_rule_clicked), NULL);
-	gtk_widget_show((GtkWidget *)gd);
-}
-
-void
-vfolder_gui_add_from_message(CamelMimeMessage *msg, int flags, const char *source)
-{
-	VfolderRule *rule;
-
-	g_return_if_fail (msg != NULL);
-
-	rule = (VfolderRule*)vfolder_rule_from_message(context, msg, flags, source);
-	vfolder_gui_add_rule(rule);
-}
-
-static void
-vfolder_foreach_cb (gpointer key, gpointer data, gpointer user_data)
-{
-	CamelFolder *folder = CAMEL_FOLDER (data);
-	
-	if (folder)
-		camel_object_unref(folder);
-	
-	g_free (key);
-}
-
-void
-mail_vfolder_shutdown (void)
-{
-	g_hash_table_foreach (vfolder_hash, vfolder_foreach_cb, NULL);
-	g_hash_table_destroy (vfolder_hash);
-	vfolder_hash = NULL;
-
-	if (vfolder_store) {
-		camel_object_unref (vfolder_store);
-		vfolder_store = NULL;
-	}
-	
-	if (context) {
-		g_object_unref(context);
-		context = NULL;
-	}
-}
diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h
deleted file mode 100644
index 955b358c30..0000000000
--- a/mail/mail-vfolder.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#ifndef _MAIL_VFOLDER_H
-#define _MAIL_VFOLDER_H
-
-#include "Evolution.h"
-#include "evolution-storage.h"
-#include "evolution-shell-component.h"
-
-#include "camel/camel-folder.h"
-#include "camel/camel-mime-message.h"
-#include "filter/vfolder-rule.h"
-#include "filter/filter-part.h"
-
-void vfolder_load_storage(GNOME_Evolution_Shell shell);
-
-void vfolder_edit (void);
-void vfolder_edit_rule(const char *name);
-FilterPart *vfolder_create_part (const char *name);
-FilterRule *vfolder_clone_rule (FilterRule *in);
-void vfolder_gui_add_rule (VfolderRule *rule);
-void vfolder_gui_add_from_message (CamelMimeMessage *msg, int flags, const char *source);
-
-/* add a uri that is now (un)available to vfolders in a transient manner */
-void mail_vfolder_add_uri(CamelStore *store, const char *uri, int remove);
-
-/* note that a folder has changed name (uri) */
-void mail_vfolder_rename_uri(CamelStore *store, const char *from, const char *to);
-
-/* remove a uri that should be removed from vfolders permanently */
-void mail_vfolder_delete_uri(CamelStore *store, const char *uri);
-
-/* close up, clean up */
-void mail_vfolder_shutdown (void);
-
-#endif
diff --git a/mail/mail.h b/mail/mail.h
deleted file mode 100644
index 082403d173..0000000000
--- a/mail/mail.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Copyright 2000, Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/* This file is a F*CKING MESS.  Shame to us!  */
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include "mail-accounts.h"
-#include "mail-account-editor.h"
-#include "mail-callbacks.h"
-#include "mail-config.h"
-#include "mail-config-druid.h"
-#include "mail-display-stream.h"
-#include "mail-session.h"
-#include "mail-types.h"
-
-extern char *evolution_dir;
-
-/* mail-identify */
-char *mail_identify_mime_part (CamelMimePart *part, MailDisplay *md);
-
-/* component factory for lack of a better place */
-void mail_add_storage (CamelStore *store, const char *name, const char *uri);
-void mail_load_storage_by_uri (GNOME_Evolution_Shell shell, const char *uri, const char *name);
-/*takes a GSList of MailConfigServices */
-void mail_load_storages (GNOME_Evolution_Shell shell, const GSList *sources);
-
-void mail_hash_storage (CamelService *store, EvolutionStorage *storage);
-EvolutionStorage *mail_lookup_storage (CamelStore *store);
-void mail_remove_storage_by_uri (const char *uri);
-void mail_remove_storage (CamelStore *store);
-void mail_storages_foreach (GHFunc func, gpointer data);
-int  mail_storages_count (void);
-
-gboolean evolution_folder_info_factory_init (void);
-
diff --git a/mail/main.c b/mail/main.c
deleted file mode 100644
index b2f146ce68..0000000000
--- a/mail/main.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * main.c: The core of the mail component
- *
- * Author:
- *   Miguel de Icaza (miguel@ximian.com)
- *
- * (C) 2000 Ximian, Inc.
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-
-#include 
-#include 
-
-#include "e-util/e-passwords.h"
-#include "e-util/e-proxy.h"
-
-#include "component-factory.h"
-#include "composer/evolution-composer.h"
-#include "mail.h"
-#include "mail-mt.h"
-
-/*#define DO_MCHECK*/
-
-#ifdef DO_MCHECK
-static int blowup(int status)
-{
-	switch(status) {
-	case 1:
-		printf("Double free failure\n");
-		break;
-	case 2:
-		printf("Memory clobbered before block\n");
-		break;
-	case 3:
-		printf("Memory clobbered after block\n");
-		break;
-	}
-	abort();
-	return status;
-}
-#endif
-
-/* The GNOME SEGV handler will lose if it's not run from the main Gtk
- * thread. So if we crash in another thread, redirect the signal.
- */
-static void (*gnome_segv_handler) (int);
-
-static GStaticMutex segv_mutex = G_STATIC_MUTEX_INIT;
-
-static void
-segv_redirect (int sig)
-{
-	if (pthread_self () == mail_gui_thread)
-		gnome_segv_handler (sig);
-	else {
-		pthread_kill (mail_gui_thread, sig);
-		/* We can't return from the signal handler or the
-		 * thread may SEGV again. But we can't pthread_exit,
-		 * because then the thread may get cleaned up before
-		 * bug-buddy can get a stack trace. So we block by
-		 * trying to lock a mutex we know is already locked.
-		 */
-		g_static_mutex_lock (&segv_mutex);
-	}
-}
-
-int
-main (int argc, char *argv [])
-{
-	CORBA_ORB orb;
-	struct sigaction sa, osa;
-
-        /* used to make elfence work */                                         
-	free(malloc (10));
-#ifdef DO_MCHECK                                                                
-        /*mtrace();*/                                                           
-        mcheck(blowup);                                                         
-#endif                                                                          
-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
-	textdomain (PACKAGE);
-
-	g_thread_init (NULL);
-
-	gnome_init_with_popt_table ("evolution-mail-component", VERSION,
-				    argc, argv, bonobo_activation_popt_options, 0, NULL);
-	
-	sigaction (SIGSEGV, NULL, &osa);
-	if (osa.sa_handler != SIG_DFL) {
-		sa.sa_flags = 0;
-		sigemptyset (&sa.sa_mask);
-		sa.sa_handler = segv_redirect;
-		sigaction (SIGSEGV, &sa, NULL);
-		sigaction (SIGBUS, &sa, NULL);
-		sigaction (SIGFPE, &sa, NULL);
-		
-		sa.sa_handler = SIG_IGN;
-		sigaction (SIGXFSZ, &sa, NULL);
-		gnome_segv_handler = osa.sa_handler;
-		g_static_mutex_lock (&segv_mutex);
-	}
-	
-	if (!bonobo_init (&argc, argv)) {
-		g_error ("Mail component could not initialize Bonobo.\n"
-			 "If there was a warning message about the "
-			 "RootPOA, it probably means\nyou compiled "
-			 "Bonobo against GOAD instead of Bonobo Activation.");
-	}
-	
-	gconf_init (argc, argv, NULL);
-	
-	glade_gnome_init ();
-	
-	gnome_vfs_init ();
-	
-	e_cursors_init ();
-	
-	e_proxy_init ();
-	
-	mail_config_init ();
-	mail_msg_init ();
-	
-	gnome_sound_init ("localhost");
-	
-	component_factory_init ();
-	evolution_composer_factory_init (composer_send_cb, composer_save_draft_cb);
-	
-	if (gdk_threads_mutex) {
-		g_mutex_free (gdk_threads_mutex);
-		gdk_threads_mutex = NULL;
-	}
-	
-	g_print ("Evolution Mail ready and running.\n");
-	
-	GDK_THREADS_ENTER ();
-	bonobo_main ();
-	
-	mail_msg_cleanup();
-	
-	GDK_THREADS_LEAVE ();
-	
-	mail_config_write_on_exit ();
-	
-	e_passwords_shutdown ();
-	
-	gnome_sound_shutdown ();
-	
-	return 0;
-}
diff --git a/mail/message-browser.c b/mail/message-browser.c
deleted file mode 100644
index 5a9c74fc6e..0000000000
--- a/mail/message-browser.c
+++ /dev/null
@@ -1,363 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast 
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-#include "message-browser.h"
-
-#include "mail.h"
-#include "mail-callbacks.h"
-#include "mail-tools.h"
-#include "message-list.h"
-#include "mail-ops.h"
-#include "mail-vfolder.h"
-#include "mail-autofilter.h"
-#include "mail-mt.h"
-
-#include "mail-local.h"
-#include "mail-config.h"
-
-#include "folder-browser-ui.h"
-
-#define d(x) 
-
-#define MINIMUM_WIDTH  600
-#define MINIMUM_HEIGHT 400
-
-#define PARENT_TYPE BONOBO_TYPE_WINDOW
-
-/* Size of the window last time it was changed.  */
-static GtkAllocation last_allocation = { 0, 0 };
-
-static BonoboWindowClass *message_browser_parent_class;
-
-static void
-message_browser_destroy (GtkObject *object)
-{
-	MessageBrowser *message_browser;
-	
-	message_browser = MESSAGE_BROWSER (object);
-	
-	if (message_browser->fb) {
-		g_signal_handlers_disconnect_matched(message_browser->fb, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, message_browser);
-		g_object_unref((message_browser->fb));
-		message_browser->fb = NULL;
-	}
-	
-	if (GTK_OBJECT_CLASS (message_browser_parent_class)->destroy)
-		(GTK_OBJECT_CLASS (message_browser_parent_class)->destroy) (object);
-}
-
-static void
-message_browser_class_init (GObjectClass *object_class)
-{
-	((GtkObjectClass *)object_class)->destroy = message_browser_destroy;
-	
-	message_browser_parent_class = g_type_class_ref(PARENT_TYPE);
-}
-
-static void
-message_browser_init (GtkObject *object)
-{
-	
-}
-
-static void
-transfer_msg_done (gboolean ok, void *data)
-{
-	MessageBrowser *mb = data;
-	gboolean hide_deleted;
-	GConfClient *gconf;
-	int row;
-	
-#warning "GTK_OBJECT_DESTROYED"
-	/*if (ok && !GTK_OBJECT_DESTROYED (mb)) {*/
-	if (ok) {
-		gconf = gconf_client_get_default ();
-		hide_deleted = !gconf_client_get_bool (gconf, "/apps/evolution/mail/display/show_deleted", NULL);
-		
-		row = e_tree_row_of_node (mb->fb->message_list->tree,
-					  e_tree_get_cursor (mb->fb->message_list->tree));
-		
-		/* If this is the last message and deleted messages
-                   are hidden, select the previous */
-		if ((row + 1 == e_tree_row_count (mb->fb->message_list->tree)) && hide_deleted)
-			message_list_select (mb->fb->message_list, MESSAGE_LIST_SELECT_PREVIOUS,
-					     0, CAMEL_MESSAGE_DELETED, FALSE);
-		else
-			message_list_select (mb->fb->message_list, MESSAGE_LIST_SELECT_NEXT,
-					     0, 0, FALSE);
-	}
-	
-	g_object_unref (mb);
-}
-
-static void
-transfer_msg (MessageBrowser *mb, int del)
-{
-	const char *allowed_types[] = { "mail/*", "vtrash", NULL };
-	extern EvolutionShellClient *global_shell_client;
-	GNOME_Evolution_Folder *folder;
-	static char *last_uri = NULL;
-	GPtrArray *uids;
-	char *desc;
-
-/*	if (GTK_OBJECT_DESTROYED(mb))
-	return;*/
-	
-	if (last_uri == NULL)
-		last_uri = g_strdup ("");
-	
-	if (del)
-		desc = _("Move message(s) to");
-	else
-		desc = _("Copy message(s) to");
-	
-	evolution_shell_client_user_select_folder (global_shell_client,
-						   GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (mb))),
-						   desc, last_uri, allowed_types, &folder);
-	if (!folder)
-		return;
-	
-	if (strcmp (last_uri, folder->evolutionUri) != 0) {
-		g_free (last_uri);
-		last_uri = g_strdup (folder->evolutionUri);
-	}
-	
-	uids = g_ptr_array_new ();
-	message_list_foreach (mb->fb->message_list, enumerate_msg, uids);
-	
-	if (del) {
-		g_object_ref((mb));
-		mail_transfer_messages (mb->fb->folder, uids, del,
-					folder->physicalUri, 0, transfer_msg_done, mb);
-	} else {
-		mail_transfer_messages (mb->fb->folder, uids, del,
-					folder->physicalUri, 0, NULL, NULL);
-	}
-	
-	CORBA_free (folder);
-}
-
-
-/* UI callbacks */
-
-static void
-message_browser_close (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	gtk_widget_destroy (GTK_WIDGET (user_data));
-}
-
-static void
-message_browser_move (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	transfer_msg(user_data, TRUE);
-}
-
-static void
-message_browser_copy (BonoboUIComponent *uih, void *user_data, const char *path)
-{
-	transfer_msg(user_data, FALSE);
-}
-
-static BonoboUIVerb 
-browser_verbs [] = {
-	BONOBO_UI_UNSAFE_VERB ("MessageBrowserClose", message_browser_close),
-	BONOBO_UI_UNSAFE_VERB ("MessageMove", message_browser_move),
-	BONOBO_UI_UNSAFE_VERB ("MessageCopy", message_browser_copy),
-	BONOBO_UI_VERB_END
-};
-
-/* FB message loading hookups */
-
-static void
-message_browser_message_loaded (FolderBrowser *fb, const char *uid, MessageBrowser *mb)
-{
-	CamelMimeMessage *message;
-	char *subject = NULL;
-	char *title;
-	
-	folder_browser_ui_message_loaded(fb);
-	
-	message = fb->mail_display->current_message;
-	
-	if (message)
-		subject = (char *) camel_mime_message_get_subject (message);
-	
-	if (subject == NULL)
-		subject = _("(No subject)");
-	
-	title = g_strdup_printf (_("%s - Message"), subject);
-	
-	gtk_window_set_title (GTK_WINDOW (mb), title);
-	
-	g_free (title);
-}
-
-static void
-message_browser_message_list_built (MessageList *ml, MessageBrowser *mb)
-{
-	const char *uid = g_object_get_data (G_OBJECT (mb), "uid");
-
-	g_signal_handlers_disconnect_matched(mb->fb, G_SIGNAL_MATCH_DATA|G_SIGNAL_MATCH_FUNC, 0, 0, NULL,
-					     message_browser_message_list_built, mb);
-	message_list_select_uid (ml, uid);
-}
-
-static void
-message_browser_folder_loaded (FolderBrowser *fb, const char *uri, MessageBrowser *mb)
-{
-	g_signal_connect(fb->message_list, "message_list_built",
-			 G_CALLBACK(message_browser_message_list_built), mb);
-}
-
-static void
-message_browser_size_allocate_cb (GtkWidget *widget,
-				  GtkAllocation *allocation)
-{
-	last_allocation = *allocation;
-}
-
-/* Construction */
-
-static void
-set_default_size (GtkWidget *widget)
-{
-	int width, height;
-	
-	width  = MAX (MINIMUM_WIDTH, last_allocation.width);
-	height = MAX (MINIMUM_HEIGHT, last_allocation.height);
-	
-	gtk_window_set_default_size (GTK_WINDOW (widget), width, height);
-}
-
-static void 
-set_bonobo_ui (GtkWidget *widget, FolderBrowser *fb)
-{
-	BonoboUIContainer *uicont;
-	BonoboUIComponent *uic;
-	CORBA_Environment ev;
-
-	uicont = bonobo_window_get_ui_container(BONOBO_WINDOW(widget));
-
-	uic = bonobo_ui_component_new_default ();
-	bonobo_ui_component_set_container (uic, BONOBO_OBJREF (uicont), NULL);
-	folder_browser_set_ui_component (fb, uic);
-
-	/* Load our UI */
-
-	/*bonobo_ui_component_freeze (uic, NULL);*/
-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, "evolution-mail-messagedisplay.xml", "evolution-mail", NULL);
-
-	/* Load the appropriate UI stuff from the folder browser */
-
-	folder_browser_ui_add_message (fb);
-
-	/* We just opened the message! We don't need to open it again. */
-
-	CORBA_exception_init (&ev);
-	/* remove the broken menus and toolbar items */
-	bonobo_ui_component_rm (uic, "/menu/File/FileOps/MessageOpen", &ev);
-	bonobo_ui_component_rm (uic, "/menu/Actions/ComponentActionsPlaceholder/MailMessageActions/GoTo", &ev);
-	bonobo_ui_component_rm (uic, "/menu/Tools", &ev);
-	bonobo_ui_component_rm (uic, "/Toolbar/MailNextButtons", &ev);
-	CORBA_exception_free (&ev);
-
-	/* Hack around the move/copy commands api's */
-	bonobo_ui_component_remove_listener (uic, "MessageCopy");
-	bonobo_ui_component_remove_listener (uic, "MessageMove");
-
-	/* Add the Close & Move/Copy items */
-
-	bonobo_ui_component_add_verb_list_with_data (uic, browser_verbs, widget);
-
-	/* Done */
-
-	/*bonobo_ui_component_thaw (uic, NULL);*/
-}
-
-GtkWidget *
-message_browser_new (const GNOME_Evolution_Shell shell, const char *uri, const char *uid)
-{
-	GtkWidget *vbox;
-	MessageBrowser *new;
-	FolderBrowser *fb;
-	
-	new = g_object_new (MESSAGE_BROWSER_TYPE,
-			    "title", "Ximian Evolution", NULL);
-	if (!new) {
-		g_warning ("Failed to construct Bonobo window!");
-		return NULL;
-	}
-	
-	g_object_set_data_full(G_OBJECT(new), "uid", g_strdup (uid), g_free);
-	
-	fb = FOLDER_BROWSER (folder_browser_new (shell, uri));
-	g_object_ref(fb);
-	gtk_object_sink((GtkObject *)fb);
-
-	new->fb = fb;
-	
-	set_bonobo_ui (GTK_WIDGET (new), fb);
-	
-	/* some evil hackery action... */
-	vbox = gtk_vbox_new (TRUE, 0);
-	gtk_widget_ref (GTK_WIDGET (fb->mail_display));
-	gtk_widget_reparent (GTK_WIDGET (fb->mail_display), vbox);
-	/* Note: normally we'd unref the fb->mail_display now, except
-           that if we do then our refcounts will not be in
-           harmony... both the fb *and* the message-browser need to
-           own a ref on the mail_display. */
-	gtk_widget_show (GTK_WIDGET (fb->mail_display));
-	gtk_widget_show (vbox);
-	
-	g_signal_connect(new, "size_allocate", 
-			 G_CALLBACK (message_browser_size_allocate_cb), NULL);
-	
-	bonobo_window_set_contents (BONOBO_WINDOW (new), vbox);
-	gtk_widget_grab_focus (GTK_WIDGET (MAIL_DISPLAY (fb->mail_display)->html));
-	
-	set_default_size (GTK_WIDGET (new));
-	
-	/* more evil hackery... */
-	g_signal_connect(fb, "folder_loaded", G_CALLBACK(message_browser_folder_loaded), new);
-	g_signal_connect(fb, "message_loaded", G_CALLBACK(message_browser_message_loaded), new);
-	
-	return GTK_WIDGET (new);
-}
-
-/* Fin */
-
-E_MAKE_TYPE (message_browser, "MessageBrowser", MessageBrowser, message_browser_class_init,
-	     message_browser_init, PARENT_TYPE);
diff --git a/mail/message-browser.h b/mail/message-browser.h
deleted file mode 100644
index ebd50c07bc..0000000000
--- a/mail/message-browser.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast 
- *
- *  Copyright 2001 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef _MESSAGE_BROWSER_H_
-#define _MESSAGE_BROWSER_H_
-
-#include 
-#include 
-
-#include 
-#include "folder-browser.h"
-#include "mail-display.h"
-#include "mail-types.h"
-
-#define MESSAGE_BROWSER_TYPE        (message_browser_get_type ())
-#define MESSAGE_BROWSER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), MESSAGE_BROWSER_TYPE, MessageBrowser))
-#define MESSAGE_BROWSER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), MESSAGE_BROWSER_TYPE, MessageBrowserClass))
-#define IS_MESSAGE_BROWSER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), MESSAGE_BROWSER_TYPE))
-#define IS_MESSAGE_BROWSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MESSAGE_BROWSER_TYPE))
-
-struct _MessageBrowser {
-	BonoboWindow parent;
-	
-	/*
-	 * The current URI being displayed by the MessageBrowser
-	 */
-	FolderBrowser *fb;
-};
-
-
-typedef struct {
-	BonoboWindowClass parent_class;
-	
-} MessageBrowserClass;
-
-GtkType    message_browser_get_type (void);
-
-GtkWidget *message_browser_new      (const GNOME_Evolution_Shell shell,
-				     const char *uri, const char *uid);
-
-#endif /* _MESSAGE_BROWSER_H_ */
-
diff --git a/mail/message-list.c b/mail/message-list.c
deleted file mode 100644
index 522a9a11c9..0000000000
--- a/mail/message-list.c
+++ /dev/null
@@ -1,2862 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Miguel de Icaza (miguel@ximian.com)
- *           Bertrand Guiheneuf (bg@aful.org)
- *           And just about everyone else in evolution ...
- *
- *  Copyright 2000-2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-
-#include 
-
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "filter/filter-label.h"
-
-#include "mail-config.h"
-#include "message-list.h"
-#include "mail-mt.h"
-#include "mail-tools.h"
-#include "mail-ops.h"
-
-#include "art/mail-new.xpm"
-#include "art/mail-read.xpm"
-#include "art/mail-replied.xpm"
-#include "art/attachment.xpm"
-#include "art/priority-high.xpm"
-#include "art/empty.xpm"
-#include "art/score-lowest.xpm"
-#include "art/score-lower.xpm"
-#include "art/score-low.xpm"
-#include "art/score-normal.xpm"
-#include "art/score-high.xpm"
-#include "art/score-higher.xpm"
-#include "art/score-highest.xpm"
-#include "art/flag-for-followup.xpm"
-
-/*#define TIMEIT */
-
-#ifdef TIMEIT
-#include 
-#include 
-#endif
-
-#define d(x)
-#define t(x)
-
-/*
- * Default sizes for the ETable display
- *
- */
-#define N_CHARS(x) (CHAR_WIDTH * (x))
-
-#define COL_ICON_WIDTH         (16)
-#define COL_ATTACH_WIDTH       (16)
-#define COL_CHECK_BOX_WIDTH    (16)
-#define COL_FROM_EXPANSION     (24.0)
-#define COL_FROM_WIDTH_MIN     (32)
-#define COL_SUBJECT_EXPANSION  (30.0)
-#define COL_SUBJECT_WIDTH_MIN  (32)
-#define COL_SENT_EXPANSION     (24.0)
-#define COL_SENT_WIDTH_MIN     (32)
-#define COL_RECEIVED_EXPANSION (20.0)
-#define COL_RECEIVED_WIDTH_MIN (32)
-#define COL_TO_EXPANSION       (24.0)
-#define COL_TO_WIDTH_MIN       (32)
-#define COL_SIZE_EXPANSION     (6.0)
-#define COL_SIZE_WIDTH_MIN     (32)
-
-enum {
-	NORMALISED_SUBJECT,
-	NORMALISED_FROM,
-	NORMALISED_TO,
-	NORMALISED_LAST,
-};
-
-#define PARENT_TYPE (e_tree_scrolled_get_type ())
-
-/* #define SMART_ADDRESS_COMPARE */
-
-#ifdef SMART_ADDRESS_COMPARE
-struct _EMailAddress {
-	ENameWestern *wname;
-	char *address;
-};
-
-typedef struct _EMailAddress EMailAddress;
-#endif /* SMART_ADDRESS_COMPARE */
-
-static ETreeScrolledClass *message_list_parent_class;
-
-static void on_cursor_activated_cmd (ETree *tree, int row, ETreePath path, gpointer user_data);
-static gint on_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, MessageList *list);
-static char *filter_date (time_t date);
-static char *filter_size (int size);
-
-static void folder_changed (CamelObject *o, gpointer event_data, gpointer user_data);
-static void message_changed (CamelObject *o, gpointer event_data, gpointer user_data);
-
-static void hide_save_state(MessageList *ml);
-static void hide_load_state(MessageList *ml);
-
-/* note: @changes is owned/freed by the caller */
-/*static void mail_do_regenerate_messagelist (MessageList *list, const char *search, const char *hideexpr, CamelFolderChangeInfo *changes);*/
-static void mail_regen_list(MessageList *ml, const char *search, const char *hideexpr, CamelFolderChangeInfo *changes);
-
-static void clear_info(char *key, ETreePath *node, MessageList *ml);
-
-enum {
-	MESSAGE_SELECTED,
-	MESSAGE_LIST_BUILT,
-	LAST_SIGNAL
-};
-
-static guint message_list_signals [LAST_SIGNAL] = {0, };
-
-static struct {
-	char **image_base;
-	GdkPixbuf  *pixbuf;
-} states_pixmaps [] = {
-	{ mail_new_xpm,		NULL },
-	{ mail_read_xpm,	NULL },
-	{ mail_replied_xpm,	NULL },
-/* FIXME: Replace these with pixmaps for multiple_read and multiple_unread */
-    	{ mail_new_xpm,		NULL },
-    	{ mail_read_xpm,	NULL },
-	{ empty_xpm,		NULL },
-	{ attachment_xpm,	NULL },
-	{ priority_high_xpm,	NULL },
-	{ score_lowest_xpm,     NULL },
-	{ score_lower_xpm,      NULL },
-	{ score_low_xpm,        NULL },
-	{ score_normal_xpm,     NULL },
-	{ score_high_xpm,       NULL },
-	{ score_higher_xpm,     NULL },
-	{ score_highest_xpm,    NULL },
-	{ flag_for_followup_xpm,NULL },
-	{ NULL,			NULL }
-};
-
-#ifdef SMART_ADDRESS_COMPARE
-static EMailAddress *
-e_mail_address_new (const char *address)
-{
-	CamelInternetAddress *cia;
-	EMailAddress *new;
-	const char *name = NULL, *addr = NULL;
-	
-	cia = camel_internet_address_new ();
-	if (camel_address_unformat (CAMEL_ADDRESS (cia), address) == -1) {
-		camel_object_unref (cia);
-		return NULL;
-	}
-	camel_internet_address_get (cia, 0, &name, &addr);
-	
-	new = g_new (EMailAddress, 1);
-	new->address = g_strdup (addr);
-	if (name && *name) {
-		new->wname = e_name_western_parse (name);
-	} else {
-		new->wname = NULL;
-	}
-	
-	camel_object_unref (cia);
-	
-	return new;
-}
-
-static void
-e_mail_address_free (EMailAddress *addr)
-{
-	g_return_if_fail (addr != NULL);
-	
-	g_free (addr->address);
-	if (addr->wname)
-		e_name_western_free (addr->wname);
-	g_free (addr);
-}
-
-/* Note: by the time this function is called, the strings have already
-   been normalised which means we can assume all lowercase chars and
-   we can just use strcmp for the final comparison. */
-static int
-e_mail_address_compare (gconstpointer address1, gconstpointer address2)
-{
-	const EMailAddress *addr1 = address1;
-	const EMailAddress *addr2 = address2;
-	int retval;
-	
-	g_return_val_if_fail (addr1 != NULL, 1);
-	g_return_val_if_fail (addr2 != NULL, -1);
-	
-	if (!addr1->wname && !addr2->wname) {
-		/* have to compare addresses, one or both don't have names */
-		g_return_val_if_fail (addr1->address != NULL, 1);
-		g_return_val_if_fail (addr2->address != NULL, -1);
-		
-		return strcmp (addr1->address, addr2->address);
-	}
-	
-	if (!addr1->wname)
-		return -1;
-	if (!addr2->wname)
-		return 1;
-	
-	if (!addr1->wname->last && !addr2->wname->last) {
-		/* neither has a last name - default to address? */
-		/* FIXME: what do we compare next? */
-		g_return_val_if_fail (addr1->address != NULL, 1);
-		g_return_val_if_fail (addr2->address != NULL, -1);
-		
-		return strcmp (addr1->address, addr2->address);
-	}
-	
-	if (!addr1->wname->last)
-		return -1;
-	if (!addr2->wname->last)
-		return 1;
-	
-	retval = strcmp (addr1->wname->last, addr2->wname->last);
-	if (retval)
-		return retval;
-	
-	/* last names are identical - compare first names */
-	
-	if (!addr1->wname->first && !addr2->wname->first)
-		return strcmp (addr1->address, addr2->address);
-	
-	if (!addr1->wname->first)
-		return -1;
-	if (!addr2->wname->first)
-		return 1;
-	
-	retval = strcmp (addr1->wname->first, addr2->wname->first);
-	if (retval)
-		return retval;
-	
-	return strcmp (addr1->address, addr2->address);
-}
-#endif /* SMART_ADDRESS_COMPARE */
-
-/* Note: by the time this function is called, the strings have already
-   been normalised which means we can assume all lowercase chars and
-   we can just use strcmp for the final comparison. */
-static int
-address_compare (gconstpointer address1, gconstpointer address2)
-{
-#ifdef SMART_ADDRESS_COMPARE
-	EMailAddress *addr1, *addr2;
-#endif /* SMART_ADDRESS_COMPARE */
-	int retval;
-	
-	g_return_val_if_fail (address1 != NULL, 1);
-	g_return_val_if_fail (address2 != NULL, -1);
-	
-#ifdef SMART_ADDRESS_COMPARE
-	addr1 = e_mail_address_new (address1);
-	addr2 = e_mail_address_new (address2);
-	retval = e_mail_address_compare (addr1, addr2);
-	e_mail_address_free (addr1);
-	e_mail_address_free (addr2);
-#else
-	retval = strcmp ((const char *) address1, (const char *) address2);
-#endif /* SMART_ADDRESS_COMPARE */
-	
-	return retval;
-}
-
-static char *
-filter_size (gint size)
-{
-	gfloat fsize;
-	
-	if (size < 1024) {
-		return g_strdup_printf ("%d", size);
-	} else {
-		fsize = ((gfloat) size) / 1024.0;
-		if (fsize < 1024.0) {
-			return g_strdup_printf ("%.2f K", fsize);
-		} else {
-			fsize /= 1024.0;
-			return g_strdup_printf ("%.2f M", fsize);
-		}
-	}
-}
-
-/* Gets the uid of the message displayed at a given view row */
-static const char *
-get_message_uid (MessageList *message_list, ETreePath node)
-{
-	CamelMessageInfo *info;
-	
-	g_assert (node != NULL);
-	info = e_tree_memory_node_get_data (E_TREE_MEMORY (message_list->model), node);
-	/* correct me if I'm wrong, but this should never be NULL, should it? */
-	g_assert (info != NULL);
-	
-	return camel_message_info_uid (info);
-}
-
-/* Gets the CamelMessageInfo for the message displayed at the given
- * view row.
- */
-static CamelMessageInfo *
-get_message_info (MessageList *message_list, ETreePath node)
-{
-	CamelMessageInfo *info;
-	
-	g_assert (node != NULL);
-	info = e_tree_memory_node_get_data (E_TREE_MEMORY (message_list->model), node);
-	g_assert (info != NULL);
-	
-	return info;
-}
-
-static const char *
-get_normalised_string (MessageList *message_list, CamelMessageInfo *info, int col)
-{
-	const char *string, *str;
-	char *normalised;
-	EPoolv *poolv;
-	int index;
-	
-	switch (col) {
-	case COL_SUBJECT_NORM:
-		string = camel_message_info_subject (info);
-		index = NORMALISED_SUBJECT;
-		break;
-	case COL_FROM_NORM:
-		string = camel_message_info_from (info);
-		index = NORMALISED_FROM;
-		break;
-	case COL_TO_NORM:
-		string = camel_message_info_to (info);
-		index = NORMALISED_TO;
-		break;
-	default:
-		string = NULL;
-		index = NORMALISED_LAST;
-		g_assert_not_reached ();
-	}
-	
-	/* slight optimisation */
-	if (string == NULL || string[0] == '\0')
-		return "";
-	
-	poolv = g_hash_table_lookup (message_list->normalised_hash, camel_message_info_uid (info));
-	if (poolv == NULL) {
-		poolv = e_poolv_new (NORMALISED_LAST);
-		g_hash_table_insert (message_list->normalised_hash, (char *) camel_message_info_uid (info), poolv);
-	} else {
-		str = e_poolv_get (poolv, index);
-		if (*str)
-			return str;
-	}
-	
-	if (col == COL_SUBJECT_NORM) {
-		const unsigned char *subject;
-		
-		subject = (const unsigned char *) string;
-		while (!g_ascii_strncasecmp (subject, "Re:", 3)) {
-			subject += 3;
-			
-			/* jump over any spaces */
-			while (*subject && isspace ((int) *subject))
-				subject++;
-		}
-		
-		/* jump over any spaces */
-		while (*subject && isspace ((int) *subject))
-			subject++;
-		
-		string = (const char *) subject;
-	}
-	
-	normalised = g_utf8_collate_key (string, -1);
-	e_poolv_set (poolv, index, normalised, TRUE);
-
-	return e_poolv_get (poolv, index);
-}
-
-struct search_func_data {
-	MessageList *message_list;
-	guint32 flags;
-	guint32 mask;
-};
-
-static gboolean
-search_func (ETreeModel *model, ETreePath path, struct search_func_data *data)
-{
-	CamelMessageInfo *info;
-
-	if (e_tree_model_node_is_root (data->message_list->model, path))
-		return FALSE;
-
-	info = get_message_info (data->message_list, path);
-	
-	if (info && (info->flags & data->mask) == data->flags) {
-		if (data->message_list->cursor_uid) {
-			g_free (data->message_list->cursor_uid);
-			data->message_list->cursor_uid = g_strdup (camel_message_info_uid (info));
-		}
-		g_signal_emit (GTK_OBJECT (data->message_list), message_list_signals[MESSAGE_SELECTED], 0,
-			       camel_message_info_uid (info));
-		return TRUE;
-	}
-	return FALSE;
-}
-
-
-/**
- * message_list_select:
- * @message_list: a MessageList
- * @base_row: the (model) row to start from
- * @direction: the direction to search in
- * @flags: a set of flag values
- * @mask: a mask for comparing against @flags
- * @wraparound: if %TRUE, go back to the beginning for 
- *     the next match if necessary.
- *
- * This moves the message list selection to a suitable row. @base_row
- * lists the first (model) row to try, but as a special case, model
- * row -1 is mapped to the last row. @flags and @mask combine to specify
- * what constitutes a suitable row. @direction is
- * %MESSAGE_LIST_SELECT_NEXT if it should find the next matching
- * message, or %MESSAGE_LIST_SELECT_PREVIOUS if it should find the
- * previous. If no suitable row is found, the selection will be
- * unchanged.
- *
- * Returns %TRUE if a new message has been selected or %FALSE otherwise.
- **/
-gboolean
-message_list_select (MessageList               *message_list,
-		     MessageListSelectDirection direction,
-		     guint32                    flags,
-		     guint32                    mask,
-		     gboolean                   wraparound)
-{
-	struct search_func_data data;
-	ETreeFindNextParams params = 0;
-	
-	data.message_list = message_list;
-	data.flags = flags;
-	data.mask = mask;
-	
-	if (direction == MESSAGE_LIST_SELECT_NEXT)
-		params |= E_TREE_FIND_NEXT_FORWARD;
-	else
-		params |= E_TREE_FIND_NEXT_BACKWARD;
-	
-	if (wraparound)
-		params |= E_TREE_FIND_NEXT_WRAP;
-	
-	return e_tree_find_next (message_list->tree, params, (ETreePathFunc) search_func, &data);
-}
-
-
-/**
- * message_list_select_uid:
- * @message_list:
- * @uid:
- *
- * Selects the message with the given UID.
- **/
-void
-message_list_select_uid (MessageList *message_list, const char *uid)
-{
-	ETreePath node;
-	
-	node = g_hash_table_lookup (message_list->uid_nodemap, uid);
-	if (node) {
-		CamelMessageInfo *info;
-		
-		info = get_message_info (message_list, node);
-		e_tree_set_cursor (message_list->tree, node);
-		
-		g_free (message_list->cursor_uid);
-		message_list->cursor_uid = g_strdup (camel_message_info_uid (info));
-		
-		g_signal_emit (GTK_OBJECT (message_list), message_list_signals[MESSAGE_SELECTED], 0,
-				 camel_message_info_uid (info));
-	} else {
-		g_free (message_list->cursor_uid);
-		message_list->cursor_uid = NULL;
-		g_signal_emit (GTK_OBJECT (message_list), message_list_signals[MESSAGE_SELECTED], 0, NULL);
-	}
-}
-
-
-void
-message_list_select_next_thread (MessageList *message_list)
-{
-	ETreePath node, last;
-	
-	if (!message_list->cursor_uid)
-		return;
-	
-	/* get the thread parent node */
-	last = node = g_hash_table_lookup (message_list->uid_nodemap, message_list->cursor_uid);
-	while (!e_tree_model_node_is_root (message_list->model, node)) {
-		last = node;
-		node = e_tree_model_node_get_parent (message_list->model, node);
-	}
-	
-	/* get the next toplevel node */
-	node = e_tree_model_node_get_next (message_list->model, last);
-	
-	if (node) {
-		CamelMessageInfo *info;
-		
-		info = get_message_info (message_list, node);
-		e_tree_set_cursor (message_list->tree, node);
-		
-		g_free (message_list->cursor_uid);
-		message_list->cursor_uid = g_strdup (camel_message_info_uid (info));
-		
-		g_signal_emit (GTK_OBJECT (message_list), message_list_signals[MESSAGE_SELECTED], 0,
-			       camel_message_info_uid (info));
-	}
-}
-
-
-/*
- * SimpleTableModel::col_count
- */
-static int
-ml_column_count (ETreeModel *etm, void *data)
-{
-	return COL_LAST;
-}
-
-/*
- * SimpleTableModel::has_save_id
- */
-static gboolean
-ml_has_save_id (ETreeModel *etm, void *data)
-{
-	return TRUE;
-}
-
-/*
- * SimpleTableModel::get_save_id
- */
-static char *
-ml_get_save_id (ETreeModel *etm, ETreePath path, void *data)
-{
-	CamelMessageInfo *info;
-
-	info = e_tree_memory_node_get_data (E_TREE_MEMORY(etm), path);
-	if (info == NULL)
-		return g_strdup("root");
-	return g_strdup (camel_message_info_uid(info));
-}
-
-/*
- * SimpleTableModel::has_save_id
- */
-static gboolean
-ml_has_get_node_by_id (ETreeModel *etm, void *data)
-{
-	return TRUE;
-}
-
-/*
- * SimpleTableModel::get_save_id
- */
-static ETreePath
-ml_get_node_by_id (ETreeModel *etm, const char *save_id, void *data)
-{
-	MessageList *ml;
-
-	ml = data;
-
-	if (!strcmp (save_id, "root"))
-		return e_tree_model_get_root (etm);
-
-	return g_hash_table_lookup(ml->uid_nodemap, save_id);
-}
-
-static void *
-ml_duplicate_value (ETreeModel *etm, int col, const void *value, void *data)
-{
-	switch (col){
-	case COL_MESSAGE_STATUS:
-	case COL_FLAGGED:
-	case COL_SCORE:
-	case COL_ATTACHMENT:
-	case COL_DELETED:
-	case COL_UNREAD:
-	case COL_SENT:
-	case COL_RECEIVED:
-	case COL_SIZE:
-	case COL_FOLLOWUP_FLAG_STATUS:
-	case COL_FOLLOWUP_DUE_BY:
-		return (void *) value;
-		
-	case COL_FROM:
-	case COL_SUBJECT:
-	case COL_TO:
-	case COL_FOLLOWUP_FLAG:
-	case COL_LOCATION:
-		return g_strdup (value);
-		
-	default:
-		g_assert_not_reached ();
-	}
-	return NULL;
-}
-
-static void
-ml_free_value (ETreeModel *etm, int col, void *value, void *data)
-{
-	switch (col){
-	case COL_MESSAGE_STATUS:
-	case COL_FLAGGED:
-	case COL_SCORE:
-	case COL_ATTACHMENT:
-	case COL_DELETED:
-	case COL_UNREAD:
-	case COL_SENT:
-	case COL_RECEIVED:
-	case COL_SIZE:
-	case COL_FOLLOWUP_FLAG_STATUS:
-	case COL_FOLLOWUP_DUE_BY:
-		break;
-		
-	case COL_FROM:
-	case COL_SUBJECT:
-	case COL_TO:
-	case COL_FOLLOWUP_FLAG:
-	case COL_LOCATION:
-		g_free (value);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-static void *
-ml_initialize_value (ETreeModel *etm, int col, void *data)
-{
-	switch (col){
-	case COL_MESSAGE_STATUS:
-	case COL_FLAGGED:
-	case COL_SCORE:
-	case COL_ATTACHMENT:
-	case COL_DELETED:
-	case COL_UNREAD:
-	case COL_SENT:
-	case COL_RECEIVED:
-	case COL_SIZE:
-	case COL_FOLLOWUP_FLAG_STATUS:
-	case COL_FOLLOWUP_DUE_BY:
-		return NULL;
-		
-	case COL_FROM:
-	case COL_SUBJECT:
-	case COL_TO:
-	case COL_FOLLOWUP_FLAG:
-	case COL_LOCATION:
-		return g_strdup ("");
-	default:
-		g_assert_not_reached ();
-	}
-
-	return NULL;
-}
-
-static gboolean
-ml_value_is_empty (ETreeModel *etm, int col, const void *value, void *data)
-{
-	switch (col){
-	case COL_MESSAGE_STATUS:
-	case COL_FLAGGED:
-	case COL_SCORE:
-	case COL_ATTACHMENT:
-	case COL_DELETED:
-	case COL_UNREAD:
-	case COL_SENT:
-	case COL_RECEIVED:
-	case COL_SIZE:
-	case COL_FOLLOWUP_FLAG_STATUS:
-	case COL_FOLLOWUP_DUE_BY:
-		return value == NULL;
-		
-	case COL_FROM:
-	case COL_SUBJECT:
-	case COL_TO:
-	case COL_FOLLOWUP_FLAG:
-	case COL_LOCATION:
-		return !(value && *(char *)value);
-	default:
-		g_assert_not_reached ();
-		return FALSE;
-	}
-}
-
-static const char *status_map[] = {
-	N_("Unseen"),
-	N_("Seen"),
-	N_("Answered"),
-	N_("Multiple Unseen Messages"),
-	N_("Multiple Messages"),
-};
-
-static const char *score_map[] = {
-	N_("Lowest"),
-	N_("Lower"),
-	N_("Low"),
-	N_("Normal"),
-	N_("High"),
-	N_("Higher"),
-	N_("Highest"),
-};
-
-
-static char *
-ml_value_to_string (ETreeModel *etm, int col, const void *value, void *data)
-{
-	unsigned int i;
-	
-	switch (col){
-	case COL_MESSAGE_STATUS:
-		i = (unsigned int)value;
-		if (i > 4)
-			return g_strdup ("");
-		return g_strdup (_(status_map[i]));
-		
-	case COL_SCORE:
-		i = (unsigned int) value + 3;
-		if (i > 6)
-			i = 3;
-		return g_strdup (_(score_map[i]));
-		
-	case COL_ATTACHMENT:
-	case COL_FLAGGED:
-	case COL_DELETED:
-	case COL_UNREAD:
-	case COL_FOLLOWUP_FLAG_STATUS:
-		return g_strdup_printf ("%d", (int) value);
-		
-	case COL_SENT:
-	case COL_RECEIVED:
-	case COL_FOLLOWUP_DUE_BY:
-		return filter_date (GPOINTER_TO_INT (value));
-		
-	case COL_SIZE:
-		return filter_size (GPOINTER_TO_INT (value));
-		
-	case COL_FROM:
-	case COL_SUBJECT:
-	case COL_TO:
-	case COL_FOLLOWUP_FLAG:
-	case COL_LOCATION:
-		return g_strdup (value);
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-static GdkPixbuf *
-ml_tree_icon_at (ETreeModel *etm, ETreePath path, void *model_data)
-{
-	/* we dont really need an icon ... */
-	return NULL;
-}
-
-/* return true if there are any unread messages in the subtree */
-static int
-subtree_unread(MessageList *ml, ETreePath node)
-{
-	CamelMessageInfo *info;
-	ETreePath child;
-	
-	while (node) {
-		info = e_tree_memory_node_get_data((ETreeMemory *)ml->model, node);
-		g_assert(info);
-		
-		if (!(info->flags & CAMEL_MESSAGE_SEEN))
-			return TRUE;
-		
-		if ((child = e_tree_model_node_get_first_child (E_TREE_MODEL (ml->model), node)))
-			if (subtree_unread(ml, child))
-				return TRUE;
-		node = e_tree_model_node_get_next (ml->model, node);
-	}
-	return FALSE;
-}
-
-static int
-subtree_size(MessageList *ml, ETreePath node)
-{
-	CamelMessageInfo *info;
-	int size = 0;
-	ETreePath child;
-	
-	while (node) {
-		info = e_tree_memory_node_get_data((ETreeMemory *)ml->model, node);
-		g_assert(info);
-		
-		size += info->size;
-		if ((child = e_tree_model_node_get_first_child (E_TREE_MODEL (ml->model), node)))
-			size += subtree_size(ml, child);
-		
-		node = e_tree_model_node_get_next (ml->model, node);
-	}
-	return size;
-}
-
-static time_t
-subtree_earliest(MessageList *ml, ETreePath node, int sent)
-{
-	CamelMessageInfo *info;
-	time_t earliest = 0, date;
-	ETreePath *child;
-	
-	while (node) {
-		info = e_tree_memory_node_get_data((ETreeMemory *)ml->model, node);
-		g_assert(info);
-		
-		if (sent)
-			date = info->date_sent;
-		else
-			date = info->date_received;
-		
-		if (earliest == 0 || date < earliest)
-			earliest = date;
-		
-		if ((child = e_tree_model_node_get_first_child (ml->model, node))) {
-			date = subtree_earliest(ml, child, sent);
-			if (earliest == 0 || (date != 0 && date < earliest))
-				earliest = date;
-		}
-		
-		node = e_tree_model_node_get_next (ml->model, node);
-	}
-	
-	return earliest;
-}
-
-static void *
-ml_tree_value_at (ETreeModel *etm, ETreePath path, int col, void *model_data)
-{
-	MessageList *message_list = model_data;
-	CamelMessageInfo *msg_info;
-	
-	/* retrieve the message information array */
-	msg_info = e_tree_memory_node_get_data (E_TREE_MEMORY(etm), path);
-	if (!msg_info)
-		return NULL;
-	
-	switch (col){
-	case COL_MESSAGE_STATUS: {
-		ETreePath child;
-		
-		/* if a tree is collapsed, then scan its insides for details */
-		child = e_tree_model_node_get_first_child(etm, path);
-		if (child && !e_tree_node_is_expanded(message_list->tree, path)) {
-			if (subtree_unread(message_list, child))
-				return (void *)3;
-			else
-				return (void *)4;
-		}
-		
-		if (msg_info->flags & CAMEL_MESSAGE_ANSWERED)
-			return GINT_TO_POINTER (2);
-		else if (msg_info->flags & CAMEL_MESSAGE_SEEN)
-			return GINT_TO_POINTER (1);
-		else
-			return GINT_TO_POINTER (0);
-		break;
-	}
-	case COL_FLAGGED:
-		return GINT_TO_POINTER ((msg_info->flags & CAMEL_MESSAGE_FLAGGED) != 0);
-	case COL_SCORE: {
-		const char *tag;
-		int score = 0;
-		
-		tag = camel_tag_get ((CamelTag **) &msg_info->user_tags, "score");
-		if (tag)
-			score = atoi (tag);
-		
-		return GINT_TO_POINTER (score);
-	}
-	case COL_FOLLOWUP_FLAG_STATUS: {
-		const char *tag;
-		
-		tag = camel_tag_get ((CamelTag **) &msg_info->user_tags, "follow-up");
-		if (tag && *tag)
-			return GINT_TO_POINTER (TRUE);
-		else
-			return GINT_TO_POINTER (FALSE);
-	}
-	case COL_FOLLOWUP_DUE_BY: {
-		const char *tag;
-		time_t due_by;
-		
-		tag = camel_tag_get ((CamelTag **) &msg_info->user_tags, "due-by");
-		if (tag && *tag) {
-			due_by = header_decode_date (tag, NULL);
-			return GINT_TO_POINTER (due_by);
-		} else {
-			return GINT_TO_POINTER (0);
-		}
-	}
-	case COL_FOLLOWUP_FLAG:
-		return (void *) camel_tag_get ((CamelTag **) &msg_info->user_tags, "follow-up");
-	case COL_ATTACHMENT:
-		return GINT_TO_POINTER ((msg_info->flags & CAMEL_MESSAGE_ATTACHMENTS) != 0);
-	case COL_FROM:
-		return (void *)camel_message_info_from(msg_info);
-	case COL_FROM_NORM:
-		return (void *)get_normalised_string (message_list, msg_info, col);
-	case COL_SUBJECT:
-		return (void *)camel_message_info_subject(msg_info);
-	case COL_SUBJECT_NORM:
-		return (void *)get_normalised_string (message_list, msg_info, col);
-	case COL_SENT:
-		return GINT_TO_POINTER (msg_info->date_sent);
-	case COL_RECEIVED:
-		return GINT_TO_POINTER (msg_info->date_received);
-	case COL_TO:
-		return (void *)camel_message_info_to(msg_info);
-	case COL_TO_NORM:
-		return (void *)get_normalised_string (message_list, msg_info, col);
-	case COL_SIZE:
-		return GINT_TO_POINTER (msg_info->size);
-	case COL_DELETED:
-		return GINT_TO_POINTER ((msg_info->flags & CAMEL_MESSAGE_DELETED) != 0);
-	case COL_UNREAD: {
-		ETreePath child;
-		
-		child = e_tree_model_node_get_first_child(etm, path);
-		if (child && !e_tree_node_is_expanded(message_list->tree, path)
-		    && (msg_info->flags & CAMEL_MESSAGE_SEEN)) {
-			return GINT_TO_POINTER (subtree_unread (message_list, child));
-		}
-		
-		return GINT_TO_POINTER (!(msg_info->flags & CAMEL_MESSAGE_SEEN));
-	}
-	case COL_COLOUR: {
-		const char *colour, *due_by, *completed, *label;
-		
-		/* Priority: colour tag; label tag; important flag; due-by tag */
-		
-		colour = camel_tag_get ((CamelTag **) &msg_info->user_tags, "colour");
-		due_by = camel_tag_get ((CamelTag **) &msg_info->user_tags, "due-by");
-		completed = camel_tag_get ((CamelTag **) &msg_info->user_tags, "completed-on");
-		label = camel_tag_get ((CamelTag **) &msg_info->user_tags, "label");
-		if (colour == NULL) {
-			if (label != NULL) {
-				colour = mail_config_get_label_color_string (filter_label_index (label));
-			} else if (msg_info->flags & CAMEL_MESSAGE_FLAGGED) {
-				/* FIXME: extract from the xpm somehow. */
-				colour = "#A7453E";
-			} else if ((due_by && *due_by) && !(completed && *completed)) {
-				time_t now = time (NULL);
-				time_t target_date;
-				
-				target_date = header_decode_date (due_by, NULL);
-				if (now >= target_date) {
-					/* FIXME: extract from the xpm somehow. */
-					colour = "#A7453E";
-				}
-			}
-		}
-		return (void *) colour;
-	}
-	case COL_LOCATION: {
-		CamelFolder *folder;
-		char *name;
-
-		if (CAMEL_IS_VEE_FOLDER(message_list->folder)) {
-			folder = camel_vee_folder_get_location((CamelVeeFolder *)message_list->folder, (CamelVeeMessageInfo *)msg_info, NULL);
-		} else {
-			folder = message_list->folder;
-		}
-
-		camel_object_get(folder, NULL, CAMEL_OBJECT_DESCRIPTION, &name, 0);
-		return name;
-	}
-	default:
-		g_assert_not_reached ();
-		return NULL;
-	}
-}
-
-static void
-ml_tree_set_value_at (ETreeModel *etm, ETreePath path, int col,
-		      const void *val, void *model_data)
-{
-	g_assert_not_reached ();
-}
-
-static gboolean
-ml_tree_is_cell_editable (ETreeModel *etm, ETreePath path, int col, void *model_data)
-{
-	return FALSE;
-}
-
-static void
-message_list_init_images (void)
-{
-	int i;
-	
-	/*
-	 * Only load once, and share
-	 */
-	if (states_pixmaps [0].pixbuf)
-		return;
-	
-	for (i = 0; states_pixmaps [i].image_base; i++){
-		states_pixmaps [i].pixbuf = gdk_pixbuf_new_from_xpm_data (
-			(const char **) states_pixmaps [i].image_base);
-	}
-}
-
-static char *
-filter_date (time_t date)
-{
-	time_t nowdate = time(NULL);
-	time_t yesdate;
-	struct tm then, now, yesterday;
-	char buf[26];
-	gboolean done = FALSE;
-	
-	if (date == 0)
-		return g_strdup (_("?"));
-	
-	localtime_r (&date, &then);
-	localtime_r (&nowdate, &now);
-	if (then.tm_mday == now.tm_mday &&
-	    then.tm_mon == now.tm_mon &&
-	    then.tm_year == now.tm_year) {
-		e_strftime_fix_am_pm (buf, 26, _("Today %l:%M %p"), &then);
-		done = TRUE;
-	}
-	if (!done) {
-		yesdate = nowdate - 60 * 60 * 24;
-		localtime_r (&yesdate, &yesterday);
-		if (then.tm_mday == yesterday.tm_mday &&
-		    then.tm_mon == yesterday.tm_mon &&
-		    then.tm_year == yesterday.tm_year) {
-			e_strftime_fix_am_pm (buf, 26, _("Yesterday %l:%M %p"), &then);
-			done = TRUE;
-		}
-	}
-	if (!done) {
-		int i;
-		for (i = 2; i < 7; i++) {
-			yesdate = nowdate - 60 * 60 * 24 * i;
-			localtime_r (&yesdate, &yesterday);
-			if (then.tm_mday == yesterday.tm_mday &&
-			    then.tm_mon == yesterday.tm_mon &&
-			    then.tm_year == yesterday.tm_year) {
-				e_strftime_fix_am_pm (buf, 26, _("%a %l:%M %p"), &then);
-				done = TRUE;
-				break;
-			}
-		}
-	}
-	if (!done) {
-		if (then.tm_year == now.tm_year) {
-			e_strftime_fix_am_pm (buf, 26, _("%b %d %l:%M %p"), &then);
-		} else {
-			e_strftime_fix_am_pm (buf, 26, _("%b %d %Y"), &then);
-		}
-	}
-#if 0
-#ifdef CTIME_R_THREE_ARGS
-	ctime_r (&date, buf, 26);
-#else
-	ctime_r (&date, buf);
-#endif
-#endif
-
-	return g_strdup (buf);
-}
-
-static ETableExtras *
-message_list_create_extras (void)
-{
-	int i;
-	GdkPixbuf *images [7];
-	ETableExtras *extras;
-	ECell *cell;
-	
-	extras = e_table_extras_new ();
-	e_table_extras_add_pixbuf (extras, "status", states_pixmaps [0].pixbuf);
-	e_table_extras_add_pixbuf (extras, "score", states_pixmaps [13].pixbuf);
-	e_table_extras_add_pixbuf (extras, "attachment", states_pixmaps [6].pixbuf);
-	e_table_extras_add_pixbuf (extras, "flagged", states_pixmaps [7].pixbuf);
-	e_table_extras_add_pixbuf (extras, "followup", states_pixmaps [15].pixbuf);
-	
-	e_table_extras_add_compare (extras, "address_compare", address_compare);
-	
-	for (i = 0; i < 5; i++)
-		images [i] = states_pixmaps [i].pixbuf;
-	
-	e_table_extras_add_cell (extras, "render_message_status", e_cell_toggle_new (0, 5, images));
-	
-	for (i = 0; i < 2; i++)
-		images [i] = states_pixmaps [i + 5].pixbuf;
-	
-	e_table_extras_add_cell (extras, "render_attachment", e_cell_toggle_new (0, 2, images));
-	
-	images [1] = states_pixmaps [7].pixbuf;
-	e_table_extras_add_cell (extras, "render_flagged", e_cell_toggle_new (0, 2, images));
-	
-	images[1] = states_pixmaps [15].pixbuf;
-	e_table_extras_add_cell (extras, "render_flag_status", e_cell_toggle_new (0, 2, images));
-	
-	for (i = 0; i < 7; i++)
-		images[i] = states_pixmaps [i + 7].pixbuf;
-	
-	e_table_extras_add_cell (extras, "render_score", e_cell_toggle_new (0, 7, images));
-	
-	/* date cell */
-	cell = e_cell_date_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "bold_column", COL_UNREAD,
-		      "color_column", COL_COLOUR,
-		      NULL);
-	e_table_extras_add_cell (extras, "render_date", cell);
-	
-	/* text cell */
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	g_object_set (G_OBJECT (cell),
-		      "bold_column", COL_UNREAD,
-		      "color_column", COL_COLOUR,
-		      NULL);
-	e_table_extras_add_cell (extras, "render_text", cell);
-	
-	e_table_extras_add_cell (extras, "render_tree", 
-				 e_cell_tree_new (NULL, NULL, /* let the tree renderer default the pixmaps */
-						  TRUE, cell));
-	
-	/* size cell */
-	cell = e_cell_size_new (NULL, GTK_JUSTIFY_RIGHT);
-	g_object_set (G_OBJECT (cell),
-		      "bold_column", COL_UNREAD,
-		      "color_column", COL_COLOUR,
-		      NULL);
-	e_table_extras_add_cell (extras, "render_size", cell);
-
-	return extras;
-}
-
-static void
-save_tree_state(MessageList *ml)
-{
-	char *filename;
-
-	if (ml->folder == NULL || ml->tree == NULL)
-		return;
-
-	filename = mail_config_folder_to_cachename(ml->folder, "et-expanded-");
-	e_tree_save_expanded_state(ml->tree, filename);
-	g_free(filename);
-}
-
-static void
-message_list_setup_etree (MessageList *message_list, gboolean outgoing)
-{
-	/* build the spec based on the folder, and possibly from a saved file */
-	/* otherwise, leave default */
-	if (message_list->folder) {
-		char *path;
-		char *name;
-		struct stat st;
-
-		g_object_set (message_list->tree,
-			      "uniform_row_height", TRUE,
-			      NULL);
-		
-		name = camel_service_get_name (CAMEL_SERVICE (message_list->folder->parent_store), TRUE);
-		d(printf ("folder name is '%s'\n", name));
-		
-		path = mail_config_folder_to_cachename (message_list->folder, "et-expanded-");
-		if (path && stat (path, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) {
-			/* build based on saved file */
-			e_tree_load_expanded_state (message_list->tree, path);
-		}
-		g_free (path);
-		
-		g_free (name);
-	}
-}
-
-/*
- * GtkObject::init
- */
-static void
-message_list_init (GtkObject *object)
-{
-	MessageList *message_list = MESSAGE_LIST (object);
-
-	e_scroll_frame_set_policy (E_SCROLL_FRAME (message_list),
-				   GTK_POLICY_NEVER,
-				   GTK_POLICY_ALWAYS);
-	
-	message_list->normalised_hash = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	message_list->hidden = NULL;
-	message_list->hidden_pool = NULL;
-	message_list->hide_before = ML_HIDE_NONE_START;
-	message_list->hide_after = ML_HIDE_NONE_END;
-	
-	message_list->search = NULL;
-	
-	message_list->hide_lock = g_mutex_new();
-	
-	message_list->uid_nodemap = g_hash_table_new (g_str_hash, g_str_equal);
-	message_list->async_event = mail_async_event_new();
-}
-
-static void
-normalised_free (gpointer key, gpointer value, gpointer user_data)
-{
-	e_poolv_destroy (value);
-}
-
-static void
-message_list_destroy(GtkObject *object)
-{
-	MessageList *message_list = MESSAGE_LIST (object);
-
-	if (message_list->async_event) {
-		mail_async_event_destroy(message_list->async_event);
-		message_list->async_event = NULL;
-	}
-
-	if (message_list->folder) {
-		/* need to do this before removing folder, folderinfo's might not exist after */
-		if (message_list->uid_nodemap) {
-			g_hash_table_foreach(message_list->uid_nodemap, (GHFunc)clear_info, message_list);
-			g_hash_table_destroy (message_list->uid_nodemap);
-		}
-
-		save_tree_state(message_list);
-		hide_save_state(message_list);
-		camel_object_unhook_event(message_list->folder, "folder_changed", folder_changed, message_list);
-		camel_object_unhook_event(message_list->folder, "message_changed", message_changed, message_list);
-		camel_object_unref (message_list->folder);
-		message_list->folder = NULL;
-	}
-
-	if (message_list->extras) {
-		g_object_unref((message_list->extras));
-		message_list->extras = NULL;
-	}
-
-	if (message_list->model) {
-		g_object_unref((message_list->model));
-		message_list->model = NULL;
-	}
-
-	if (message_list->idle_id != 0) {
-		g_source_remove (message_list->idle_id);
-		message_list->idle_id = 0;
-	}
-
-	if (message_list->seen_id) {
-		g_source_remove (message_list->seen_id);
-		message_list->seen_id = 0;
-	}
-
-	GTK_OBJECT_CLASS (message_list_parent_class)->destroy(object);
-}
-
-static void
-message_list_finalise (GObject *object)
-{
-	MessageList *message_list = MESSAGE_LIST (object);
-	
-	g_hash_table_foreach (message_list->normalised_hash, normalised_free, NULL);
-	g_hash_table_destroy (message_list->normalised_hash);
-	
-	if (message_list->thread_tree)
-		camel_folder_thread_messages_unref(message_list->thread_tree);
-
-	if (message_list->hidden) {
-		g_hash_table_destroy(message_list->hidden);
-		e_mempool_destroy(message_list->hidden_pool);
-		message_list->hidden = NULL;
-		message_list->hidden_pool = NULL;
-	}
-
-	g_free(message_list->cursor_uid);
-
-	g_mutex_free(message_list->hide_lock);
-
-	G_OBJECT_CLASS (message_list_parent_class)->finalize (object);
-}
-
-/*
- * GtkObjectClass::init
- */
-static void
-message_list_class_init (GObjectClass *object_class)
-{
-	message_list_parent_class = g_type_class_ref(PARENT_TYPE);
-
-	object_class->finalize = message_list_finalise;
-	((GtkObjectClass *)object_class)->destroy = message_list_destroy;
-
-	message_list_signals[MESSAGE_SELECTED] =
-		g_signal_new ("message_selected",
-			      MESSAGE_LIST_TYPE,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (MessageListClass, message_selected),
-			      NULL,
-			      NULL,
-			      g_cclosure_marshal_VOID__STRING,
-			      G_TYPE_NONE, 1, G_TYPE_STRING);
-	
-	message_list_signals[MESSAGE_LIST_BUILT] =
-		g_signal_new ("message_list_built",
-			      MESSAGE_LIST_TYPE,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (MessageListClass, message_list_built),
-			      NULL,
-			      NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	message_list_init_images ();
-}
-
-static void
-message_list_construct (MessageList *message_list)
-{
-	gboolean construct_failed;
-	message_list->model =
-		e_tree_memory_callbacks_new (ml_tree_icon_at,
-					     
-					     ml_column_count,
-					     
-					     ml_has_save_id,
-					     ml_get_save_id,
-					     
-					     ml_has_get_node_by_id,
-					     ml_get_node_by_id,
-					     
-					     ml_tree_value_at,
-					     ml_tree_set_value_at,
-					     ml_tree_is_cell_editable,
-					     
-					     ml_duplicate_value,
-					     ml_free_value,
-					     ml_initialize_value,
-					     ml_value_is_empty,
-					     ml_value_to_string,
-					     
-					     message_list);
-	
-	e_tree_memory_set_expanded_default(E_TREE_MEMORY(message_list->model), TRUE);
-	
-	/*
-	 * The etree
-	 */
-	message_list->extras = message_list_create_extras ();
-	construct_failed = (e_tree_scrolled_construct_from_spec_file (E_TREE_SCROLLED (message_list),
-								      message_list->model,
-								      message_list->extras, 
-								      EVOLUTION_ETSPECDIR "/message-list.etspec",
-								      NULL)
-			    == NULL);
-
-	message_list->tree = e_tree_scrolled_get_tree(E_TREE_SCROLLED (message_list));
-	if (!construct_failed)
-		e_tree_root_node_set_visible (message_list->tree, FALSE);
-
-	g_signal_connect((message_list->tree), "cursor_activated",
-			 G_CALLBACK (on_cursor_activated_cmd),
-			 message_list);
-	
-	g_signal_connect((message_list->tree), "click",
-			 G_CALLBACK (on_click), message_list);
-}
-
-GtkWidget *
-message_list_new (void)
-{
-	MessageList *message_list;
-
-	message_list = MESSAGE_LIST (g_object_new(message_list_get_type (),
-						  "hadjustment", NULL,
-						  "vadjustment", NULL,
-						  NULL));
-	message_list_construct (message_list);
-
-	return GTK_WIDGET (message_list);
-}
-
-static void
-clear_info(char *key, ETreePath *node, MessageList *ml)
-{
-	CamelMessageInfo *info;
-
-	info = e_tree_memory_node_get_data((ETreeMemory *)ml->model, node);
-	camel_folder_free_message_info(ml->folder, info);
-}
-
-static void
-clear_tree (MessageList *ml)
-{
-	ETreeModel *etm = ml->model;
-
-#ifdef TIMEIT
-	struct timeval start, end;
-	unsigned long diff;
-
-	printf("Clearing tree\n");
-	gettimeofday(&start, NULL);
-#endif
-
-	/* we also reset the uid_rowmap since it is no longer useful/valid anyway */
-	if (ml->folder)
-		g_hash_table_foreach (ml->uid_nodemap, (GHFunc)clear_info, ml);
-	g_hash_table_destroy (ml->uid_nodemap);
-	ml->uid_nodemap = g_hash_table_new (g_str_hash, g_str_equal);
-	
-	if (ml->tree_root) {
-		/* we should be frozen already */
-		e_tree_memory_node_remove (E_TREE_MEMORY(etm), ml->tree_root);
-	}
-
-	ml->tree_root = e_tree_memory_node_insert (E_TREE_MEMORY(etm), NULL, 0, NULL);
-
-#ifdef TIMEIT
-	gettimeofday(&end, NULL);
-	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;
-	printf("Clearing tree took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
-#endif
-
-}
-
-/* we try and find something that isn't deleted in our tree
-   there is actually no assurance that we'll find somethign that will
-   still be there next time, but its probably going to work most of the time */
-static char *
-find_next_undeleted (MessageList *ml)
-{
-	ETreePath node;
-	int last;
-	int vrow;
-	ETree *et = ml->tree;
-	CamelMessageInfo *info;
-	
-	node = g_hash_table_lookup (ml->uid_nodemap, ml->cursor_uid);
-	if (node == NULL)
-		return NULL;
-	
-	info = get_message_info (ml, node);
-	if (info && (info->flags & CAMEL_MESSAGE_DELETED) == 0) {
-		return NULL;
-	}
-
-	last = e_tree_row_count (ml->tree);
-
-	/* model_to_view_row etc simply dont work for sorted views.  Sigh. */
-	vrow = e_tree_row_of_node (et, node);
-
-	/* We already checked this node. */
-	vrow ++;
-
-	while (vrow < last) {
-		CamelMessageInfo *info;
-
-		node = e_tree_node_at_row (et, vrow);
-		info = get_message_info (ml, node);
-		if (info && (info->flags & CAMEL_MESSAGE_DELETED) == 0) {
-			return g_strdup (camel_message_info_uid (info));
-		}
-		vrow ++;
-	}
-
-	return NULL;
-}
-
-/* only call if we have a tree model */
-/* builds the tree structure */
-static void build_subtree (MessageList *ml, ETreePath parent, CamelFolderThreadNode *c, int *row);
-
-static void build_subtree_diff (MessageList *ml, ETreePath parent, ETreePath path, CamelFolderThreadNode *c, int *row);
-
-static void
-build_tree (MessageList *ml, CamelFolderThread *thread, CamelFolderChangeInfo *changes)
-{
-	int row = 0;
-	ETreeModel *etm = ml->model;
-	ETreePath *top;
-	char *saveuid = NULL;
-
-#ifdef TIMEIT
-	struct timeval start, end;
-	unsigned long diff;
-
-	printf("Building tree\n");
-	gettimeofday(&start, NULL);
-#endif
-
-#ifdef TIMEIT
-	gettimeofday(&end, NULL);
-	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;
-	printf("Loading tree state took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
-#endif
-
-	if (ml->tree_root == NULL) {
-		ml->tree_root =	e_tree_memory_node_insert(E_TREE_MEMORY(etm), NULL, 0, NULL);
-	}
-
-	if (ml->cursor_uid) {
-		if (ml->hidedeleted) {
-			saveuid = find_next_undeleted(ml);
-		}
-	}
-
-#define BROKEN_ETREE	/* avoid some broken code in etree(?) by not using the incremental update */
-
-	top = e_tree_model_node_get_first_child(etm, ml->tree_root);
-#ifndef BROKEN_ETREE
-	if (top == NULL || changes == NULL) {
-#endif
-		e_tree_memory_freeze(E_TREE_MEMORY(etm));
-		clear_tree (ml);
-
-		build_subtree(ml, ml->tree_root, thread->tree, &row);
-
-		e_tree_memory_thaw(E_TREE_MEMORY(etm));
-#ifndef BROKEN_ETREE
-	} else {
-		static int tree_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp);
-
-		build_subtree_diff(ml, ml->tree_root, top,  thread->tree, &row);
-		top = e_tree_model_node_get_first_child(etm, ml->tree_root);
-		tree_equal(ml->model, top, thread->tree);
-	}
-#endif
-
-	if (saveuid) {
-		ETreePath *node = g_hash_table_lookup(ml->uid_nodemap, saveuid);
-		if (node == NULL) {
-			g_free(ml->cursor_uid);
-			ml->cursor_uid = NULL;
-			gtk_signal_emit((GtkObject *)ml, message_list_signals[MESSAGE_SELECTED], NULL);
-		} else {
-			e_tree_set_cursor(ml->tree, node);
-		}
-		g_free(saveuid);
-	} else if (ml->cursor_uid && !g_hash_table_lookup(ml->uid_nodemap, ml->cursor_uid)) {
-		g_free(ml->cursor_uid);
-		ml->cursor_uid = NULL;
-		gtk_signal_emit((GtkObject *)ml, message_list_signals[MESSAGE_SELECTED], NULL);
-	}
-	
-#ifdef TIMEIT
-	gettimeofday(&end, NULL);
-	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;
-	printf("Building tree took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
-#endif
-}
-
-/* this is about 20% faster than build_subtree_diff,
-   entirely because e_tree_model_node_insert(xx, -1 xx)
-   is faster than inserting to the right row :( */
-/* Otherwise, this code would probably go as it does the same thing essentially */
-static void
-build_subtree (MessageList *ml, ETreePath parent, CamelFolderThreadNode *c, int *row)
-{
-	ETreeModel *tree = ml->model;
-	ETreePath node;
-
-	while (c) {
-		/* phantom nodes no longer allowed */
-		g_assert(c->message);
-
-		node = e_tree_memory_node_insert(E_TREE_MEMORY(tree), parent, -1, (void *)c->message);
-		g_hash_table_insert(ml->uid_nodemap, (void *)camel_message_info_uid(c->message), node);
-		camel_folder_ref_message_info(ml->folder, (CamelMessageInfo *)c->message);
-
-		if (c->child) {
-			build_subtree(ml, node, c->child, row);
-		}
-		c = c->next;
-	}
-}
-
-/* compares a thread tree node with the etable tree node to see if they point to
-   the same object */
-static int
-node_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp)
-{
-	CamelMessageInfo *info;
-
-	info = e_tree_memory_node_get_data(E_TREE_MEMORY(etm), ap);
-
-	if (bp->message && strcmp(camel_message_info_uid(info), camel_message_info_uid(bp->message))==0)
-		return 1;
-
-	return 0;
-}
-
-#ifndef BROKEN_ETREE
-/* debug function - compare the two trees to see if they are the same */
-static int
-tree_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp)
-{
-	CamelMessageInfo *info;
-
-	while (ap && bp) {
-		if (!node_equal(etm, ap, bp)) {
-			g_warning("Nodes in tree differ");
-			info = e_tree_memory_node_get_data(E_TREE_MEMORY(etm), ap);
-			printf("table uid = %s\n", camel_message_info_uid(info));
-			printf("camel uid = %s\n", camel_message_info_uid(bp->message));
-			return FALSE;
-		} else {
-			if (!tree_equal(etm, e_tree_model_node_get_first_child(etm, ap), bp->child))
-				return FALSE;
-		}
-		bp = bp->next;
-		ap = e_tree_model_node_get_next(etm, ap);
-	}
-
-	if (ap || bp) {
-		g_warning("Tree differs, out of nodes in one branch");
-		if (ap) {
-			info = e_tree_memory_node_get_data(E_TREE_MEMORY(etm), ap);
-			if (info)
-				printf("table uid = %s\n", camel_message_info_uid(info));
-			else
-				printf("info is empty?\n");
-		}
-		if (bp) {
-			printf("camel uid = %s\n", camel_message_info_uid(bp->message));
-			return FALSE;
-		}
-		return FALSE;
-	}
-	return TRUE;
-}
-#endif
-
-/* adds a single node, retains save state, and handles adding children if required */
-static void
-add_node_diff(MessageList *ml, ETreePath parent, ETreePath path, CamelFolderThreadNode *c, int *row, int myrow)
-{
-	ETreeModel *etm = ml->model;
-	ETreePath node;
-
-	g_assert(c->message);
- 
-	/* we just update the hashtable key, umm, does this leak the info on the message node? */
-	g_hash_table_remove(ml->uid_nodemap, camel_message_info_uid(c->message));
-	node = e_tree_memory_node_insert(E_TREE_MEMORY(etm), parent, myrow, (void *)c->message);
-	g_hash_table_insert(ml->uid_nodemap, (void *)camel_message_info_uid(c->message), node);
-	camel_folder_ref_message_info(ml->folder, (CamelMessageInfo *)c->message);
-	(*row)++;
-
-	if (c->child) {
-		build_subtree_diff(ml, node, NULL, c->child, row);
-	}
-}
-
-/* removes node, children recursively and all associated data */
-static void
-remove_node_diff(MessageList *ml, ETreePath node, int depth)
-{
-	ETreeModel *etm = ml->model;
-	ETreePath cp, cn;
-	CamelMessageInfo *info;
-
-	t(printf("Removing node: %s\n", (char *)e_tree_memory_node_get_data(etm, node)));
-
-	/* we depth-first remove all node data's ... */
-	cp = e_tree_model_node_get_first_child(etm, node);
-	while (cp) {
-		cn = e_tree_model_node_get_next(etm, cp);
-		remove_node_diff(ml, cp, depth+1);
-		cp = cn;
-	}
-
-	/* and the rowid entry - if and only if it is referencing this node */
-	info = e_tree_memory_node_get_data(E_TREE_MEMORY (etm), node);
-
-	/* and only at the toplevel, remove the node (etree should optimise this remove somewhat) */
-	if (depth == 0)
-		e_tree_memory_node_remove(E_TREE_MEMORY(etm), node);
-
-	g_assert(info);
-	g_hash_table_remove(ml->uid_nodemap, camel_message_info_uid(info));
-	camel_folder_free_message_info(ml->folder, info);
-}
-
-/* applies a new tree structure to an existing tree, but only by changing things
-   that have changed */
-static void
-build_subtree_diff(MessageList *ml, ETreePath parent, ETreePath path, CamelFolderThreadNode *c, int *row)
-{
-	ETreeModel *etm = ml->model;
-	ETreePath ap, *ai, *at, *tmp;
-	CamelFolderThreadNode *bp, *bi, *bt;
-	int i, j, myrow = 0;
-
-	ap = path;
-	bp = c;
-
-	while (ap || bp) {
-		t(printf("Processing row: %d (subtree row %d)\n", *row, myrow));
-		if (ap == NULL) {
-			t(printf("out of old nodes\n"));
-			/* ran out of old nodes - remaining nodes are added */
-			add_node_diff(ml, parent, ap, bp, row, myrow);
-			myrow++;
-			bp = bp->next;
-		} else if (bp == NULL) {
-			t(printf("out of new nodes\n"));
-			/* ran out of new nodes - remaining nodes are removed */
-			tmp = e_tree_model_node_get_next(etm, ap);
-			remove_node_diff(ml, ap, 0);
-			ap = tmp;
-		} else if (node_equal(etm, ap, bp)) {
-			/*t(printf("nodes match, verify\n"));*/
-			/* matching nodes, verify details/children */
-#if 0
-			if (bp->message) {
-				char *olduid;
-				int oldrow;
-				/* if this is a message row, check/update the row id map */
-				if (g_hash_table_lookup_extended(ml->uid_rowmap, camel_message_info_uid(bp->message), (void *)&olduid, (void *)&oldrow)) {
-					if (oldrow != (*row)) {
-						g_hash_table_insert(ml->uid_rowmap, olduid, (void *)(*row));
-					}
-				} else {
-					g_warning("Cannot find uid %s in table?", camel_message_info_uid(bp->message));
-					/*g_assert_not_reached();*/
-				}
-			}
-#endif
-			*row = (*row)+1;
-			myrow++;
-			tmp = e_tree_model_node_get_first_child(etm, ap);
-			/* make child lists match (if either has one) */
-			if (bp->child || tmp) {
-				build_subtree_diff(ml, ap, tmp, bp->child, row);
-			}
-			ap = e_tree_model_node_get_next(etm, ap);
-			bp = bp->next;
-		} else {
-			t(printf("searching for matches\n"));
-			/* we have to scan each side for a match */
-			bi = bp->next;
-			ai = e_tree_model_node_get_next(etm, ap);
-			for (i=1;bi!=NULL;i++,bi=bi->next) {
-				if (node_equal(etm, ap, bi))
-					break;
-			}
-			for (j=1;ai!=NULL;j++,ai=e_tree_model_node_get_next(etm, ai)) {
-				if (node_equal(etm, ai, bp))
-					break;
-			}
-			if (inext;
-					}
-					bp = bi;
-				} else {
-					t(printf("adding new node 1\n"));
-					/* no match in new nodes, add one, try next */
-					add_node_diff(ml, parent, NULL, bp, row, myrow);
-					myrow++;
-					bp = bp->next;
-				}
-			} else {
-				/* bigger run of old nodes - must be nodes to remove */
-				if (ai) {
-					at = ap;
-					while (at != ai) {
-						t(printf("removing old node 0\n"));
-						tmp = e_tree_model_node_get_next(etm, at);
-						remove_node_diff(ml, at, 0);
-						at = tmp;
-					}
-					ap = ai;
-				} else {
-					t(printf("adding new node 2\n"));
-					/* didn't find match in old nodes, must be new node? */
-					add_node_diff(ml, parent, NULL, bp, row, myrow);
-					myrow++;
-					bp = bp->next;
-#if 0
-					tmp = e_tree_model_node_get_next(etm, ap);
-					remove_node_diff(etm, ap, 0);
-					ap = tmp;
-#endif
-				}
-			}
-		}
-	}
-}
-
-#ifndef BROKEN_ETREE
-static void build_flat_diff(MessageList *ml, CamelFolderChangeInfo *changes);
-#endif
-
-static void
-build_flat (MessageList *ml, GPtrArray *summary, CamelFolderChangeInfo *changes)
-{
-	ETreeModel *etm = ml->model;
-	ETreePath node;
-	char *saveuid = NULL;
-	int i;
-
-#ifdef TIMEIT
-	struct timeval start, end;
-	unsigned long diff;
-
-	printf("Building flat\n");
-	gettimeofday(&start, NULL);
-#endif
-
-	if (ml->cursor_uid) {
-		if (ml->hidedeleted) {
-			saveuid = find_next_undeleted(ml);
-		}
-	}
-
-#ifndef BROKEN_ETREE
-	if (changes) {
-		build_flat_diff(ml, changes);
-	} else {
-#endif
-		e_tree_memory_freeze(E_TREE_MEMORY(etm));
-		clear_tree (ml);
-		for (i = 0; i < summary->len; i++) {
-			CamelMessageInfo *info = summary->pdata[i];
-
-			node = e_tree_memory_node_insert(E_TREE_MEMORY(etm), ml->tree_root, -1, info);
-			g_hash_table_insert(ml->uid_nodemap, (void *)camel_message_info_uid(info), node);
-			camel_folder_ref_message_info(ml->folder, info);
-		}
-		e_tree_memory_thaw(E_TREE_MEMORY(etm));
-
-#ifndef BROKEN_ETREE
-	}
-#endif
-
-	if (saveuid) {
-		ETreePath *node = g_hash_table_lookup(ml->uid_nodemap, saveuid);
-		if (node == NULL) {
-			g_free(ml->cursor_uid);
-			ml->cursor_uid = NULL;
-			gtk_signal_emit((GtkObject *)ml, message_list_signals[MESSAGE_SELECTED], NULL);
-		} else {
-			e_tree_set_cursor(ml->tree, node);
-		}
-		g_free(saveuid);
-	}
-
-#ifdef TIMEIT
-	gettimeofday(&end, NULL);
-	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;
-	printf("Building flat took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
-#endif
-
-}
-
-static void
-message_list_change_first_visible_parent (MessageList *ml, ETreePath node)
-{
-	ETreePath first_visible = NULL;
-	
-	while (node && (node = e_tree_model_node_get_parent (ml->model, node))) {
-		if (!e_tree_node_is_expanded (ml->tree, node))
-			first_visible = node;
-	}
-	
-	if (first_visible != NULL) {
-		e_tree_model_pre_change (ml->model);
-		e_tree_model_node_data_changed (ml->model, first_visible);
-	}
-}
-
-#ifndef BROKEN_ETREE
-
-static void
-build_flat_diff(MessageList *ml, CamelFolderChangeInfo *changes)
-{
-	int i;
-	ETreePath node;
-	CamelMessageInfo *info;
-
-#ifdef TIMEIT
-	struct timeval start, end;
-	unsigned long diff;
-		
-	gettimeofday(&start, NULL);
-#endif
-
-	d(printf("updating changes to display\n"));
-
-	/* remove individual nodes? */
-	d(printf("Removing messages from view:\n"));
-	for (i=0;iuid_removed->len;i++) {
-		node = g_hash_table_lookup(ml->uid_nodemap, changes->uid_removed->pdata[i]);
-		if (node) {
-			info = e_tree_memory_node_get_data(E_TREE_MEMORY(ml->model), node);
-			e_tree_memory_node_remove(E_TREE_MEMORY(ml->model), node);
-			camel_folder_free_message_info(ml->folder, info);
-			g_hash_table_remove(ml->uid_nodemap, changes->uid_removed->pdata[i]);
-		}
-	}
-
-	/* add new nodes? - just append to the end */
-	d(printf("Adding messages to view:\n"));
-	for (i=0;iuid_added->len;i++) {
-		info = camel_folder_get_message_info (ml->folder, changes->uid_added->pdata[i]);
-		if (info) {
-			d(printf(" %s\n", (char *)changes->uid_added->pdata[i]));
-			node = e_tree_memory_node_insert (E_TREE_MEMORY (ml->model), ml->tree_root, -1, info);
-			g_hash_table_insert (ml->uid_nodemap, (void *)camel_message_info_uid (info), node);
-		}
-	}
-
-	/* and update changes too */
-	d(printf("Changing messages to view:\n"));
-	for (i = 0; i < changes->uid_changed->len; i++) {
-		ETreePath *node = g_hash_table_lookup (ml->uid_nodemap, changes->uid_changed->pdata[i]);
-		if (node) {
-			e_tree_model_pre_change (ml->model);
-			e_tree_model_node_data_changed (ml->model, node);
-			
-			message_list_change_first_visible_parent (ml, node)
-		}
-	}
-
-#ifdef TIMEIT
-	gettimeofday(&end, NULL);
-	diff = end.tv_sec * 1000 + end.tv_usec/1000;
-	diff -= start.tv_sec * 1000 + start.tv_usec/1000;
-	printf("Inserting changes took %ld.%03ld seconds\n", diff / 1000, diff % 1000);
-#endif
-
-}
-#endif /* ! BROKEN_ETREE */
-
-
-static void
-main_folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
-{
-	MessageList *ml = MESSAGE_LIST (user_data);
-	CamelFolderChangeInfo *changes = (CamelFolderChangeInfo *)event_data, *newchanges;
-	CamelMessageInfo *info;
-	CamelFolder *folder = (CamelFolder *)o;
-	int i;
-	
-	d(printf("folder changed event, changes = %p\n", changes));
-	if (changes) {
-		d(printf("changed = %d added = %d removed = %d\n",
-			 changes->uid_changed->len, changes->uid_added->len, changes->uid_removed->len));
-		
-		for (i = 0; i < changes->uid_removed->len; i++) {
-			/* uncache the normalised strings for these uids */
-			EPoolv *poolv;
-			
-			poolv = g_hash_table_lookup (ml->normalised_hash, changes->uid_removed->pdata[i]);
-			if (poolv != NULL) {
-				g_hash_table_remove (ml->normalised_hash, changes->uid_removed->pdata[i]);
-				e_poolv_destroy (poolv);
-			}
-		}
-		
-		/* check if the hidden state has changed, if so modify accordingly, then regenerate */
-		if (ml->hidedeleted) {
-			newchanges = camel_folder_change_info_new ();
-			
-			for (i = 0; i < changes->uid_changed->len; i++) {
-				ETreePath node = g_hash_table_lookup (ml->uid_nodemap, changes->uid_changed->pdata[i]);
-				
-				info = camel_folder_get_message_info (folder, changes->uid_changed->pdata[i]);
-				if (node != NULL && info != NULL && (info->flags & CAMEL_MESSAGE_DELETED) != 0) {
-					camel_folder_change_info_remove_uid (newchanges, changes->uid_changed->pdata[i]);
-				} else if (node == NULL && info != NULL && (info->flags & CAMEL_MESSAGE_DELETED) == 0) {
-					camel_folder_change_info_add_uid (newchanges, changes->uid_changed->pdata[i]);
-				} else {
-					camel_folder_change_info_change_uid (newchanges, changes->uid_changed->pdata[i]);
-				}
-				camel_folder_free_message_info (folder, info);
-			}
-			
-			if (newchanges->uid_added->len > 0 || newchanges->uid_removed->len > 0) {
-				for (i = 0; i < changes->uid_added->len; i++)
-					camel_folder_change_info_add_uid (newchanges, changes->uid_added->pdata[i]);
-				for (i = 0; i < changes->uid_removed->len; i++)
-					camel_folder_change_info_remove_uid (newchanges, changes->uid_removed->pdata[i]);
-				camel_folder_change_info_free (changes);
-				changes = newchanges;
-			} else {
-				camel_folder_change_info_free (newchanges);
-			}
-		}
-		
-		if (changes->uid_added->len == 0 && changes->uid_removed->len == 0 && changes->uid_changed->len < 100) {
-			for (i = 0; i < changes->uid_changed->len; i++) {
-				ETreePath node = g_hash_table_lookup (ml->uid_nodemap, changes->uid_changed->pdata[i]);
-				if (node) {
-					e_tree_model_pre_change (ml->model);
-					e_tree_model_node_data_changed (ml->model, node);
-					
-					message_list_change_first_visible_parent (ml, node);
-				}
-			}
-			
-			camel_folder_change_info_free (changes);
-			return;
-		}
-	}
-	
-	mail_regen_list (ml, ml->search, NULL, changes);
-}
-
-static void
-folder_changed (CamelObject *o, gpointer event_data, gpointer user_data)
-{
-	CamelFolderChangeInfo *changes;
-	MessageList *ml = MESSAGE_LIST (user_data);
-	
-	if (event_data) {
-		changes = camel_folder_change_info_new();
-		camel_folder_change_info_cat(changes, (CamelFolderChangeInfo *)event_data);
-	} else {
-		changes = NULL;
-	}
-	
-	mail_async_event_emit(ml->async_event, MAIL_ASYNC_GUI, (MailAsyncFunc)main_folder_changed, o, changes, user_data);
-}
-
-static void
-message_changed (CamelObject *o, gpointer event_data, gpointer user_data)
-{
-	CamelFolderChangeInfo *changes;
-	MessageList *ml = MESSAGE_LIST (user_data);
-
-	changes = camel_folder_change_info_new();
-	camel_folder_change_info_change_uid(changes, (char *)event_data);
-
-	mail_async_event_emit(ml->async_event, MAIL_ASYNC_GUI, (MailAsyncFunc)main_folder_changed, o, changes, user_data);
-}
-
-void
-message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder, gboolean outgoing)
-{
-	gboolean hide_deleted;
-	GConfClient *gconf;
-	CamelException ex;
-	
-	g_return_if_fail (message_list != NULL);
-	g_return_if_fail (IS_MESSAGE_LIST (message_list));
-	
-	if (message_list->folder == camel_folder)
-		return;
-	
-	camel_exception_init (&ex);
-	
-	/* cancel any outstanding regeneration requests */
-	if (message_list->regen) {
-		GList *l = message_list->regen;
-		
-		while (l) {
-			struct _mail_msg *mm = l->data;
-
-			if (mm->cancel)
-				camel_operation_cancel(mm->cancel);
-			l = l->next;
-		}
-	}
-	
-	clear_tree (message_list);
-	
-	if (message_list->folder) {
-		hide_save_state(message_list);
-		camel_object_unhook_event((CamelObject *)message_list->folder, "folder_changed",
-					  folder_changed, message_list);
-		camel_object_unhook_event((CamelObject *)message_list->folder, "message_changed",
-					  message_changed, message_list);
-		camel_object_unref (message_list->folder);
-	}
-	
-	if (message_list->thread_tree) {
-		camel_folder_thread_messages_unref(message_list->thread_tree);
-		message_list->thread_tree = NULL;
-	}
-	
-	message_list->folder = camel_folder;
-	
-	if (message_list->cursor_uid) {
-		g_free(message_list->cursor_uid);
-		message_list->cursor_uid = NULL;
-		g_signal_emit(message_list, message_list_signals[MESSAGE_SELECTED], 0, NULL);
-	}
-	
-	if (camel_folder) {
-		/* Setup the strikeout effect for non-trash folders */
-		if (!(camel_folder->folder_flags & CAMEL_FOLDER_IS_TRASH)) {
-			ECell *cell;
-			
-			cell = e_table_extras_get_cell (message_list->extras, "render_date");
-			g_object_set (cell,
-				      "strikeout_column", COL_DELETED,
-				      NULL);
-			
-			cell = e_table_extras_get_cell (message_list->extras, "render_text");
-			g_object_set (cell,
-				      "strikeout_column", COL_DELETED,
-				      NULL);
-			
-			cell = e_table_extras_get_cell (message_list->extras, "render_size");
-			g_object_set (cell,
-				      "strikeout_column", COL_DELETED,
-				      NULL);
-		}
-		
-		/* Build the etree suitable for this folder */
-		message_list_setup_etree (message_list, outgoing);
-		
-		camel_object_hook_event (camel_folder, "folder_changed",
-					 folder_changed, message_list);
-		camel_object_hook_event (camel_folder, "message_changed",
-					 message_changed, message_list);
-		
-		camel_object_ref (camel_folder);
-		
-		/* FIXME: probably listen for updates to show_deleted? */
-		gconf = gconf_client_get_default ();
-		hide_deleted = !gconf_client_get_bool (gconf, "/apps/evolution/mail/display/show_deleted", NULL);
-		message_list->hidedeleted = hide_deleted && !(camel_folder->folder_flags & CAMEL_FOLDER_IS_TRASH);
-		
-		hide_load_state (message_list);
-		mail_regen_list (message_list, message_list->search, NULL, NULL);
-	}
-}
-
-E_MAKE_TYPE (message_list, "MessageList", MessageList, message_list_class_init, message_list_init, PARENT_TYPE);
-
-static gboolean
-on_cursor_activated_idle (gpointer data)
-{
-	MessageList *message_list = data;
-	ESelectionModel *esm = e_tree_get_selection_model (message_list->tree);
-	int selected = e_selection_model_selected_count (esm);
-	
-	if (selected == 1 && message_list->cursor_uid) {
-		d(printf ("emitting cursor changed signal, for uid %s\n", message_list->cursor_uid));
-		g_signal_emit (message_list, message_list_signals[MESSAGE_SELECTED], 0, message_list->cursor_uid);
-	} else {
-		g_signal_emit (message_list, message_list_signals[MESSAGE_SELECTED], 0, NULL);
-	}
-		
-	message_list->idle_id = 0;
-	return FALSE;
-}
-
-static void
-on_cursor_activated_cmd (ETree *tree, int row, ETreePath path, gpointer user_data)
-{
-	MessageList *message_list = MESSAGE_LIST (user_data);
-	const char *new_uid;
-	
-	if (path == NULL)
-		new_uid = NULL;
-	else
-		new_uid = get_message_uid (message_list, path);
-	
-	if (message_list->cursor_uid != NULL && new_uid != NULL && !strcmp (message_list->cursor_uid, new_uid))
-		return;
-	
-	message_list->cursor_row = row;
-	g_free (message_list->cursor_uid);
-	message_list->cursor_uid = g_strdup (new_uid);
-	
-	if (!message_list->idle_id) {
-		message_list->idle_id =
-			g_idle_add_full (G_PRIORITY_LOW, on_cursor_activated_idle,
-					 message_list, NULL);
-	}
-}
-
-static gint
-on_click (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, MessageList *list)
-{
-	CamelMessageInfo *info;
-	int flag;
-	
-	if (col == COL_MESSAGE_STATUS)
-		flag = CAMEL_MESSAGE_SEEN;
-	else if (col == COL_FLAGGED)
-		flag = CAMEL_MESSAGE_FLAGGED;
-	else
-		return FALSE;
-	
-	info = get_message_info (list, path);
-	if (info == NULL) {
-		return FALSE;
-	}
-	
-	/* If a message was marked as deleted and the user flags it as
-	   important, marks it as needing a reply, marks it as unread,
-	   then undelete the message. */
-	if (info->flags & CAMEL_MESSAGE_DELETED) {		
-		if (col == COL_FLAGGED && !(info->flags & CAMEL_MESSAGE_FLAGGED))
-			flag |= CAMEL_MESSAGE_DELETED;
-		
-		if (col == COL_MESSAGE_STATUS && (info->flags & CAMEL_MESSAGE_SEEN))
-			flag |= CAMEL_MESSAGE_DELETED;
-	}
-	
-	camel_folder_set_message_flags (list->folder, camel_message_info_uid (info), flag, ~info->flags);
-	
-	if (flag == CAMEL_MESSAGE_SEEN && list->seen_id) {
-		g_source_remove (list->seen_id);
-		list->seen_id = 0;
-	}
-	
-	return TRUE;
-}
-
-struct message_list_foreach_data {
-	MessageList *message_list;
-	MessageListForeachFunc callback;
-	gpointer user_data;
-};
-
-static void
-mlfe_callback (ETreePath path, gpointer user_data)
-{
-	struct message_list_foreach_data *mlfe_data = user_data;
-	const char *uid;
-
-	if (e_tree_model_node_is_root (mlfe_data->message_list->model, path))
-		return;
-	
-	uid = get_message_uid (mlfe_data->message_list,
-			       path);
-	if (uid) {
-		mlfe_data->callback (mlfe_data->message_list, uid,
-				     mlfe_data->user_data);
-	} else {
-		/* FIXME: could this the cause of bug #6637 and friends? */
-		g_warning ("I wonder if this could be the cause of bug #6637 and friends?");
-		g_assert_not_reached ();
-	}
-}
-
-void
-message_list_foreach (MessageList *message_list,
-		      MessageListForeachFunc callback,
-		      gpointer user_data)
-{
-	struct message_list_foreach_data mlfe_data;
-	
-	mlfe_data.message_list = message_list;
-	mlfe_data.callback = callback;
-	mlfe_data.user_data = user_data;
-	e_tree_selected_path_foreach (message_list->tree,
-				      mlfe_callback, &mlfe_data);
-}
-
-/* set whether we are in threaded view or flat view */
-void
-message_list_set_threaded (MessageList *ml, gboolean threaded)
-{
-	if (ml->threaded != threaded) {
-		ml->threaded = threaded;
-		
-		mail_regen_list (ml, ml->search, NULL, NULL);
-	}
-}
-
-void
-message_list_set_hidedeleted (MessageList *ml, gboolean hidedeleted)
-{
-	if (ml->hidedeleted != hidedeleted) {
-		ml->hidedeleted = hidedeleted;
-		
-		mail_regen_list (ml, ml->search, NULL, NULL);
-	}
-}
-
-void
-message_list_set_search (MessageList *ml, const char *search)
-{
-	if (search == NULL || search[0] == '\0')
-		if (ml->search == NULL || ml->search[0] == '\0')
-			return;
-	
-	if (search != NULL && ml->search != NULL && strcmp (search, ml->search) == 0)
-		return;
-
-	if (ml->thread_tree) {
-		camel_folder_thread_messages_unref(ml->thread_tree);
-		ml->thread_tree = NULL;
-	}
-	
-	mail_regen_list (ml, search, NULL, NULL);
-}
-
-/* returns the number of messages displayable *after* expression hiding has taken place */
-unsigned int
-message_list_length (MessageList *ml)
-{
-	return ml->hide_unhidden;
-}
-
-struct _glibsuxcrap {
-	unsigned int count;
-	CamelFolder *folder;
-};
-
-static void
-glib_crapback(void *key, void *data, void *x)
-{
-	struct _glibsuxcrap *y = x;
-	CamelMessageInfo *mi;
-
-	mi = camel_folder_get_message_info(y->folder, key);
-	if (mi) {
-		y->count++;
-		camel_folder_free_message_info(y->folder, mi);
-	}
-}
-
-/* returns number of hidden messages */
-unsigned int
-message_list_hidden(MessageList *ml)
-{
-	unsigned int hidden = 0;
-
-	MESSAGE_LIST_LOCK (ml, hide_lock);
-	if (ml->hidden && ml->folder) {
-		/* this is a hack, should probably just maintain the hidden table better */
-		struct _glibsuxcrap x = { 0, ml->folder };
-		g_hash_table_foreach(ml->hidden, glib_crapback, &x);
-		hidden = x.count;
-	}
-	MESSAGE_LIST_UNLOCK (ml, hide_lock);
-
-	return hidden;
-}
-
-
-/* add a new expression to hide, or set the range.
-   @expr: A new search expression - all matching messages will be hidden.  May be %NULL.
-   @lower: Use ML_HIDE_NONE_START to specify no messages hidden from the start of the list.
-   @upper: Use ML_HIDE_NONE_END to specify no message hidden from the end of the list.
-
-   For either @upper or @lower, use ML_HIDE_SAME, to keep the previously set hide range.
-   If either range is negative, then the range is taken from the end of the available list
-   of messages, once other hiding has been performed.  Use message_list_length() to find out
-   how many messages are available for hiding.
-
-   Example: hide_add(ml, NULL, -100, ML_HIDE_NONE_END) -> hide all but the last (most recent)
-   100 messages.
-*/
-void
-message_list_hide_add (MessageList *ml, const char *expr, unsigned int lower, unsigned int upper)
-{
-	MESSAGE_LIST_LOCK (ml, hide_lock);
-	
-	if (lower != ML_HIDE_SAME)
-		ml->hide_before = lower;
-	if (upper != ML_HIDE_SAME)
-		ml->hide_after = upper;
-	
-	MESSAGE_LIST_UNLOCK (ml, hide_lock);
-	
-	mail_regen_list (ml, ml->search, expr, NULL);
-}
-
-/* hide specific uid's */
-void
-message_list_hide_uids (MessageList *ml, GPtrArray *uids)
-{
-	int i;
-	char *uid;
-
-	/* first see if we need to do any work, if so, then do it all at once */
-	for (i = 0; i < uids->len; i++) {
-		if (g_hash_table_lookup (ml->uid_nodemap, uids->pdata[i])) {
-			MESSAGE_LIST_LOCK (ml, hide_lock);
-			if (ml->hidden == NULL) {
-				ml->hidden = g_hash_table_new (g_str_hash, g_str_equal);
-				ml->hidden_pool = e_mempool_new (512, 256, E_MEMPOOL_ALIGN_BYTE);
-			}
-			
-			uid =  e_mempool_strdup (ml->hidden_pool, uids->pdata[i]);
-			g_hash_table_insert (ml->hidden, uid, uid);
-			for ( ; i < uids->len; i++) {
-				if (g_hash_table_lookup (ml->uid_nodemap, uids->pdata[i])) {
-					uid =  e_mempool_strdup (ml->hidden_pool, uids->pdata[i]);
-					g_hash_table_insert (ml->hidden, uid, uid);
-				}
-			}
-			MESSAGE_LIST_UNLOCK (ml, hide_lock);
-			mail_regen_list (ml, ml->search, NULL, NULL);
-			break;
-		}
-	}
-}
-
-/* no longer hide any messages */
-void
-message_list_hide_clear (MessageList *ml)
-{
-	MESSAGE_LIST_LOCK (ml, hide_lock);
-	if (ml->hidden) {
-		g_hash_table_destroy (ml->hidden);
-		e_mempool_destroy (ml->hidden_pool);
-		ml->hidden = NULL;
-		ml->hidden_pool = NULL;
-	}
-	ml->hide_before = ML_HIDE_NONE_START;
-	ml->hide_after = ML_HIDE_NONE_END;
-	MESSAGE_LIST_UNLOCK (ml, hide_lock);
-
-	if (ml->thread_tree) {
-		camel_folder_thread_messages_unref(ml->thread_tree);
-		ml->thread_tree = NULL;
-	}
-
-	mail_regen_list (ml, ml->search, NULL, NULL);
-}
-
-#define HIDE_STATE_VERSION (1)
-
-/* version 1 file is:
-   uintf	1
-   uintf	hide_before
-   uintf       	hide_after
-   string*	uids
-*/
-
-static void
-hide_load_state (MessageList *ml)
-{
-	char *filename;
-	FILE *in;
-	guint32 version, lower, upper;
-
-	filename = mail_config_folder_to_cachename(ml->folder, "hidestate-");
-	in = fopen(filename, "r");
-	if (in) {
-		camel_file_util_decode_fixed_int32 (in, &version);
-		if (version == HIDE_STATE_VERSION) {
-			MESSAGE_LIST_LOCK(ml, hide_lock);
-			if (ml->hidden == NULL) {
-				ml->hidden = g_hash_table_new(g_str_hash, g_str_equal);
-				ml->hidden_pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE);
-			}
-			camel_file_util_decode_fixed_int32 (in, &lower);
-			ml->hide_before = lower;
-			camel_file_util_decode_fixed_int32 (in, &upper);
-			ml->hide_after = upper;
-			while (!feof(in)) {
-				char *olduid, *uid;
-				
-				if (camel_file_util_decode_string (in, &olduid) != -1) {
-					uid =  e_mempool_strdup(ml->hidden_pool, olduid);
-					g_free (olduid);
-					g_hash_table_insert(ml->hidden, uid, uid);
-				}
-			}
-			MESSAGE_LIST_UNLOCK(ml, hide_lock);
-		}
-		fclose(in);
-	}
-	g_free(filename);
-}
-
-static void
-hide_save_1 (char *uid, char *keydata, FILE *out)
-{
-	camel_file_util_encode_string (out, uid);
-}
-
-/* save the hide state.  Note that messages are hidden by uid, if the uid's change, then
-   this will become invalid, but is easy to reset in the ui */
-static void
-hide_save_state (MessageList *ml)
-{
-	char *filename;
-	FILE *out;
-
-	MESSAGE_LIST_LOCK(ml, hide_lock);
-
-	filename = mail_config_folder_to_cachename(ml->folder, "hidestate-");
-	if (ml->hidden == NULL && ml->hide_before == ML_HIDE_NONE_START && ml->hide_after == ML_HIDE_NONE_END) {
-		unlink(filename);
-	} else if ((out = fopen (filename, "w"))) {
-		camel_file_util_encode_fixed_int32 (out, HIDE_STATE_VERSION);
-		camel_file_util_encode_fixed_int32 (out, ml->hide_before);
-		camel_file_util_encode_fixed_int32 (out, ml->hide_after);
-		if (ml->hidden)
-			g_hash_table_foreach(ml->hidden, (GHFunc)hide_save_1, out);
-		fclose(out);
-	}
-	g_free (filename);
-
-	MESSAGE_LIST_UNLOCK(ml, hide_lock);
-}
-
-/* ** REGENERATE MESSAGELIST ********************************************** */
-struct _regen_list_msg {
-	struct _mail_msg msg;
-
-	int complete;
-
-	MessageList *ml;
-	char *search;
-	char *hideexpr;
-	CamelFolderChangeInfo *changes;
-	gboolean dotree;	/* we are building a tree */
-	gboolean hidedel;	/* we want to/dont want to show deleted messages */
-	CamelFolderThread *tree;
-
-	CamelFolder *folder;
-	GPtrArray *summary;
-};
-
-/*
-  maintain copy of summary
-
-  any new messages added
-  any removed removed, etc.
-
-  use vfolder to implement searches ???
-
- */
-
-static char *
-regen_list_describe (struct _mail_msg *mm, gint complete)
-{
-	return g_strdup (_("Generating message list"));
-}
-
-static void
-regen_list_regen (struct _mail_msg *mm)
-{
-	struct _regen_list_msg *m = (struct _regen_list_msg *)mm;
-	GPtrArray *uids, *uidnew, *showuids, *searchuids = NULL;
-	gboolean thread_subject;
-	CamelMessageInfo *info;
-	GConfClient *gconf;
-	int i;
-
-	/* if we have hidedeleted on, use a search to find it out, merge with existing search if set */
-	if (!camel_folder_has_search_capability(m->folder)) {
-		/* if we have no search capability, dont let search or hide deleted work */
-		uids = camel_folder_get_uids(m->folder);
-	} else if (m->hidedel) {
-		char *expr;
-
-		if (m->search) {
-			expr = alloca(strlen(m->search) + 64);
-			sprintf(expr, "(and (match-all (not (system-flag \"deleted\")))\n %s)", m->search);
-		} else
-			expr = "(match-all (not (system-flag \"deleted\")))";
-		searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &mm->ex);
-	} else {
-		if (m->search)
-			searchuids = uids = camel_folder_search_by_expression (m->folder, m->search, &mm->ex);
-		else
-			uids = camel_folder_get_uids (m->folder);
-	}
-	
-	if (camel_exception_is_set (&mm->ex))
-		return;
-	
-	/* perform hiding */
-	if (m->hideexpr && camel_folder_has_search_capability(m->folder)) {
-		uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &mm->ex);
-		/* well, lets not abort just because this faileld ... */
-		camel_exception_clear (&mm->ex);
-		
-		if (uidnew) {
-			MESSAGE_LIST_LOCK(m->ml, hide_lock);
-			
-			if (m->ml->hidden == NULL) {
-				m->ml->hidden = g_hash_table_new (g_str_hash, g_str_equal);
-				m->ml->hidden_pool = e_mempool_new (512, 256, E_MEMPOOL_ALIGN_BYTE);
-			}
-			
-			for (i = 0; i < uidnew->len; i++) {
-				if (g_hash_table_lookup (m->ml->hidden, uidnew->pdata[i]) == 0) {
-					char *uid = e_mempool_strdup (m->ml->hidden_pool, uidnew->pdata[i]);
-					g_hash_table_insert (m->ml->hidden, uid, uid);
-				}
-			}
-			
-			MESSAGE_LIST_UNLOCK(m->ml, hide_lock);
-			
-			camel_folder_search_free (m->ml->folder, uidnew);
-		}
-	}
-	
-	MESSAGE_LIST_LOCK(m->ml, hide_lock);
-	
-	m->ml->hide_unhidden = uids->len;
-	
-	/* what semantics do we want from hide_before, hide_after?
-	   probably <0 means measure from the end of the list */
-	
-	/* perform uid hiding */
-	if (m->ml->hidden || m->ml->hide_before != ML_HIDE_NONE_START || m->ml->hide_after != ML_HIDE_NONE_END) {
-		int start, end;
-		uidnew = g_ptr_array_new ();
-		
-		/* first, hide matches */
-		if (m->ml->hidden) {
-			for (i = 0; i < uids->len; i++) {
-				if (g_hash_table_lookup (m->ml->hidden, uids->pdata[i]) == 0)
-					g_ptr_array_add (uidnew, uids->pdata[i]);
-			}
-		}
-		
-		/* then calculate the subrange visible and chop it out */
-		m->ml->hide_unhidden = uidnew->len;
-		
-		if (m->ml->hide_before != ML_HIDE_NONE_START || m->ml->hide_after != ML_HIDE_NONE_END) {
-			GPtrArray *uid2 = g_ptr_array_new ();
-			
-			start = m->ml->hide_before;
-			if (start < 0)
-				start += m->ml->hide_unhidden;
-			end = m->ml->hide_after;
-			if (end < 0)
-				end += m->ml->hide_unhidden;
-			
-			start = MAX(start, 0);
-			end = MIN(end, uidnew->len);
-			for (i = start; i < end; i++) {
-				g_ptr_array_add (uid2, uidnew->pdata[i]);
-			}
-			
-			g_ptr_array_free (uidnew, TRUE);
-			uidnew = uid2;
-		}
-		showuids = uidnew;
-	} else {
-		uidnew = NULL;
-		showuids = uids;
-	}
-	
-	MESSAGE_LIST_UNLOCK(m->ml, hide_lock);
-	
-	gconf = gconf_client_get_default ();
-	thread_subject = gconf_client_get_bool (gconf, "/apps/evolution/mail/display/thread_subject", NULL);
-	
-	if (!camel_operation_cancel_check(mm->cancel)) {
-		/* update/build a new tree */
-		if (m->dotree) {
-			if (m->tree)
-				camel_folder_thread_messages_apply (m->tree, showuids);
-			else
-				m->tree = camel_folder_thread_messages_new (m->folder, showuids, thread_subject);
-		} else {
-			m->summary = g_ptr_array_new ();
-			for (i = 0; i < showuids->len; i++) {
-				info = camel_folder_get_message_info (m->folder, showuids->pdata[i]);
-				if (info)
-					g_ptr_array_add(m->summary, info);
-			}
-		}
-		
-		m->complete = TRUE;
-	}
-
-	if (uidnew)
-		g_ptr_array_free (uidnew, TRUE);
-
-	if (searchuids)
-		camel_folder_search_free (m->folder, searchuids);
-	else
-		camel_folder_free_uids (m->folder, uids);
-}
-
-static void
-regen_list_regened (struct _mail_msg *mm)
-{
-	struct _regen_list_msg *m = (struct _regen_list_msg *)mm;
-
-#warning "GTK_OBJECT_DESTROYED replacement"
-	/*if (GTK_OBJECT_DESTROYED(m->ml))
-	  return;*/
-
-	if (!m->complete)
-		return;
-	
-	if (camel_operation_cancel_check(mm->cancel))
-		return;
-
-	if (m->dotree) {
-		build_tree (m->ml, m->tree, m->changes);
-		if (m->ml->thread_tree)
-			camel_folder_thread_messages_unref(m->ml->thread_tree);
-		m->ml->thread_tree = m->tree;
-		m->tree = NULL;
-	} else
-		build_flat (m->ml, m->summary, m->changes);
-
-	g_signal_emit (m->ml, message_list_signals[MESSAGE_LIST_BUILT], 0);
-}
-
-static void
-regen_list_free (struct _mail_msg *mm)
-{
-	struct _regen_list_msg *m = (struct _regen_list_msg *)mm;
-	int i;
-	
-	if (m->summary) {
-		for (i = 0; i < m->summary->len; i++)
-			camel_folder_free_message_info (m->folder, m->summary->pdata[i]);
-		g_ptr_array_free (m->summary, TRUE);
-	}
-	
-	if (m->tree)
-		camel_folder_thread_messages_unref (m->tree);
-	
-        if (m->ml->search && m->ml->search != m->search)
-                g_free (m->ml->search);
-	m->ml->search = m->search;
-	
-	g_free (m->hideexpr);
-	
-	camel_object_unref (m->folder);
-	
-	if (m->changes)
-		camel_folder_change_info_free (m->changes);
-
-	/* This should probably lock the list.
-	   However, since we have a received function, this will always be called in gui thread */
-	m->ml->regen = g_list_remove(m->ml->regen, m);
-
-	g_object_unref(m->ml);
-}
-
-static struct _mail_msg_op regen_list_op = {
-	regen_list_describe,
-	regen_list_regen,
-	regen_list_regened,
-	regen_list_free,
-};
-
-static void
-mail_regen_list (MessageList *ml, const char *search, const char *hideexpr, CamelFolderChangeInfo *changes)
-{
-	struct _regen_list_msg *m;
-	
-	if (ml->folder == NULL)
-		return;
-
-	/* cancel any outstanding regeneration requests, we rebuild from scratch anyway */
-	if (ml->regen) {
-		GList *l = ml->regen;
-
-		while (l) {
-			struct _mail_msg *mm = l->data;
-
-			if (mm->cancel)
-				camel_operation_cancel(mm->cancel);
-			l = l->next;
-		}
-	}
-	
-#ifndef BROKEN_ETREE
-	/* this can sometimes crash,so ... */
-	
-	/* see if we need to goto the child thread at all anyway */
-	/* currently the only case is the flat view with updates and no search */
-	if (hideexpr == NULL && search == NULL && changes != NULL && !ml->threaded) {
-		build_flat_diff(ml, changes);
-		camel_folder_change_info_free(changes);
-		return;
-	}
-#endif
-	
-	m = mail_msg_new (®en_list_op, NULL, sizeof (*m));
-	m->ml = ml;
-	m->search = g_strdup (search);
-	m->hideexpr = g_strdup (hideexpr);
-	m->changes = changes;
-	m->dotree = ml->threaded;
-	m->hidedel = ml->hidedeleted;
-	g_object_ref(ml);
-	m->folder = ml->folder;
-	camel_object_ref(m->folder);
-
-	if ((!m->hidedel || !m->dotree) && ml->thread_tree) {
-		camel_folder_thread_messages_unref(ml->thread_tree);
-		ml->thread_tree = NULL;
-	} else if (ml->thread_tree) {
-		m->tree = ml->thread_tree;
-		camel_folder_thread_messages_ref(m->tree);
-	}
-
-	ml->regen = g_list_prepend(ml->regen, m);
-	
-	e_thread_put (mail_thread_queued, (EMsg *)m);
-}
diff --git a/mail/message-list.etspec b/mail/message-list.etspec
deleted file mode 100644
index 1ba8a64187..0000000000
--- a/mail/message-list.etspec
+++ /dev/null
@@ -1,35 +0,0 @@
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-
-  
-      
-      
-     
-  
-
diff --git a/mail/message-list.h b/mail/message-list.h
deleted file mode 100644
index de152cec2e..0000000000
--- a/mail/message-list.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-#ifndef _MESSAGE_LIST_H_
-#define _MESSAGE_LIST_H_
-
-#include 
-#include 
-
-#include 
-#include 
-#include "mail-types.h"
-
-#define MESSAGE_LIST_TYPE        (message_list_get_type ())
-#define MESSAGE_LIST(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), MESSAGE_LIST_TYPE, MessageList))
-#define MESSAGE_LIST_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), MESSAGE_LIST_TYPE, MessageListClass))
-#define IS_MESSAGE_LIST(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), MESSAGE_LIST_TYPE))
-#define IS_MESSAGE_LIST_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MESSAGE_LIST_TYPE))
-
-enum {
-	COL_MESSAGE_STATUS,
-	COL_FLAGGED,
-	COL_SCORE,
-	COL_ATTACHMENT,
-	COL_FROM,
-	COL_SUBJECT,
-	COL_SENT,
-	COL_RECEIVED,
-	COL_TO,
-	COL_SIZE,
-	COL_FOLLOWUP_FLAG_STATUS,
-	COL_FOLLOWUP_FLAG,
-	COL_FOLLOWUP_DUE_BY,
-	COL_LOCATION,		/* vfolder location? */
-	
-	/* normalised strings */
-	COL_FROM_NORM,
-	COL_SUBJECT_NORM,
-	COL_TO_NORM,
-	
-	COL_LAST,
-	
-	/* Invisible columns */
-	COL_DELETED,
-	COL_UNREAD,
-	COL_COLOUR,
-};
-
-#define MESSAGE_LIST_COLUMN_IS_ACTIVE(col) (col == COL_MESSAGE_STATUS || \
-					    col == COL_FLAGGED)
-
-#define ML_HIDE_NONE_START (0)
-#define ML_HIDE_NONE_END (2147483647)
-/* dont change */
-#define ML_HIDE_SAME (2147483646)
-
-struct _MessageList {
-	ETreeScrolled parent;
-
-	/* The table */
-	ETreeModel   *model;
-	ETree        *tree;
-	ETreePath     tree_root;
-	ETableExtras *extras;
-
-	/* The folder */
-	CamelFolder  *folder;
-
-	GHashTable *uid_nodemap; /* uid (from info) -> tree node mapping */
-	
-	GHashTable *normalised_hash;
-	
-	/* UID's to hide.  Keys in the mempool */
-	/* IMPORTANT: You MUST have obtained the hide lock, to operate on this data */
-	GHashTable	 *hidden;
-	struct _EMemPool *hidden_pool;
-	int hide_unhidden, /* total length, before hiding */
-		hide_before, hide_after; /* hide ranges of messages */
-
-	/* Current search string, or %NULL */
-	char *search;
-
-	/* Are we displaying threaded view? */
-	gboolean threaded;
-	/* do we automatically hide deleted messages? */
-	gboolean hidedeleted;
-
-	/* Where the ETree cursor is. */
-	int cursor_row;
-	char *cursor_uid;
-
-	/* Row-selection and seen-marking timers */
-	guint idle_id, seen_id;
-
-	/* locks */
-	GMutex *hide_lock;	/* for any 'hide' info above */
-
-	/* list of outstanding regeneration requests */
-	GList *regen;
-
-	/* the current camel folder thread tree, if any */
-	struct _CamelFolderThread *thread_tree;
-
-	/* for message/folder chagned event handling */
-	struct _MailAsyncEvent *async_event;
-};
-
-typedef struct {
-	ETreeScrolledClass parent_class;
-
-	/* signals - select a message */
-	void (*message_selected) (MessageList *ml, const char *uid);
-	void (*message_list_built) (MessageList *ml);
-} MessageListClass;
-
-typedef void (*MessageListForeachFunc) (MessageList *message_list,
-					const char *uid,
-					gpointer user_data);
-
-typedef enum {
-	MESSAGE_LIST_SELECT_NEXT = 1,
-	MESSAGE_LIST_SELECT_PREVIOUS = -1
-} MessageListSelectDirection;
-
-GtkType        message_list_get_type   (void);
-GtkWidget     *message_list_new        (void);
-void           message_list_set_folder (MessageList *message_list,
-					CamelFolder *camel_folder,
-					gboolean outgoing);
-
-void           message_list_foreach    (MessageList *message_list,
-					MessageListForeachFunc callback,
-					gpointer user_data);
-
-gboolean       message_list_select     (MessageList *message_list,
-					MessageListSelectDirection direction,
-					guint32 flags,
-					guint32 mask,
-					gboolean wraparound);
-
-void           message_list_select_uid (MessageList *message_list,
-					const char *uid);
-
-void           message_list_select_next_thread (MessageList *messageList);
-
-/* info */
-unsigned int   message_list_length(MessageList *ml);
-unsigned int   message_list_hidden(MessageList *ml);
-
-/* hide specific messages */
-void	       message_list_hide_add(MessageList *ml, const char *expr, unsigned int lower, unsigned int upper);
-void	       message_list_hide_uids(MessageList *ml, GPtrArray *uids);
-void	       message_list_hide_clear(MessageList *ml);
-
-void	       message_list_set_threaded(MessageList *ml, gboolean threaded);
-void	       message_list_set_hidedeleted(MessageList *ml, gboolean hidedeleted);
-void	       message_list_set_search(MessageList *ml, const char *search);
-
-#define MESSAGE_LIST_LOCK(m, l) g_mutex_lock(((MessageList *)m)->l)
-#define MESSAGE_LIST_UNLOCK(m, l) g_mutex_unlock(((MessageList *)m)->l)
-
-#endif /* _MESSAGE_LIST_H_ */
diff --git a/mail/message-tag-editor.c b/mail/message-tag-editor.c
deleted file mode 100644
index 7d7f6d420b..0000000000
--- a/mail/message-tag-editor.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast 
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-
-#include "message-tag-editor.h"
-
-static void message_tag_editor_class_init (MessageTagEditorClass *class);
-static void message_tag_editor_init (MessageTagEditor *editor);
-static void message_tag_editor_finalise (GObject *obj);
-
-static CamelTag *get_tag_list (MessageTagEditor *editor);
-static void set_tag_list (MessageTagEditor *editor, CamelTag *value);
-
-static GtkDialogClass *parent_class = NULL;
-
-GType
-message_tag_editor_get_type (void)
-{
-	static GType type = 0;
-	
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (MessageTagEditorClass),
-			NULL, /* base_class_init */
-			NULL, /* base_class_finalize */
-			(GClassInitFunc) message_tag_editor_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof (MessageTagEditor),
-			0,
-			(GInstanceInitFunc) message_tag_editor_init,
-		};
-		
-		type = g_type_register_static (gtk_dialog_get_type (), "MessageTagEditor", &info, 0);
-	}
-	
-	return type;
-}
-
-static void
-message_tag_editor_class_init (MessageTagEditorClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	
-	parent_class = g_type_class_ref (gtk_dialog_get_type ());
-	
-	object_class->finalize = message_tag_editor_finalise;
-	
-	klass->get_tag_list = get_tag_list;
-	klass->set_tag_list = set_tag_list;
-}
-
-static void
-message_tag_editor_init (MessageTagEditor *editor)
-{
-	g_object_set (editor, "allow_shrink", FALSE, "allow_grow", TRUE, NULL);
-	gtk_dialog_add_buttons (GTK_DIALOG (editor),
-				GTK_STOCK_OK,
-				GTK_RESPONSE_OK,
-				GTK_STOCK_CANCEL,
-				GTK_RESPONSE_CANCEL,
-				NULL);
-	
-	gtk_dialog_set_default_response (GTK_DIALOG (editor), GTK_RESPONSE_OK);
-}
-
-
-static void
-message_tag_editor_finalise (GObject *obj)
-{
-	/*MessageTagEditor *editor = (MessageTagEditor *) obj;*/
-	
-        G_OBJECT_CLASS (parent_class)->finalize (obj);
-}
-
-static CamelTag *
-get_tag_list (MessageTagEditor *editor)
-{
-	return NULL;
-}
-
-CamelTag *
-message_tag_editor_get_tag_list (MessageTagEditor *editor)
-{
-	g_return_val_if_fail (IS_MESSAGE_TAG_EDITOR (editor), NULL);
-	
-	return MESSAGE_TAG_EDITOR_GET_CLASS (editor)->get_tag_list (editor);
-}
-
-
-static void
-set_tag_list (MessageTagEditor *editor, CamelTag *tags)
-{
-	/* no-op */
-	;
-}
-
-void
-message_tag_editor_set_tag_list (MessageTagEditor *editor, CamelTag *tags)
-{
-	g_return_if_fail (IS_MESSAGE_TAG_EDITOR (editor));
-	g_return_if_fail (tags != NULL);
-	
-	MESSAGE_TAG_EDITOR_GET_CLASS (editor)->set_tag_list (editor, tags);
-}
diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h
deleted file mode 100644
index 9177012f75..0000000000
--- a/mail/message-tag-editor.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast 
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifndef __MESSAGE_TAG_EDITOR_H__
-#define __MESSAGE_TAG_EDITOR_H__
-
-#include 
-#include 
-#include 
-#include 
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define MESSAGE_TAG_EDITOR_TYPE            (message_tag_editor_get_type ())
-#define MESSAGE_TAG_EDITOR(obj)	           (G_TYPE_CHECK_INSTANCE_CAST (obj, MESSAGE_TAG_EDITOR_TYPE, MessageTagEditor))
-#define MESSAGE_TAG_EDITOR_CLASS(klass)	   (G_TYPE_CHECK_CLASS_CAST (klass, MESSAGE_TAG_EDITOR_TYPE, MessageTagEditorClass))
-#define IS_MESSAGE_TAG_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, MESSAGE_TAG_EDITOR_TYPE))
-#define IS_MESSAGE_TAG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MESSAGE_TAG_EDITOR_TYPE))
-#define MESSAGE_TAG_EDITOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MESSAGE_TAG_EDITOR_TYPE, MessageTagEditorClass))
-
-typedef struct _MessageTagEditor MessageTagEditor;
-typedef struct _MessageTagEditorClass MessageTagEditorClass;
-
-struct _MessageTagEditor {
-	GtkDialog parent;
-	
-};
-
-struct _MessageTagEditorClass {
-	GtkDialogClass parent_class;
-	
-	/* virtual methods */
-	CamelTag * (*get_tag_list) (MessageTagEditor *editor);
-	void       (*set_tag_list) (MessageTagEditor *editor, CamelTag *tags);
-	
-	/* signals */
-};
-
-
-GtkType message_tag_editor_get_type (void);
-
-/* methods */
-CamelTag *message_tag_editor_get_tag_list (MessageTagEditor *editor);
-void      message_tag_editor_set_tag_list (MessageTagEditor *editor, CamelTag *tags);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __MESSAGE_TAG_EDITOR_H__ */
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
deleted file mode 100644
index 59ebf29f13..0000000000
--- a/mail/message-tag-followup.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast 
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-#include 
-#include 
-
-#ifdef GTK_DISABLE_DEPRECATED
-/* Gtk2's GtkCombo widget uses the deprecated GtkList widget, so
-   there's no way to use GtkCombo and still build if
-   GTK_DISABLE_DEPRECATED is defined. Yay Gtk! */
-#undef GTK_DISABLE_DEPRECATED
-#include 
-#include 
-#define GTK_ENABLE_DEPRECATED
-#endif /* GTK_DISABLE_DEPRECATED */
-
-#include 
-
-#include 
-#include 
-
-#include 
-#include 
-
-#include "message-tag-followup.h"
-#include "mail-config.h"
-
-static void message_tag_followup_class_init (MessageTagFollowUpClass *class);
-static void message_tag_followup_init (MessageTagFollowUp *followup);
-static void message_tag_followup_finalise (GObject *obj);
-
-static CamelTag *get_tag_list (MessageTagEditor *editor);
-static void set_tag_list (MessageTagEditor *editor, CamelTag *tags);
-
-
-#define DEFAULT_FLAG  2  /* Follow-Up */
-static char *available_flags[] = {
-	N_("Call"),
-	N_("Do Not Forward"),
-	N_("Follow-Up"),
-	N_("For Your Information"),
-	N_("Forward"),
-	N_("No Response Necessary"),
-	N_("Read"),
-	N_("Reply"),
-	N_("Reply to All"),
-	N_("Review"),
-};
-
-static int num_available_flags = sizeof (available_flags) / sizeof (available_flags[0]);
-
-
-static MessageTagEditorClass *parent_class = NULL;
-
-
-GType
-message_tag_followup_get_type (void)
-{
-	static GType type = 0;
-	
-	if (!type) {
-		static const GTypeInfo info = {
-			sizeof (MessageTagFollowUpClass),
-			NULL, /* base_class_init */
-			NULL, /* base_class_finalize */
-			(GClassInitFunc) message_tag_followup_class_init,
-			NULL, /* class_finalize */
-			NULL, /* class_data */
-			sizeof (MessageTagFollowUp),
-			0,
-			(GInstanceInitFunc) message_tag_followup_init,
-		};
-		
-		type = g_type_register_static (message_tag_editor_get_type (), "MessageTagFollowUp", &info, 0);
-	}
-	
-	return type;
-}
-
-static void
-message_tag_followup_class_init (MessageTagFollowUpClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	MessageTagEditorClass *editor_class = (MessageTagEditorClass *) klass;
-	
-	parent_class = g_type_class_ref (message_tag_editor_get_type ());
-	
-	object_class->finalize = message_tag_followup_finalise;
-	
-	editor_class->get_tag_list = get_tag_list;
-	editor_class->set_tag_list = set_tag_list;
-}
-
-static void
-message_tag_followup_init (MessageTagFollowUp *editor)
-{
-	editor->combo = NULL;
-	editor->target_date = NULL;
-	editor->completed = NULL;
-	editor->clear = NULL;
-	editor->completed_date = 0;
-}
-
-
-static void
-message_tag_followup_finalise (GObject *obj)
-{
-	MessageTagFollowUp *editor = (MessageTagFollowUp *) obj;
-	
-	editor->completed_date = 0;
-	
-        G_OBJECT_CLASS (parent_class)->finalize (obj);
-}
-
-
-static CamelTag *
-get_tag_list (MessageTagEditor *editor)
-{
-	MessageTagFollowUp *followup = (MessageTagFollowUp *) editor;
-	CamelTag *tags = NULL;
-	time_t date;
-	char *text;
-	
-	camel_tag_set (&tags, "follow-up", gtk_entry_get_text (GTK_ENTRY (followup->combo->entry)));
-	
-	date = e_date_edit_get_time (followup->target_date);
-	if (date != (time_t) -1) {
-		text = header_format_date (date, 0);
-		camel_tag_set (&tags, "due-by", text);
-		g_free (text);
-	} else {
-		camel_tag_set (&tags, "due-by", "");
-	}
-	
-	if (gtk_toggle_button_get_active (followup->completed)) {
-		text = header_format_date (followup->completed_date, 0);
-		camel_tag_set (&tags, "completed-on", text);
-		g_free (text);
-	} else {
-		camel_tag_set (&tags, "completed-on", "");
-	}
-	
-	return tags;
-}
-
-static void
-set_tag_list (MessageTagEditor *editor, CamelTag *tags)
-{
-	MessageTagFollowUp *followup = (MessageTagFollowUp *) editor;
-	const char *text;
-	time_t date;
-	
-	text = camel_tag_get (&tags, "follow-up");
-	if (text)
-		gtk_entry_set_text (GTK_ENTRY (followup->combo->entry), text);
-	
-	text = camel_tag_get (&tags, "due-by");
-	if (text && *text) {
-		date = header_decode_date (text, NULL);
-		e_date_edit_set_time (followup->target_date, date);
-	} else {
-		e_date_edit_set_time (followup->target_date, (time_t) -1);
-	}
-	
-	text = camel_tag_get (&tags, "completed-on");
-	if (text && *text) {
-		date = header_decode_date (text, NULL);
-		if (date != (time_t) 0) {
-			gtk_toggle_button_set_active (followup->completed, TRUE);
-			followup->completed_date = date;
-		}
-	}
-}
-
-static void
-clear_clicked (GtkButton *button, gpointer user_data)
-{
-	MessageTagFollowUp *followup = user_data;
-	
-	gtk_list_select_item (GTK_LIST (followup->combo->list), DEFAULT_FLAG);
-	
-	e_date_edit_set_time (followup->target_date, (time_t) -1);
-	gtk_toggle_button_set_active (followup->completed, FALSE);
-}
-
-static void
-completed_toggled (GtkToggleButton *button, gpointer user_data)
-{
-	MessageTagFollowUp *followup = user_data;
-	
-	if (gtk_toggle_button_get_active (followup->completed))
-		followup->completed_date = time (NULL);
-	else
-		followup->completed_date = 0;
-}
-
-static int
-get_week_start_day (void)
-{
-	/* FIXME: make sure the gconf key is correct? */
-	GConfClient *gconf;
-	
-	gconf = gconf_client_get_default ();
-	return gconf_client_get_int (gconf, "/apps/evolution/calendar/display/week_start_day", NULL);
-}
-
-static gboolean
-locale_supports_12_hour_format (void)
-{
-	char s[16];
-	time_t t = 0;
-	
-	strftime(s, sizeof s, "%p", gmtime (&t));
-	return s[0] != '\0';
-}
-
-GtkWidget *target_date_new (const char *s1, const char *s2, int i1, int i2);
-
-GtkWidget *
-target_date_new (const char *s1, const char *s2, int i1, int i2)
-{
-	gboolean time_24hour = TRUE;
-	GConfClient *gconf;
-	GtkWidget *widget;
-	int start;
-	
-	widget = e_date_edit_new ();
-	e_date_edit_set_show_date (E_DATE_EDIT (widget), TRUE);
-	e_date_edit_set_show_time (E_DATE_EDIT (widget), TRUE);
-	
-	/* Note that this is 0 (Sun) to 6 (Sat), conver to 0 (mon) to 6 (sun) */
-	start = (get_week_start_day () + 6) % 7;
-	
-	/* FIXME: make sure the calendar gconf key is correct */
-	if (locale_supports_12_hour_format ()) {
-		gconf = gconf_client_get_default ();
-		time_24hour = gconf_client_get_bool (gconf, "/apps/evolution/calendar/display/use_24hour_format", NULL);
-	}
-	
-	e_date_edit_set_week_start_day (E_DATE_EDIT (widget), start);
-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (widget), time_24hour);
-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (widget), TRUE);
-	e_date_edit_set_time_popup_range (E_DATE_EDIT (widget), 0, 24);
-	
-	return widget;
-}
-
-static void
-construct (MessageTagEditor *editor)
-{
-	MessageTagFollowUp *followup = (MessageTagFollowUp *) editor;
-	GtkCellRenderer *renderer;
-	GtkListStore *model;
-	GtkWidget *widget;
-	GList *strings;
-	GladeXML *gui;
-	int i;
-	
-	gtk_window_set_title (GTK_WINDOW (editor), _("Flag to Follow Up"));
-	gnome_window_icon_set_from_file (GTK_WINDOW (editor), EVOLUTION_IMAGES "/flag-for-followup-16.png");
-	
-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/message-tags.glade", "followup_editor", NULL);
-	
-	widget = glade_xml_get_widget (gui, "toplevel");
-	
-	/* reparent */
-	gtk_widget_reparent (widget, GTK_DIALOG (editor)->vbox);
-	
-	widget = glade_xml_get_widget (gui, "pixmap");
-	gtk_image_set_from_file ((GtkImage *)widget, EVOLUTION_GLADEDIR "/flag-for-followup-48.png");
-	
-	followup->message_list = GTK_TREE_VIEW (glade_xml_get_widget (gui, "message_list"));
-	model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
-	gtk_tree_view_set_model (followup->message_list, (GtkTreeModel *) model);
-	
-	renderer = gtk_cell_renderer_text_new ();
-	gtk_tree_view_insert_column_with_attributes (followup->message_list, -1, _("From"),
-						     renderer, "text", 0, NULL);
-	
-	renderer = gtk_cell_renderer_text_new ();
-	gtk_tree_view_insert_column_with_attributes (followup->message_list, -1, _("Subject"),
-						     renderer, "text", 1, NULL);
-	
-	followup->combo = GTK_COMBO (glade_xml_get_widget (gui, "combo"));
-	gtk_combo_set_case_sensitive (followup->combo, FALSE);
-	strings = NULL;
-	for (i = 0; i < num_available_flags; i++)
-		strings = g_list_append (strings, (char *) _(available_flags[i]));
-	gtk_combo_set_popdown_strings (followup->combo, strings);
-	g_list_free (strings);
-	gtk_list_select_item (GTK_LIST (followup->combo->list), DEFAULT_FLAG);
-	
-	followup->target_date = E_DATE_EDIT (glade_xml_get_widget (gui, "target_date"));
-	/* glade bug, need to show this ourselves */
-	gtk_widget_show ((GtkWidget *) followup->target_date);
-	e_date_edit_set_time (followup->target_date, (time_t) -1);
-	
-	followup->completed = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "completed"));
-	g_signal_connect (followup->completed, "toggled", G_CALLBACK (completed_toggled), followup);
-	
-	followup->clear = GTK_BUTTON (glade_xml_get_widget (gui, "clear"));
-	g_signal_connect (followup->clear, "clicked", G_CALLBACK (clear_clicked), followup);
-	
-	g_object_unref (gui);
-}
-
-MessageTagEditor *
-message_tag_followup_new (void)
-{
-	MessageTagEditor *editor;
-	
-	editor = (MessageTagEditor *) g_object_new (message_tag_followup_get_type (), NULL);
-	construct (editor);
-	
-	return editor;
-}
-
-void
-message_tag_followup_append_message (MessageTagFollowUp *editor, const char *from, const char *subject)
-{
-	GtkTreeIter iter;
-	GtkListStore *model;
-	
-	g_return_if_fail (IS_MESSAGE_TAG_FOLLOWUP (editor));
-	
-	model = (GtkListStore *) gtk_tree_view_get_model (editor->message_list);
-	
-	gtk_list_store_append (model, &iter);
-	gtk_list_store_set (model, &iter, 0, from, 1, subject, -1);
-}
diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h
deleted file mode 100644
index c6a292c19e..0000000000
--- a/mail/message-tag-followup.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast 
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifndef __MESSAGE_TAG_FOLLOWUP_H__
-#define __MESSAGE_TAG_FOLLOWUP_H__
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define MESSAGE_TAG_FOLLOWUP_TYPE            (message_tag_followup_get_type ())
-#define MESSAGE_TAG_FOLLOWUP(obj)	     (G_TYPE_CHECK_INSTANCE_CAST (obj, MESSAGE_TAG_FOLLOWUP_TYPE, MessageTagFollowUp))
-#define MESSAGE_TAG_FOLLOWUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST (klass, MESSAGE_TAG_FOLLOWUP_TYPE, MessageTagFollowUpClass))
-#define IS_MESSAGE_TAG_FOLLOWUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, MESSAGE_TAG_FOLLOWUP_TYPE))
-#define IS_MESSAGE_TAG_FOLLOWUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MESSAGE_TAG_FOLLOWUP_TYPE))
-#define MESSAGE_TAG_FOLLOWUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MESSAGE_TAG_FOLLOWUP_TYPE, MessageTagFollowUpClass))
-
-typedef struct _MessageTagFollowUp MessageTagFollowUp;
-typedef struct _MessageTagFollowUpClass MessageTagFollowUpClass;
-
-struct _MessageTagFollowUp {
-	MessageTagEditor parent;
-	
-	GtkTreeView *message_list;
-	
-	GtkCombo *combo;
-	
-	EDateEdit *target_date;
-	GtkToggleButton *completed;
-	GtkButton *clear;
-	
-	time_t completed_date;
-};
-
-struct _MessageTagFollowUpClass {
-	MessageTagEditorClass parent_class;
-	
-	/* virtual methods */
-	/* signals */
-};
-
-
-GtkType message_tag_followup_get_type (void);
-
-MessageTagEditor *message_tag_followup_new (void);
-
-void message_tag_followup_append_message (MessageTagFollowUp *editor,
-					  const char *from,
-					  const char *subject);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __MESSAGE_TAG_FOLLOWUP_H__ */
diff --git a/mail/message-tags.glade b/mail/message-tags.glade
deleted file mode 100644
index 8745172cd4..0000000000
--- a/mail/message-tags.glade
+++ /dev/null
@@ -1,364 +0,0 @@
- 
-
-
-
-  
-    no
-    Flag to Follow Up
-    GTK_WINDOW_TOPLEVEL
-    no
-    yes
-    yes
-    GTK_WIN_POS_NONE
-
-    
-      
-        3
-        no
-        3
-        yes
-
-        
-          
-            GTK_BUTTONBOX_END
-            8
-            yes
-
-            
-              
-                yes
-                yes
-                yes
-                gtk-ok
-                yes
-                yes
-              
-            
-
-            
-              
-                yes
-                yes
-                yes
-                gtk-cancel
-                yes
-                yes
-              
-            
-          
-          
-            0
-            no
-            yes
-            GTK_PACK_END
-          
-        
-
-        
-          
-            no
-            4
-            yes
-
-            
-              
-                no
-                4
-                yes
-
-                
-                  
-                    flag-for-followup-48.png
-                    yes
-                  
-                  
-                    0
-                    no
-                    no
-                  
-                
-
-                
-                  
-                    The messages you have selected for follow up are listed below.
-Please select a follow up action from the "Flag" menu.
-                    GTK_JUSTIFY_LEFT
-                    no
-                    0.5
-                    0.5
-                    0
-                    0
-                    yes
-                  
-                  
-                    0
-                    no
-                    no
-                  
-                
-              
-              
-                0
-                no
-                no
-              
-            
-
-            
-              
-                GTK_POLICY_AUTOMATIC
-                GTK_POLICY_AUTOMATIC
-                GTK_SHADOW_IN
-                yes
-
-                
-                  
-                    yes
-                    yes
-                    yes
-
-                    
-                      
-                        CList:title
-                        From
-                        GTK_JUSTIFY_CENTER
-                        no
-                        0.5
-                        0.5
-                        0
-                        0
-                        yes
-                      
-                    
-
-                    
-                      
-                        CList:title
-                        Subject
-                        GTK_JUSTIFY_CENTER
-                        no
-                        0.5
-                        0.5
-                        0
-                        0
-                        yes
-                      
-                    
-                  
-                
-
-                
-                  
-                    GTK_UPDATE_CONTINUOUS
-                    yes
-                  
-                
-
-                
-                  
-                    GTK_UPDATE_CONTINUOUS
-                    yes
-                  
-                
-              
-              
-                0
-                yes
-                yes
-              
-            
-
-            
-              
-                3
-                no
-                3
-                3
-                2
-                3
-                yes
-
-                
-                  
-                    _Flag:
-                    GTK_JUSTIFY_CENTER
-                    no
-                    0
-                    0.5
-                    0
-                    0
-                    combo-entry
-                    yes
-                    yes
-                  
-                  
-                    0
-                    1
-                    0
-                    1
-                    0
-                    0
-                    fill
-                    
-                  
-                
-
-                
-                  
-                    _Due by:
-                    GTK_JUSTIFY_CENTER
-                    no
-                    0
-                    0.5
-                    0
-                    0
-                    yes
-                    yes
-                  
-                  
-                    0
-                    1
-                    1
-                    2
-                    0
-                    0
-                    fill
-                    
-                  
-                
-
-                
-                  
-                    yes
-                    _Clear Flag
-                    GTK_RELIEF_NORMAL
-                    yes
-                    yes
-                  
-                  
-                    2
-                    3
-                    0
-                    1
-                    0
-                    0
-                    fill
-                    
-                  
-                
-
-                
-                  
-                    yes
-                    C_ompleted
-                    no
-                    yes
-                    yes
-                    yes
-                  
-                  
-                    2
-                    3
-                    1
-                    2
-                    0
-                    0
-                    fill
-                    
-                  
-                
-
-                
-                  
-                    target_date_new
-                    0
-                    0
-                    Sat, 09 Feb 2002 00:20:24 GMT
-                    yes
-                  
-                  
-                    1
-                    2
-                    1
-                    2
-                    0
-                    0
-                    fill
-                    fill
-                  
-                
-
-                
-                  
-                    no
-                    no
-                    yes
-                    no
-                    yes
-                    yes
-
-                    
-                      
-                        yes
-                        yes
-                        
-                        0
-                        yes
-                        yes
-                      
-                    
-
-                    
-                      
-                        yes
-
-                        
-                          
-                            yes
-
-                            
-                              
-                                
-                                0.0
-                                yes
-                              
-                            
-                          
-                        
-                      
-                    
-                  
-                  
-                    1
-                    2
-                    0
-                    1
-                    0
-                    0
-                    expand|fill
-                    
-                  
-                
-              
-              
-                0
-                no
-                no
-              
-            
-          
-          
-            0
-            yes
-            yes
-          
-        
-      
-      
-        4
-        yes
-        yes
-      
-    
-  
-
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
deleted file mode 100644
index ba53617715..0000000000
--- a/mail/subscribe-dialog.c
+++ /dev/null
@@ -1,1691 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* subscribe-dialog.c: Subscribe dialog */
-/*
- *  Authors: Chris Toshok 
- *           Peter Williams 
- *
- *  Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-
-#include 
-#include 
-
-#include 
-
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-
-#include 
-
-#include "evolution-shell-component-utils.h"
-#include "mail.h"
-#include "mail-tools.h"
-#include "mail-ops.h"
-#include "mail-mt.h"
-#include "mail-folder-cache.h"
-#include "camel/camel-exception.h"
-#include "camel/camel-store.h"
-#include "camel/camel-session.h"
-#include "subscribe-dialog.h"
-
-#include "art/empty.xpm"
-#include "art/mark.xpm"
-
-#define d(x) 
-
-/* Things to test.
- * - Feature
- *   + How to check that it works.
- *
- * - Proper stores displayed
- *   + Skip stores that don't support subscriptions
- *   + Skip disabled stores
- * - Changing subscription status
- *   + Select single folder, double-click row -> toggled
- *   + Select multiple folders, press subscribe -> all selected folders end up subscribed
- * - (un)Subscribing from/to already (un)subscribed folder
- *   + Check that no IMAP command is sent
- * - Switching views between stores
- *   + Proper tree shown
- * - No crashes when buttons are pressed with "No store" screen
- *   + obvious
- * - Restoring filter settings when view switched
- *   + Enter search, change view, change back -> filter checked and search entry set
- *   + Clear search, change view, change back -> "all" checked
- * - Cancelling in middle of get_store 
- *   + Enter invalid hostname, open dialog, click Close
- * - Cancelling in middle if listing 
- *   + Open large directory, click Close
- * - Cancelling in middle of subscription op
- *   + How to test?
- * - Test with both IMAP and NNTP
- *   + obvious
- * - Verify that refresh view works
- *   + obvious
- * - No unnecessary tree rebuilds
- *   + Show All folders, change filter with empty search -> no tree rebuild
- *   + Converse
- * - No out of date tree
- *   + Show All Folders, change to filter with a search -> tree rebuild
- * - Tree construction logic (mostly IMAP-specific terminology)
- *   + Tree is created progressively
- *   + No wasted LIST responses
- *   + No extraneous LIST commands
- *   + Specifying "folder names begin with" works
- *   + Always show folders below IMAP namespace (no escaping the namespace)
- *   + Don't allow subscription to NoSelect folders
- *   + IMAP accounts always show INBOX
- * - Shell interactions
- *   + Folders are properly created / delete from folder tree when subscribed / unsubscribed
- *   + Folders with spaces in names / 8bit chars
- *   + Toplevel as well as subfolders
- *   + Mail Folder Cache doesn't complain
- * - No ETable wackiness
- *   + Verify columns cannot be DnD'd
- *   + Alphabetical order always
- * - UI cleanliness
- *   + Keybindings work
- *   + Some widget has focus by default
- *   + Escape / enter work
- *   + Close button works
- */
-
-/* FIXME: we should disable/enable the subscribe/unsubscribe buttons as
- * appropriate when only a single message is selected. We need a
- * mechanism to learn when the selected folder's subscription status
- * changes, so when the user double-clicks it (eg) the buttons can
- * (de)sensitize appropriately. See Ximian bug #7673.
- */
-
-/*#define NEED_TOGGLE_SELECTION*/
-
-typedef struct _FolderETree              FolderETree;
-typedef struct _FolderETreeClass         FolderETreeClass;
-
-typedef void (*FolderETreeActivityCallback) (int level, gpointer user_data);
-
-struct _FolderETree {
-	ETreeMemory parent;
-	ETreePath root;
-
-	GHashTable *scan_ops;
-	GHashTable *subscribe_ops;
-
-	GHashTable *node_full_name;
-
-	CamelStore *store;
-	EvolutionStorage *e_storage;
-	char *service_name;
-	char *search;
-
-	FolderETreeActivityCallback activity_cb;
-	gpointer activity_data;
-	int activity_level;
-};
-
-struct _FolderETreeClass {
-	ETreeMemoryClass parent;
-};
-
-static GtkObjectClass *folder_etree_parent_class = NULL;
-
-typedef struct _FolderETreeExtras      FolderETreeExtras;
-typedef struct _FolderETreeExtrasClass FolderETreeExtrasClass;
-
-enum {
-	FOLDER_COL_SUBSCRIBED,
-	FOLDER_COL_NAME,
-	FOLDER_COL_LAST
-};
-
-struct _FolderETreeExtras {
-	ETableExtras parent;
-	GdkPixbuf *toggles[2];
-};
-
-struct _FolderETreeExtrasClass {
-	ETableExtrasClass parent;
-};
-
-static GtkObjectClass *ftree_extras_parent_class = NULL;
-
-/* util */
-
-static void
-recursive_add_folder (EvolutionStorage *storage, const char *path, const char *name, const char *url)
-{
-	char *parent, *pname, *p;
-
-	p = strrchr (path, '/');
-	if (p && p != path) {
-		parent = g_strndup (path, p - path);
-		if (!evolution_storage_folder_exists (storage, parent)) {
-			p = strrchr (parent, '/');
-			if (p)
-				pname = g_strdup (p + 1);
-			else
-				pname = g_strdup ("");
-			recursive_add_folder (storage, parent, pname, "");
-			g_free (pname);
-		}
-		g_free (parent);
-	}
-
-	evolution_storage_new_folder (storage, path, name, "mail", url, name, NULL, FALSE, TRUE, 0);
-}
-
-/* ** Get one level of folderinfo ****************************************** */
-
-typedef void (*SubscribeShortFolderinfoFunc) (CamelStore *store, char *prefix, CamelFolderInfo *info, gpointer data);
-
-int subscribe_get_short_folderinfo (FolderETree *ftree, const char *prefix,
-				    SubscribeShortFolderinfoFunc func, gpointer user_data);
-
-struct _get_short_folderinfo_msg {
-	struct _mail_msg msg;
-
-	char *prefix;
-
-	FolderETree *ftree;
-	CamelFolderInfo *info;
-
-	SubscribeShortFolderinfoFunc func;
-	gpointer user_data;
-};
-
-static char *
-get_short_folderinfo_desc (struct _mail_msg *mm, int done)
-{
-	struct _get_short_folderinfo_msg *m = (struct _get_short_folderinfo_msg *) mm;
-	char *ret, *name;
-
-	name = camel_service_get_name (CAMEL_SERVICE (m->ftree->store), TRUE);
-
-	if (m->prefix)
-		ret = g_strdup_printf (_("Scanning folders under %s on \"%s\""), m->prefix, name);
-	else
-		ret = g_strdup_printf (_("Scanning root-level folders on \"%s\""), name);
-
-	g_free (name);
-	return ret;
-}
-
-static void
-get_short_folderinfo_get (struct _mail_msg *mm)
-{
-	struct _get_short_folderinfo_msg *m = (struct _get_short_folderinfo_msg *) mm;
-
-	m->info = camel_store_get_folder_info (m->ftree->store, m->prefix, CAMEL_STORE_FOLDER_INFO_FAST, &mm->ex);
-}
-
-static void
-get_short_folderinfo_got (struct _mail_msg *mm)
-{
-	struct _get_short_folderinfo_msg *m = (struct _get_short_folderinfo_msg *) mm;
-
-	if (camel_exception_is_set (&mm->ex))
-		g_warning ("Error getting folder info from store at %s: %s",
-			   camel_service_get_url (CAMEL_SERVICE (m->ftree->store)),
-			   camel_exception_get_description (&mm->ex));
-
-	m->ftree->activity_level--;
-	(m->ftree->activity_cb) (m->ftree->activity_level, m->ftree->activity_data);
-
-	/* 'done' is probably guaranteed to fail, but... */
-
-	if (m->func)
-		m->func (m->ftree->store, m->prefix, m->info, m->user_data);
-}
-
-static void
-get_short_folderinfo_free (struct _mail_msg *mm)
-{
-	struct _get_short_folderinfo_msg *m = (struct _get_short_folderinfo_msg *) mm;
-
-	camel_store_free_folder_info (m->ftree->store, m->info);
-	g_object_unref((m->ftree));
-
-	g_free (m->prefix); /* may be NULL but that's ok */
-}
-
-static struct _mail_msg_op get_short_folderinfo_op = {
-	get_short_folderinfo_desc,
-	get_short_folderinfo_get,
-	get_short_folderinfo_got,
-	get_short_folderinfo_free,
-};
-
-int
-subscribe_get_short_folderinfo (FolderETree *ftree, 
-				const char *prefix,
-				SubscribeShortFolderinfoFunc func, 
-				gpointer user_data)
-{
-	struct _get_short_folderinfo_msg *m;
-	int id;
-
-	m = mail_msg_new (&get_short_folderinfo_op, NULL, sizeof(*m));
-
-	m->ftree = ftree;
-	g_object_ref((ftree));
-	m->prefix = g_strdup (prefix);
-	m->func = func;
-	m->user_data = user_data;
-
-	ftree->activity_level++;
-	(ftree->activity_cb) (ftree->activity_level, ftree->activity_data);
-
-	id = m->msg.seq;
-	e_thread_put (mail_thread_queued, (EMsg *)m);
-	return id;
-}
-
-/* ** Subscribe folder operation **************************************** */
-
-typedef void (*SubscribeFolderCallback) (const char *, const char *, gboolean, gboolean, gpointer);
-
-struct _subscribe_msg {
-	struct _mail_msg         msg;
-
-	CamelStore              *store;
-	gboolean                 subscribe;
-	char                    *full_name;
-	char                    *name;
-
-	SubscribeFolderCallback  cb;
-	gpointer                 cb_data;
-};
-
-static char *
-subscribe_folder_desc (struct _mail_msg *mm, int done)
-{
-	struct _subscribe_msg *m = (struct _subscribe_msg *) mm;
-
-	if (m->subscribe)
-		return g_strdup_printf (_("Subscribing to folder \"%s\""), m->name);
-	else
-		return g_strdup_printf (_("Unsubscribing to folder \"%s\""), m->name);
-}
-
-static void 
-subscribe_folder_subscribe (struct _mail_msg *mm)
-{
-	struct _subscribe_msg *m = (struct _subscribe_msg *) mm;
-	
-	if (m->subscribe)
-		camel_store_subscribe_folder (m->store, m->full_name, &mm->ex);
-	else
-		camel_store_unsubscribe_folder (m->store, m->full_name, &mm->ex);
-}
-
-static void 
-subscribe_folder_subscribed (struct _mail_msg *mm)
-{
-	struct _subscribe_msg *m = (struct _subscribe_msg *) mm;
-	
-	if (m->cb)
-		(m->cb) (m->full_name, m->name, m->subscribe, 
-			 !camel_exception_is_set (&mm->ex), m->cb_data);
-}
-
-static void 
-subscribe_folder_free (struct _mail_msg *mm)
-{
-	struct _subscribe_msg *m = (struct _subscribe_msg *) mm;
-
-	g_free (m->name);
-	g_free (m->full_name);
-	
-	camel_object_unref (m->store);
-}
-
-static struct _mail_msg_op subscribe_folder_op = {
-	subscribe_folder_desc,
-	subscribe_folder_subscribe,
-	subscribe_folder_subscribed,
-	subscribe_folder_free,
-};
-
-static int
-subscribe_do_subscribe_folder (CamelStore *store, const char *full_name, const char *name,
-			       gboolean subscribe, SubscribeFolderCallback cb, gpointer cb_data)
-{
-	struct _subscribe_msg *m;
-	int id;
-
-	g_return_val_if_fail (CAMEL_IS_STORE (store), 0);
-	g_return_val_if_fail (full_name, 0);
-
-	m            = mail_msg_new (&subscribe_folder_op, NULL, sizeof(*m));
-	m->store     = store;
-	m->subscribe = subscribe;
-	m->name      = g_strdup (name);
-	m->full_name = g_strdup (full_name);
-	m->cb        = cb;
-	m->cb_data   = cb_data;
-
-	camel_object_ref(store);
-
-	id = m->msg.seq;
-	e_thread_put (mail_thread_queued, (EMsg *)m);
-	return id;
-}
-
-/* ** FolderETree Extras *************************************************** */
-
-static void
-fete_finalise (GObject *object)
-{
-	FolderETreeExtras *extras = (FolderETreeExtras *) object;
-
-	g_object_unref (extras->toggles[0]);
-	g_object_unref (extras->toggles[1]);
-
-	((GObjectClass *)ftree_extras_parent_class)->finalize (object);
-}
-
-static void
-fete_class_init (GObjectClass *object_class)
-{
-	object_class->finalize = fete_finalise;
-
-	ftree_extras_parent_class = g_type_class_ref (E_TABLE_EXTRAS_TYPE);
-}
-
-static void
-fete_init (GtkObject *object)
-{
-	FolderETreeExtras *extras = (FolderETreeExtras *) object;
-	ECell             *cell;
-	ECell             *text_cell;
-
-	/* text column */
-
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	text_cell = cell;
-	g_object_set (G_OBJECT (cell),
-		      "bold_column", FOLDER_COL_SUBSCRIBED,
-		      NULL);
-	e_table_extras_add_cell (E_TABLE_EXTRAS (extras), "cell_text", cell);
-
-	/* toggle column */
-
-	extras->toggles[0] = gdk_pixbuf_new_from_xpm_data ((const char **)empty_xpm);
-	extras->toggles[1] = gdk_pixbuf_new_from_xpm_data ((const char **)mark_xpm);
-	cell = e_cell_toggle_new (0, 2, extras->toggles);
-	e_table_extras_add_cell (E_TABLE_EXTRAS (extras), "cell_toggle", cell);
-
-	/* tree cell */
-
-	cell = e_cell_tree_new (NULL, NULL, TRUE, text_cell);
-	e_table_extras_add_cell (E_TABLE_EXTRAS (extras), "cell_tree", cell);
-
-	/* misc */
-
-	e_table_extras_add_pixbuf (E_TABLE_EXTRAS (extras), "subscribed-image", extras->toggles[1]);
-}
-
-/* naughty! */
-static
-E_MAKE_TYPE (fete, "FolderETreeExtras", FolderETreeExtras, fete_class_init, fete_init, E_TABLE_EXTRAS_TYPE);
-
-/* ** Global Extras ******************************************************** */
-
-static FolderETreeExtras *global_extras = NULL;
-
-static void
-global_extras_destroyed (void *user_data, GObject *obj)
-{
-	global_extras = NULL;
-}
-
-static ETableExtras *
-subscribe_get_global_extras (void)
-{
-	if (global_extras == NULL) {
-		global_extras = g_object_new (fete_get_type(), NULL);
-		g_object_ref(global_extras);
-		gtk_object_sink((GtkObject *)global_extras);
-		g_object_weak_ref(G_OBJECT(global_extras), global_extras_destroyed, NULL);
-	} else {
-		g_object_ref(global_extras);
-	}
-
-	return E_TABLE_EXTRAS (global_extras);
-}
-
-/* ** Folder Tree Node ***************************************************** */
-
-typedef struct _ftree_node ftree_node;
-
-struct _ftree_node {
-	guint8    flags;
-	char *cache;
-	int uri_offset;
-	int full_name_offset;
-
-	/* format: {name}{\0}{uri}{\0}{full_name}{\0}
-	 * (No braces). */
-	char data[1];
-};
-
-#define FTREE_NODE_GOT_CHILDREN (1 << 0)
-#define FTREE_NODE_SUBSCRIBABLE (1 << 1)
-#define FTREE_NODE_SUBSCRIBED   (1 << 2)
-#define FTREE_NODE_ROOT         (1 << 3)
-
-static ftree_node *
-ftree_node_new_root (const char *prefix)
-{
-	ftree_node *node;
-	size_t      size;
-
-	if (prefix == NULL)
-		prefix = "";
-
-	size = sizeof (ftree_node) + strlen (prefix) + 1;
-
-	node = g_malloc (size);
-	node->flags = FTREE_NODE_ROOT;
-	node->uri_offset = 0;
-	node->full_name_offset = 1;
-	node->data[0] = '\0';
-	strcpy (node->data + 1, prefix);
-	
-	return node;
-}
-
-static ftree_node *
-ftree_node_new (CamelStore *store, CamelFolderInfo *fi)
-{
-	ftree_node *node;
-	int         uri_offset, full_name_offset;
-	size_t      size;
-	CamelURL   *url;
-
-	uri_offset       = strlen (fi->name) + 1;
-	full_name_offset = uri_offset + strlen (fi->url) + 1;
-	size             = full_name_offset + strlen (fi->full_name);
-  
-	/* - 1 for sizeof(node.data) but +1 for terminating \0 */
-	node = g_malloc (sizeof (*node) + size);
-
-	node->cache = NULL;
-	
-	/* Noselect? */
-
-	url = camel_url_new (fi->url, NULL);
-	if (camel_url_get_param (url, "noselect"))
-		node->flags = 0;
-	else
-		node->flags = FTREE_NODE_SUBSCRIBABLE;
-	camel_url_free (url);
-
-	/* subscribed? */
-
-	if (camel_store_folder_subscribed (store, fi->full_name))
-		node->flags |= FTREE_NODE_SUBSCRIBED;
-
-	/* Copy strings */
-
-	node->uri_offset       = uri_offset;
-	node->full_name_offset = full_name_offset;
-
-	strcpy (node->data, fi->name);
-	strcpy (node->data + uri_offset, fi->url);
-	strcpy (node->data + full_name_offset, fi->full_name);
-
-	/* Done */
-
-	return node;
-}
-
-#define ftree_node_subscribable(node)  ( ((ftree_node *) (node))->flags & FTREE_NODE_SUBSCRIBABLE )
-#define ftree_node_subscribed(node)    ( ((ftree_node *) (node))->flags & FTREE_NODE_SUBSCRIBED )
-#define ftree_node_get_name(node)      ( ((ftree_node *) (node))->data )
-#define ftree_node_get_full_name(node) ( ((ftree_node *) (node))->data + ((ftree_node *) (node))->full_name_offset )
-#define ftree_node_get_uri(node)       ( ((ftree_node *) (node))->data + ((ftree_node *) (node))->uri_offset )
-
-/* ** Folder Tree Model **************************************************** */
-
-/* A subscribe or scan operation */
-
-typedef struct _ftree_op_data ftree_op_data;
-
-struct _ftree_op_data {
-	FolderETree *ftree;
-	ETreePath path;
-	ftree_node *data;
-	int handle;
-};
-
-
-/* ETreeModel functions */
-
-static int
-fe_column_count (ETreeModel *etm)
-{
-	return FOLDER_COL_LAST;
-}
-
-static void *
-fe_duplicate_value (ETreeModel *etm, int col, const void *val)
-{
-	return g_strdup (val);
-}
-
-static void
-fe_free_value (ETreeModel *etm, int col, void *val)
-{
-	g_free (val);
-}
-
-static void*
-fe_init_value (ETreeModel *etm, int col)
-{
-	return g_strdup ("");
-}
-
-static gboolean
-fe_value_is_empty (ETreeModel *etm, int col, const void *val)
-{
-	return !(val && *(char *)val);
-}
-
-static char *
-fe_value_to_string (ETreeModel *etm, int col, const void *val)
-{
-	return g_strdup (val);
-}
-
-static GdkPixbuf *
-fe_icon_at (ETreeModel *etree, ETreePath path)
-{
-	return NULL; /* XXX no icons for now */
-}
-
-static gpointer
-fe_root_value_at (FolderETree *ftree, int col)
-{
-	switch (col) {
-	case FOLDER_COL_NAME:
-		return ftree->service_name;
-	case FOLDER_COL_SUBSCRIBED:
-		return GINT_TO_POINTER (0);
-	default:
-		printf ("Oh no, unimplemented column %d in subscribe dialog\n", col);
-	}
-
-	return NULL;
-}
-
-static gpointer
-fe_real_value_at (FolderETree *ftree, int col, gpointer data)
-{
-	switch (col) {
-	case FOLDER_COL_NAME:
-		return ftree_node_get_name (data);
-	case FOLDER_COL_SUBSCRIBED:
-		if (ftree_node_subscribed (data))
-			return GINT_TO_POINTER (1);
-		return GINT_TO_POINTER (0);
-	default:
-		printf ("Oh no, unimplemented column %d in subscribe dialog\n", col);
-	}
-	
-	return NULL;
-}
-
-static void *
-fe_value_at (ETreeModel *etree, ETreePath path, int col)
-{
-	FolderETree *ftree = (FolderETree *) etree;
-	gpointer node_data;
-	
-	if (path == ftree->root)
-		return fe_root_value_at (ftree, col);
-
-	node_data = e_tree_memory_node_get_data (E_TREE_MEMORY (etree), path);
-	return fe_real_value_at (ftree, col, node_data);
-}
-
-static void
-fe_set_value_at (ETreeModel *etree, ETreePath path, int col, const void *val)
-{
-	/* nothing */
-}
-
-static gboolean
-fe_return_false (void)
-{
-	return FALSE;
-}
-
-static gint
-fe_sort_folder (ETreeMemory *etmm, ETreePath left, ETreePath right, gpointer user_data)
-{
-	ftree_node *n_left, *n_right;
-
-	n_left = e_tree_memory_node_get_data (etmm, left);
-	n_right = e_tree_memory_node_get_data (etmm, right);
-
-	/* if in utf8 locale ? */
-	return strcasecmp (ftree_node_get_name (n_left), ftree_node_get_name (n_right));
-}
-
-/* scanning */
-static void
-fe_got_children (CamelStore *store, char *prefix, CamelFolderInfo *info, gpointer data)
-{
-	ftree_op_data *closure = (ftree_op_data *) data;
-
-	if (!info) /* cancelled */
-		return;
-
-	if (!prefix)
-		prefix = "";
-
-	for ( ; info; info = info->sibling) {
-		ETreePath   child_path;
-		ftree_node *node;
-
-		if (g_hash_table_lookup(closure->ftree->node_full_name, info->full_name))
-			continue;
-
-		node = ftree_node_new (store, info);
-		child_path = e_tree_memory_node_insert (E_TREE_MEMORY (closure->ftree),
-							closure->path,
-							0,
-							node);
-		g_hash_table_insert(closure->ftree->node_full_name, ftree_node_get_full_name(node), child_path);
-	}
-
-	e_tree_memory_sort_node (E_TREE_MEMORY (closure->ftree), 
-				 closure->path,
-				 fe_sort_folder,
-				 NULL);
-
-	if (closure->data)
-		closure->data->flags |= FTREE_NODE_GOT_CHILDREN;
-
-	g_hash_table_remove (closure->ftree->scan_ops, closure->path);
-	g_free (closure);
-}
-
-static void
-fe_check_for_children (FolderETree *ftree, ETreePath path)
-{
-	ftree_op_data *closure;
-	ftree_node *node;
-	char *prefix;
-
-	node = e_tree_memory_node_get_data (E_TREE_MEMORY (ftree), path);
-
-	/* have we already gotten these children? */
-	if (node->flags & FTREE_NODE_GOT_CHILDREN)
-		return;
-
-	/* or we're loading them right now? */
-	if (g_hash_table_lookup (ftree->scan_ops, path))
-		return;
-
-	/* figure out our search prefix */
-	if (path == ftree->root)
-		prefix = ftree->search;
-	else
-		prefix = ftree_node_get_full_name (node);
-
-	closure = g_new (ftree_op_data, 1);
-	closure->ftree = ftree;
-	closure->path = path;
-	closure->data = node;
-	closure->handle = -1;
-
-	g_hash_table_insert (ftree->scan_ops, path, closure);
-
-	/* FIXME. Tiny race possiblity I guess. */
-
-	closure->handle = subscribe_get_short_folderinfo (ftree, prefix, fe_got_children, closure);
-}
-
-static void
-fe_create_root_node (FolderETree *ftree)
-{
-	ftree_node *node;
-
-	node = ftree_node_new_root (ftree->search);
-	ftree->root = e_tree_memory_node_insert (E_TREE_MEMORY(ftree), NULL, 0, node);
-	fe_check_for_children (ftree, ftree->root);
-}
-
-static ETreePath
-fe_get_first_child (ETreeModel *model, ETreePath path)
-{
-	ETreePath child_path;
-
-	child_path = E_TREE_MODEL_CLASS (folder_etree_parent_class)->get_first_child (model, path);
-	if (child_path)
-		fe_check_for_children ((FolderETree *) model, child_path);
-	else
-		fe_check_for_children ((FolderETree *) model, path);
-	return child_path;
-}
-
-/* subscribing */
-static void
-fe_done_subscribing (const char *full_name, const char *name, gboolean subscribe, gboolean success, gpointer user_data)
-{
-	ftree_op_data *closure = (ftree_op_data *) user_data;
-
-	if (success && closure->handle != -1) {
-		char *path;
-		
-		path = g_strdup_printf ("/%s", full_name);
-		
-		if (subscribe) {
-			closure->data->flags |= FTREE_NODE_SUBSCRIBED;
-			recursive_add_folder (closure->ftree->e_storage,
-					      path, name,
-					      ftree_node_get_uri (closure->data));
-		} else {
-			closure->data->flags &= ~FTREE_NODE_SUBSCRIBED;
-
-			/* FIXME: recursively remove folder as well? Possible? */
-		}
-
-		g_free (path);
-		e_tree_model_node_data_changed (E_TREE_MODEL (closure->ftree), closure->path);
-	}
-
-	if (closure->handle != -1)
-		g_hash_table_remove (closure->ftree->subscribe_ops, closure->path);
-
-	g_free (closure);
-}
-
-/* cleanup */
-
-static gboolean
-fe_cancel_op_foreach (gpointer key, gpointer value, gpointer user_data)
-{
-	/*FolderETree   *ftree = (FolderETree *) user_data;*/
-	ftree_op_data *closure = (ftree_op_data *) value;
-
-	if (closure->handle != -1)
-		mail_msg_cancel (closure->handle);
-
-	closure->handle = -1;
-
-	return TRUE;
-}
-
-static void
-fe_kill_current_tree (FolderETree *ftree)
-{
-	g_hash_table_foreach_remove (ftree->scan_ops, fe_cancel_op_foreach, ftree);
-	g_assert (g_hash_table_size (ftree->scan_ops) == 0);
-}
-
-static void
-fe_finalise (GObject *obj)
-{
-	FolderETree *ftree = (FolderETree *) (obj);
-
-	fe_kill_current_tree (ftree);
-
-	g_hash_table_foreach_remove (ftree->subscribe_ops, fe_cancel_op_foreach, ftree);
-	
-	g_hash_table_destroy (ftree->scan_ops);
-	g_hash_table_destroy (ftree->subscribe_ops);
-	g_hash_table_destroy(ftree->node_full_name);
-
-	camel_object_unref (ftree->store);
-	bonobo_object_unref (BONOBO_OBJECT (ftree->e_storage));
-
-	g_free (ftree->search);
-	g_free (ftree->service_name);
-
-	((GObjectClass *)folder_etree_parent_class)->finalize(obj);
-}
-
-typedef gboolean (*bool_func_1) (ETreeModel *, ETreePath, int);
-typedef gboolean (*bool_func_2) (ETreeModel *);
-
-static void
-folder_etree_class_init (GObjectClass *klass)
-{
-	ETreeModelClass  *etree_model_class = E_TREE_MODEL_CLASS (klass);
-
-	folder_etree_parent_class = g_type_class_ref (E_TREE_MEMORY_TYPE);
-
-	klass->finalize                         = fe_finalise;
-
-	etree_model_class->value_at             = fe_value_at;
-	etree_model_class->set_value_at         = fe_set_value_at;
-	etree_model_class->column_count         = fe_column_count;
-	etree_model_class->duplicate_value      = fe_duplicate_value;
-	etree_model_class->free_value           = fe_free_value;
-	etree_model_class->initialize_value     = fe_init_value;
-	etree_model_class->value_is_empty       = fe_value_is_empty;
-	etree_model_class->value_to_string      = fe_value_to_string;
-	etree_model_class->icon_at              = fe_icon_at;
-	etree_model_class->is_editable          = (bool_func_1) fe_return_false;
-	etree_model_class->has_save_id          = (bool_func_2) fe_return_false;
-	etree_model_class->has_get_node_by_id   = (bool_func_2) fe_return_false;
-	etree_model_class->get_first_child      = fe_get_first_child;
-}
-
-static void
-folder_etree_init (GtkObject *object)
-{
-	FolderETree *ftree = (FolderETree *) object;
-
-	e_tree_memory_set_node_destroy_func (E_TREE_MEMORY (ftree), (GFunc) g_free, ftree);
-
-	ftree->scan_ops = g_hash_table_new (g_direct_hash, g_direct_equal);
-	ftree->subscribe_ops = g_hash_table_new (g_direct_hash, g_direct_equal);
-
-	ftree->search = g_strdup ("");
-
-	ftree->activity_level = 0;
-	ftree->node_full_name = g_hash_table_new(g_str_hash, g_str_equal);
-}
-
-static FolderETree *
-folder_etree_construct (FolderETree *ftree,
-			CamelStore  *store,
-			FolderETreeActivityCallback activity_cb,
-			gpointer                    activity_data)
-{
-	e_tree_memory_construct (E_TREE_MEMORY (ftree));
-	
-	ftree->store = store;
-	camel_object_ref (store);
-	
-	ftree->service_name = camel_service_get_name (CAMEL_SERVICE (store), FALSE);
-	
-	ftree->e_storage = mail_lookup_storage (store); /* this gives us a ref */
-
-	ftree->activity_cb = activity_cb;
-	ftree->activity_data = activity_data;
-
-	fe_create_root_node (ftree);
-
-	return ftree;
-}
-
-static
-E_MAKE_TYPE (folder_etree, "FolderETree", FolderETree, folder_etree_class_init, folder_etree_init, E_TREE_MEMORY_TYPE);
-
-/* public */
-
-static FolderETree *
-folder_etree_new (CamelStore *store,
-		  FolderETreeActivityCallback activity_cb,
-		  gpointer                    activity_data)
-{
-	FolderETree *ftree;
-
-	ftree = g_object_new (folder_etree_get_type(), NULL);
-	ftree = folder_etree_construct (ftree, store, activity_cb, activity_data);
-	return ftree;
-}
-
-static void
-folder_etree_clear_tree (FolderETree *ftree)
-{
-	e_tree_memory_freeze (E_TREE_MEMORY (ftree));
-	e_tree_memory_node_remove (E_TREE_MEMORY (ftree), ftree->root);
-	fe_create_root_node (ftree);
-	g_hash_table_destroy(ftree->node_full_name);
-	ftree->node_full_name = g_hash_table_new(g_str_hash, g_str_equal);
-	e_tree_memory_thaw (E_TREE_MEMORY (ftree));
-}
-
-static void
-folder_etree_set_search (FolderETree *ftree, const char *search)
-{
-	if (!strcmp (search, ftree->search))
-		return;
-
-	g_free (ftree->search);
-	ftree->search = g_strdup (search);
-	
-	folder_etree_clear_tree (ftree);
-}
-
-
-static int
-folder_etree_path_set_subscription (FolderETree *ftree, ETreePath path, gboolean subscribe)
-{
-	ftree_op_data *closure;
-	ftree_node    *node;
-
-	/* already in progress? */
-
-	if (g_hash_table_lookup (ftree->subscribe_ops, path))
-		return 0;
-
-	/* noselect? */
-
-	node = e_tree_memory_node_get_data (E_TREE_MEMORY (ftree), path);
-
-	if (!ftree_node_subscribable (node))
-		return -1;
-
-	/* noop? */
-
-	/* uh, this should be a not XOR or something */
-	if ((ftree_node_subscribed (node) && subscribe) ||
-	    (!ftree_node_subscribed (node) && !subscribe))
-		return 0;
-
-	closure         = g_new (ftree_op_data, 1);
-	closure->ftree  = ftree;
-	closure->path   = path;
-	closure->data   = node;
-	closure->handle = -1;
-
-	g_hash_table_insert (ftree->subscribe_ops, path, closure);
-
-	closure->handle = subscribe_do_subscribe_folder (ftree->store,
-							 ftree_node_get_full_name (node),
-							 ftree_node_get_name (node),
-							 subscribe,
-							 fe_done_subscribing,
-							 closure);
-	return 0;
-}
-
-static int
-folder_etree_path_toggle_subscription (FolderETree *ftree, ETreePath path)
-{
-	ftree_node *node = e_tree_memory_node_get_data (E_TREE_MEMORY (ftree), path);
-
-	if (ftree_node_subscribed (node))
-		return folder_etree_path_set_subscription (ftree, path, FALSE);
-	else
-		return folder_etree_path_set_subscription (ftree, path, TRUE);
-}
-
-/* ** StoreData ************************************************************ */
-
-typedef struct _StoreData StoreData;
-
-typedef void (*StoreDataStoreFunc) (StoreData *, CamelStore *, gpointer);
-
-struct _StoreData {
-	int refcount;
-	char *uri;
-	
-	FolderETree *ftree;
-	CamelStore *store;
-	
-	int request_id;
-	
-	GtkWidget *widget;
-	StoreDataStoreFunc store_func;
-	gpointer store_data;
-};
-
-static StoreData *
-store_data_new (const char *uri)
-{
-	StoreData *sd;
-	
-	sd = g_new0 (StoreData, 1);
-	sd->refcount = 1;
-	sd->uri = g_strdup (uri);
-	
-	return sd;
-}
-
-static void
-store_data_free (StoreData *sd)
-{
-	if (sd->request_id)
-		mail_msg_cancel (sd->request_id);
-	
-	if (sd->widget)
-		g_object_unref(sd->widget);
-	
-	if (sd->ftree)
-		g_object_unref(sd->ftree);
-	
-	if (sd->store)
-		camel_object_unref (sd->store);
-	
-	g_free (sd->uri);
-	g_free (sd);
-}
-
-static void
-store_data_ref (StoreData *sd)
-{
-	sd->refcount++;
-}
-
-static void
-store_data_unref (StoreData *sd)
-{
-	if (sd->refcount <= 1) {
-		store_data_free (sd);
-	} else {
-		sd->refcount--;
-	}
-}
-
-static void
-sd_got_store (char *uri, CamelStore *store, gpointer user_data)
-{
-	StoreData *sd = (StoreData *) user_data;
-	
-	sd->store = store;
-	
-	if (store) /* we can have exceptions getting the store... server is down, eg */
-		camel_object_ref (sd->store);
-	
-	/* uh, so we might have a problem if this operation is cancelled. Unsure. */
-	sd->request_id = 0;
-	
-	if (sd->store_func)
-		(sd->store_func) (sd, sd->store, sd->store_data);
-	
-	store_data_unref (sd);
-}
-
-static void
-store_data_async_get_store (StoreData *sd, StoreDataStoreFunc func, gpointer user_data)
-{
-	if (sd->request_id) {
-		d(printf ("Already loading store, nooping\n"));
-		return;
-	}
-	
-	if (sd->store) {
-		/* um, is this the best behavior? */
-		func (sd, sd->store, user_data);
-		return;
-	}
-	
-	sd->store_func = func;
-	sd->store_data = user_data;
-	store_data_ref (sd);
-	sd->request_id = mail_get_store (sd->uri, sd_got_store, sd);
-}
-
-static void
-store_data_cancel_get_store (StoreData *sd)
-{
-	g_return_if_fail (sd->request_id);
-
-	mail_msg_cancel (sd->request_id);
-	sd->request_id = 0;
-}
-
-static void
-sd_toggle_cb (ETree *tree, int row, ETreePath path, int col, GdkEvent *event, gpointer user_data)
-{
-	StoreData *sd = (StoreData *) user_data;
-
-	folder_etree_path_toggle_subscription (sd->ftree, path);
-}
-
-static GtkWidget *
-store_data_get_widget (StoreData *sd, 
-		       FolderETreeActivityCallback activity_cb,
-		       gpointer                    activity_data)
-{
-	GtkWidget *tree;
-
-	if (!sd->store) {
-		d(printf ("store data can't get widget before getting store.\n"));
-		return NULL;
-	}
-
-	if (sd->widget)
-		return sd->widget;
-
-	sd->ftree = folder_etree_new (sd->store, activity_cb, activity_data);
-
-	/* You annoy me, etree! */
-	tree = gtk_widget_new (E_TREE_SCROLLED_TYPE,
-			       "hadjustment", NULL,
-			       "vadjustment", NULL,
-			       NULL);
-
-	tree = (GtkWidget *) e_tree_scrolled_construct_from_spec_file (E_TREE_SCROLLED (tree),
-								       E_TREE_MODEL (sd->ftree),
-								       subscribe_get_global_extras (),
-								       EVOLUTION_ETSPECDIR "/subscribe-dialog.etspec",
-								       NULL);
-	e_tree_root_node_set_visible (e_tree_scrolled_get_tree(E_TREE_SCROLLED(tree)), TRUE);
-	g_signal_connect(e_tree_scrolled_get_tree(E_TREE_SCROLLED (tree)),
-			 "double_click", G_CALLBACK (sd_toggle_cb), sd);
-
-	g_object_unref(global_extras);
-
-	sd->widget = tree;
-	g_object_ref(sd->widget);
-
-	return sd->widget;
-}
-
-typedef struct _selection_closure {
-	StoreData *sd;
-	enum { SET, CLEAR, TOGGLE } mode;
-} selection_closure;
-
-static void
-sd_subscribe_folder_foreach (int model_row, gpointer closure)
-{
-	selection_closure *sc   = (selection_closure *) closure;
-	StoreData         *sd   = sc->sd;
-	ETree             *tree = e_tree_scrolled_get_tree(E_TREE_SCROLLED(sd->widget));
-	ETreePath          path = e_tree_node_at_row (tree, model_row);
-
-	/* ignore results */
-	switch (sc->mode) {
-	case SET:
-		folder_etree_path_set_subscription (sd->ftree, path, TRUE);
-		break;
-	case CLEAR:
-		folder_etree_path_set_subscription (sd->ftree, path, FALSE);
-		break;
-	case TOGGLE:
-		folder_etree_path_toggle_subscription (sd->ftree, path);
-		break;
-	}
-}
-
-static void
-store_data_selection_set_subscription (StoreData *sd, gboolean subscribe)
-{
-	selection_closure sc;
-	ETree *tree;
-	
-	sc.sd = sd;
-	if (subscribe)
-		sc.mode = SET;
-	else
-		sc.mode = CLEAR;
-
-	tree = e_tree_scrolled_get_tree (E_TREE_SCROLLED (sd->widget));
-	e_tree_selected_row_foreach (tree, sd_subscribe_folder_foreach, &sc);
-}
-
-#ifdef NEED_TOGGLE_SELECTION
-static void
-store_data_selection_toggle_subscription (StoreData *sd)
-{
-	selection_closure  sc;
-	ETree             *tree;
-	
-	sc.sd   = sd;
-	sc.mode = TOGGLE;
-
-	tree = e_tree_scrolled_get_tree (E_TREE_SCROLLED (sd->widget));
-	e_tree_selected_row_foreach (tree, sd_subscribe_folder_foreach, &sc);
-}
-#endif
-
-static gboolean
-store_data_mid_request (StoreData *sd)
-{
-	return (gboolean) sd->request_id;
-}
-
-/* ** yaay, SubscribeDialog ******************************************************* */
-
-#define PARENT_TYPE (gtk_object_get_type ())
-
-#ifdef JUST_FOR_TRANSLATORS
-static char *str = N_("Folder");
-#endif
-
-#define STORE_DATA_KEY   "store-data"
-
-struct _SubscribeDialogPrivate {
-	GladeXML  *xml;
-	GList     *store_list;
-
-	StoreData *current_store;
-	GtkWidget *current_widget;
-
-	GtkWidget *default_widget;
-	GtkWidget *none_item;
-	GtkWidget *search_entry;
-	GtkWidget *hbox;
-	GtkWidget *filter_radio, *all_radio;
-	GtkWidget *sub_button, *unsub_button, *refresh_button, *close_button;
-	GtkWidget *progress;
-	GtkWidget *appbar;
-
-	guint activity_timeout_id;
-};
-
-static GtkObjectClass *subscribe_dialog_parent_class;
-
-static void
-sc_refresh_pressed (GtkWidget *widget, gpointer user_data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
-
-	if (sc->priv->current_store)
-		folder_etree_clear_tree (sc->priv->current_store->ftree);
-}
-
-static void
-sc_search_activated (GtkWidget *widget, gpointer user_data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
-	StoreData       *store = sc->priv->current_store;
-
-	if (!store)
-		return;
-
-	folder_etree_set_search (store->ftree, gtk_entry_get_text (GTK_ENTRY (widget)));
-}
-
-static void
-sc_close_pressed (GtkWidget *widget, gpointer user_data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
-
-	gtk_widget_destroy (GTK_WIDGET (sc->app));
-}
-
-static void
-sc_subscribe_pressed (GtkWidget *widget, gpointer user_data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
-	StoreData       *store = sc->priv->current_store;
-
-	if (!store)
-		return;
-
-	store_data_selection_set_subscription (store, TRUE);
-}
-
-static void
-sc_unsubscribe_pressed (GtkWidget *widget, gpointer user_data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
-	StoreData *store = sc->priv->current_store;
-
-	if (!store)
-		return;
-
-	store_data_selection_set_subscription (store, FALSE);
-}
-
-static void
-sc_all_toggled (GtkWidget *widget, gpointer user_data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
-	StoreData       *store = sc->priv->current_store;
-
-	if (!store)
-		return;
-
-	if (GTK_TOGGLE_BUTTON (widget)->active) {
-		gtk_widget_set_sensitive (sc->priv->search_entry, FALSE);
-		folder_etree_set_search (store->ftree, "");
-	}
-}
-
-static void
-sc_filter_toggled (GtkWidget *widget, gpointer user_data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
-	StoreData       *store = sc->priv->current_store;
-
-	if (!store)
-		return;
-
-	if (GTK_TOGGLE_BUTTON (widget)->active) {
-		gtk_widget_set_sensitive (sc->priv->search_entry, TRUE);
-		sc_search_activated (sc->priv->search_entry, sc);
-	}
-}
-
-static void
-populate_store_foreach (MailConfigAccount *account, SubscribeDialog *sc)
-{
-	StoreData *sd;
-	
-	if (!account->enabled || !account->source || !account->source->url)
-		return;
-	
-	sd = store_data_new (account->source->url);
-	sc->priv->store_list = g_list_prepend (sc->priv->store_list, sd);
-}
-
-static void
-kill_default_view (SubscribeDialog *sc)
-{
-	gtk_widget_hide (sc->priv->none_item);
-
-	/* the entry will be set sensitive when one of the
-	 * radio buttons is activated, if necessary. */
-
-	gtk_widget_set_sensitive (sc->priv->all_radio, TRUE);
-	gtk_widget_set_sensitive (sc->priv->filter_radio, TRUE);
-	gtk_widget_set_sensitive (sc->priv->sub_button, TRUE);
-	gtk_widget_set_sensitive (sc->priv->unsub_button, TRUE);
-	gtk_widget_set_sensitive (sc->priv->refresh_button, TRUE);
-}
-
-static void
-sc_selection_changed (GtkObject *obj, gpointer user_data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
-	gboolean sensitive;
-
-	if (e_selection_model_selected_count (E_SELECTION_MODEL (obj)))
-		sensitive = TRUE;
-	else
-		sensitive = FALSE;
-
-	gtk_widget_set_sensitive (sc->priv->sub_button, sensitive);
-	gtk_widget_set_sensitive (sc->priv->unsub_button, sensitive);
-}
-
-static gboolean
-sc_activity_timeout (SubscribeDialog *sc)
-{
-	gtk_progress_bar_pulse(GTK_PROGRESS_BAR(sc->priv->progress));
-
-	return TRUE;
-}
-
-static void
-sc_activity_cb (int level, SubscribeDialog *sc)
-{
-	g_assert (pthread_self() == mail_gui_thread);
-
-	if (level) {
-		if (sc->priv->activity_timeout_id)
-			return;
-
-		sc->priv->activity_timeout_id = g_timeout_add(50, (GSourceFunc)sc_activity_timeout, sc);
-		gnome_appbar_set_status (GNOME_APPBAR (sc->priv->appbar), _("Scanning folders..."));
-	} else {
-		if (sc->priv->activity_timeout_id) {
-			g_source_remove (sc->priv->activity_timeout_id);
-			sc->priv->activity_timeout_id = 0;
-		}
-
-		gnome_appbar_set_status (GNOME_APPBAR (sc->priv->appbar), "");
-	}
-}
-
-static void
-menu_item_selected (GtkMenuItem *item, gpointer user_data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
-	StoreData       *sd = g_object_get_data (G_OBJECT (item), STORE_DATA_KEY);
-
-	g_return_if_fail (sd);
-
-	if (sd->widget == NULL) {
-		GtkWidget *widget;
-		ESelectionModel *esm;
-		ETree *tree;
-
-		widget = store_data_get_widget (sd, (FolderETreeActivityCallback) sc_activity_cb, sc);
-		gtk_box_pack_start (GTK_BOX (sc->priv->hbox), widget, TRUE, TRUE, 0);
-
-		tree = e_tree_scrolled_get_tree (E_TREE_SCROLLED (widget));
-		esm = e_tree_get_selection_model (tree);
-		g_signal_connect(esm, "selection_changed", G_CALLBACK(sc_selection_changed), sc);
-		sc_selection_changed ((GtkObject *)esm, sc);
-	}
-
-	if (sc->priv->current_widget == sc->priv->default_widget)
-		kill_default_view (sc);
-
-	gtk_widget_hide (sc->priv->current_widget);
-	gtk_widget_show (sd->widget);
-	sc->priv->current_widget = sd->widget;
-	sc->priv->current_store  = sd;
-
-	if (*sd->ftree->search) {
-		gtk_entry_set_text (GTK_ENTRY (sc->priv->search_entry), sd->ftree->search);
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sc->priv->filter_radio), TRUE);
-	} else {
-		gtk_entry_set_text (GTK_ENTRY (sc->priv->search_entry), "");
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sc->priv->all_radio), TRUE);
-	}
-}
-
-static void
-dummy_item_selected (GtkMenuItem *item, gpointer user_data)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (user_data);
-
-	gtk_widget_hide (sc->priv->current_widget);
-	gtk_widget_show (sc->priv->default_widget);
-	sc->priv->current_widget = sc->priv->default_widget;
-	sc->priv->current_store  = NULL;
-
-	gtk_entry_set_text (GTK_ENTRY (sc->priv->search_entry), "");
-}
-
-/* wonderful */
-
-static void
-got_sd_store (StoreData *sd, CamelStore *store, gpointer data)
-{
-	if (store && camel_store_supports_subscriptions (store))
-		gtk_widget_show (GTK_WIDGET (data));
-}
-
-/* FIXME: if there aren't any stores that are subscribable, the option
- * menu will only have the "No server selected" item and the user will
- * be confused. */
-
-static void
-populate_store_list (SubscribeDialog *sc)
-{
-	const GSList *accounts;
-	GList *iter;
-	GtkWidget *menu;
-	GtkWidget *omenu;
-	
-	accounts = mail_config_get_accounts ();
-	g_slist_foreach ((GSList *) accounts, (GFunc) populate_store_foreach, sc);
-	
-	menu = gtk_menu_new ();
-
-	for (iter = sc->priv->store_list; iter; iter = iter->next) {
-		GtkWidget *item;
-		CamelURL *url;
-		char *string;
-
-		url = camel_url_new (((StoreData *) iter->data)->uri, NULL);
-		string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
-		camel_url_free (url);
-		item = gtk_menu_item_new_with_label (string);
-		store_data_async_get_store (iter->data, got_sd_store, item);
-		g_object_set_data (G_OBJECT (item), STORE_DATA_KEY, iter->data);
-		g_signal_connect(item, "activate", G_CALLBACK(menu_item_selected), sc);
-		g_free (string);
-
-		gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), item);
-	}
-
-	sc->priv->none_item = gtk_menu_item_new_with_label (_("No server has been selected"));
-	g_signal_connect(sc->priv->none_item, "activate", G_CALLBACK(dummy_item_selected), sc);
-	gtk_widget_show (sc->priv->none_item);
-	gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), sc->priv->none_item);
-
-	gtk_widget_show (menu);
-
-	omenu = glade_xml_get_widget (sc->priv->xml, "store_menu");
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
-}
-
-static void
-subscribe_dialog_destroy (GtkObject *object)
-{
-	SubscribeDialog *sc;
-	GList *iter;
-	
-	sc = SUBSCRIBE_DIALOG (object);
-
-	if (sc->priv) {
-		if (sc->priv->activity_timeout_id) {
-			g_source_remove (sc->priv->activity_timeout_id);
-			sc->priv->activity_timeout_id = 0;
-		}
-
-		if (sc->priv->store_list) {
-			for (iter = sc->priv->store_list; iter; iter = iter->next) {
-				StoreData *data = iter->data;
-		
-				if (store_data_mid_request (data))
-					store_data_cancel_get_store (data);
-				
-				data->store_func = NULL;
-				
-				store_data_unref (data);
-			}
-		
-			g_list_free (sc->priv->store_list);
-			sc->priv->store_list = NULL;
-		}
-
-		if (sc->priv->xml) {
-			g_object_unref(sc->priv->xml);
-			sc->priv->xml = NULL;
-		}
-
-		g_free (sc->priv);
-		sc->priv = NULL;
-	}
-
-	subscribe_dialog_parent_class->destroy (object);
-}
-
-static void
-subscribe_dialog_class_init (GtkObjectClass *object_class)
-{
-	object_class->destroy = subscribe_dialog_destroy;
-
-	subscribe_dialog_parent_class = g_type_class_ref (PARENT_TYPE);
-}
-
-static void
-subscribe_dialog_init (GtkObject *object)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (object);
-
-	sc->priv = g_new0 (SubscribeDialogPrivate, 1);
-}
-
-static GtkWidget *
-sc_create_default_widget (void)
-{
-	GtkWidget *label;
-	GtkWidget *viewport;
-
-	label = gtk_label_new (_("Please select a server."));
-	gtk_widget_show (label);
-
-	viewport = gtk_viewport_new (NULL, NULL);
-	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_IN);
-	gtk_container_add (GTK_CONTAINER (viewport), label);
-
-	return viewport;
-}
-
-static void
-subscribe_dialog_construct (GtkObject *object)
-{
-	SubscribeDialog *sc = SUBSCRIBE_DIALOG (object);
-	
-	/* Load the XML */
-	/* "app2" */
-	sc->priv->xml            = glade_xml_new (EVOLUTION_GLADEDIR "/subscribe-dialog.glade", "app", NULL);
-	
-	sc->app                  = glade_xml_get_widget (sc->priv->xml, "app");
-	sc->priv->hbox           = glade_xml_get_widget (sc->priv->xml, "tree_box");
-	sc->priv->search_entry   = glade_xml_get_widget (sc->priv->xml, "search_entry");
-	sc->priv->filter_radio   = glade_xml_get_widget (sc->priv->xml, "filter_radio");
-	sc->priv->all_radio      = glade_xml_get_widget (sc->priv->xml, "all_radio");
-	sc->priv->close_button   = glade_xml_get_widget (sc->priv->xml, "close_button");
-	sc->priv->sub_button     = glade_xml_get_widget (sc->priv->xml, "subscribe_button");
-	sc->priv->unsub_button   = glade_xml_get_widget (sc->priv->xml, "unsubscribe_button");
-	sc->priv->refresh_button = glade_xml_get_widget (sc->priv->xml, "refresh_button");
-	sc->priv->appbar         = GNOME_APP (sc->app)->statusbar;
-	sc->priv->progress       = GTK_WIDGET (gnome_appbar_get_progress (GNOME_APPBAR (sc->priv->appbar)));
-
-	/* create default view */
-	sc->priv->default_widget = sc_create_default_widget();
-	sc->priv->current_widget = sc->priv->default_widget;
-	gtk_box_pack_start (GTK_BOX (sc->priv->hbox), sc->priv->default_widget, TRUE, TRUE, 0);
-	gtk_widget_show (sc->priv->default_widget);
-	
-	gtk_widget_set_sensitive (sc->priv->all_radio, FALSE);
-	gtk_widget_set_sensitive (sc->priv->filter_radio, FALSE);
-	gtk_widget_set_sensitive (sc->priv->search_entry, FALSE);
-	gtk_widget_set_sensitive (sc->priv->sub_button, FALSE);
-	gtk_widget_set_sensitive (sc->priv->unsub_button, FALSE);
-	gtk_widget_set_sensitive (sc->priv->refresh_button, FALSE);
-	
-	/* hook up some signals */
-	g_signal_connect(sc->priv->search_entry, "activate", G_CALLBACK(sc_search_activated), sc);
-	g_signal_connect(sc->priv->close_button, "clicked", G_CALLBACK(sc_close_pressed), sc);
-	g_signal_connect(sc->priv->sub_button, "clicked", G_CALLBACK(sc_subscribe_pressed), sc);
-	g_signal_connect(sc->priv->unsub_button, "clicked", G_CALLBACK(sc_unsubscribe_pressed), sc);
-	g_signal_connect(sc->priv->refresh_button, "clicked", G_CALLBACK(sc_refresh_pressed), sc);
-	g_signal_connect(sc->priv->all_radio, "toggled", G_CALLBACK(sc_all_toggled), sc);
-	g_signal_connect(sc->priv->filter_radio, "toggled", G_CALLBACK(sc_filter_toggled), sc);
-
-	/* progress */
-	gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(sc->priv->progress), 0.1);
-
-	/* Get the list of stores */
-	populate_store_list (sc);
-}
-
-GtkObject *
-subscribe_dialog_new (void)
-{
-	SubscribeDialog *subscribe_dialog;
-	
-	subscribe_dialog = g_object_new (SUBSCRIBE_DIALOG_TYPE, NULL);
-	subscribe_dialog_construct (GTK_OBJECT (subscribe_dialog));
-	
-	return GTK_OBJECT (subscribe_dialog);
-}
-
-E_MAKE_TYPE (subscribe_dialog, "SubscribeDialog", SubscribeDialog, subscribe_dialog_class_init, subscribe_dialog_init, PARENT_TYPE);
diff --git a/mail/subscribe-dialog.etspec b/mail/subscribe-dialog.etspec
deleted file mode 100644
index 1f5decbb36..0000000000
--- a/mail/subscribe-dialog.etspec
+++ /dev/null
@@ -1,9 +0,0 @@
-
-        
-        
-	
-		
-		
-	        
-	
-
diff --git a/mail/subscribe-dialog.glade b/mail/subscribe-dialog.glade
deleted file mode 100644
index f4c46ab2a2..0000000000
--- a/mail/subscribe-dialog.glade
+++ /dev/null
@@ -1,332 +0,0 @@
- 
-
-
-
-  
-  
-
-  
-    Manage Subscriptions
-    GTK_WINDOW_TOPLEVEL
-    no
-    no
-    yes
-    yes
-    yes
-    GTK_WIN_POS_NONE
-
-    
-      
-        3
-        yes
-        yes
-
-        
-          
-            1
-            GTK_SHADOW_OUT
-            yes
-
-            
-              
-                1
-                GTK_ORIENTATION_HORIZONTAL
-                GTK_TOOLBAR_BOTH
-                yes
-
-                
-                  
-                    Apri file
-                    Refresh List
-                    gtk-refresh
-                    yes
-                  
-                
-
-                
-                  
-                    Salve file
-                    Close
-                    gtk-close
-                    yes
-                  
-                  
-                    yes
-                  
-                
-              
-            
-          
-          
-            BONOBO_DOCK_TOP
-            1
-            0
-            0
-            BONOBO_DOCK_ITEM_BEH_EXCLUSIVE
-          
-        
-
-        
-          
-            3
-            no
-            3
-            yes
-
-            
-              
-                no
-                0
-                yes
-
-                
-                  
-                    S_elect server: 
-                    GTK_JUSTIFY_CENTER
-                    no
-                    0.5
-                    0.5
-                    0
-                    0
-                    optionmenu2
-                    yes
-                    yes
-                  
-                  
-                    0
-                    no
-                    no
-                  
-                
-
-                
-                  
-                    yes
-                    0
-                    yes
-
-                    
-                      
-                        yes
-                      
-                    
-                  
-                  
-                    0
-                    no
-                    no
-                  
-                
-              
-              
-                0
-                no
-                yes
-              
-            
-
-            
-              
-                no
-                0
-                yes
-
-                
-                  
-                
-
-                
-                  
-                    3
-                    no
-                    3
-                    yes
-
-                    
-                      
-                        
-
-                        GTK_JUSTIFY_CENTER
-                        no
-                        0.5
-                        0.5
-                        0
-                        0
-                        yes
-                      
-                      
-                        0
-                        no
-                        no
-                      
-                    
-
-                    
-                      
-                        GTK_BUTTONBOX_SPREAD
-                        0
-                        yes
-
-                        
-                          
-                            yes
-                            yes
-                            _Subscribe
-                            GTK_RELIEF_NORMAL
-                            yes
-                            yes
-                          
-                        
-
-                        
-                          
-                            yes
-                            yes
-                            _Unsubscribe
-                            GTK_RELIEF_NORMAL
-                            yes
-                            yes
-                          
-                        
-                      
-                      
-                        0
-                        no
-                        no
-                      
-                    
-
-                    
-                      
-                        GTK_BUTTONBOX_START
-                        10
-                        yes
-                      
-                      
-                        0
-                        no
-                        no
-                      
-                    
-                  
-                  
-                    0
-                    no
-                    no
-                    GTK_PACK_END
-                  
-                
-              
-              
-                0
-                yes
-                yes
-              
-            
-
-            
-              
-                Display Options
-                0
-                GTK_SHADOW_ETCHED_IN
-                yes
-
-                
-                  
-                    3
-                    no
-                    3
-                    yes
-
-                    
-                      
-                        yes
-                        All folders
-                        no
-                        yes
-                        yes
-                      
-                      
-                        0
-                        no
-                        no
-                      
-                    
-
-                    
-                      
-                        yes
-                        Folders whose names begin with:
-                        no
-                        yes
-                        yes
-                        all_radio
-                      
-                      
-                        0
-                        no
-                        no
-                      
-                    
-
-                    
-                      
-                        yes
-                        yes
-                        
-                        0
-                        yes
-                        yes
-                      
-                      
-                        0
-                        yes
-                        yes
-                      
-                    
-
-                    
-                      
-                        GTK_BUTTONBOX_DEFAULT_STYLE
-                        30
-                        yes
-                      
-                      
-                        0
-                        no
-                        no
-                      
-                    
-                  
-                
-              
-              
-                0
-                no
-                yes
-              
-            
-          
-        
-      
-      
-        0
-        yes
-        yes
-      
-    
-
-    
-      
-        yes
-        yes
-        yes
-      
-      
-        0
-        yes
-        yes
-      
-    
-  
-
diff --git a/mail/subscribe-dialog.h b/mail/subscribe-dialog.h
deleted file mode 100644
index c2e6b3d46f..0000000000
--- a/mail/subscribe-dialog.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Chris Toshok 
- *           Peter Williams 
- *
- *  Copyright 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifndef _SUBSCRIBE_DIALOG_H_
-#define _SUBSCRIBE_DIALOG_H_
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include "shell/evolution-storage.h"
-#include "mail-types.h"
-#include "camel/camel-store.h"
-
-#define SUBSCRIBE_DIALOG_TYPE        (subscribe_dialog_get_type ())
-#define SUBSCRIBE_DIALOG(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SUBSCRIBE_DIALOG_TYPE, SubscribeDialog))
-#define SUBSCRIBE_DIALOG_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), SUBSCRIBE_DIALOG_TYPE, SubscribeDialogClass))
-#define IS_SUBSCRIBE_DIALOG(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), SUBSCRIBE_DIALOG_TYPE))
-#define IS_SUBSCRIBE_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SUBSCRIBE_DIALOG_TYPE))
-
-typedef struct _SubscribeDialogPrivate SubscribeDialogPrivate;
-
-struct _SubscribeDialog {
-	GtkObject parent;
-
-	GtkWidget *app;
-	SubscribeDialogPrivate *priv;
-};
-
-typedef struct {
-	GtkObjectClass parent_class;
-} SubscribeDialogClass;
-
-GtkType    subscribe_dialog_get_type         (void);
-GtkObject *subscribe_dialog_new              (void);
-
-/* helper macro */
-#define subscribe_dialog_show(dialog) gtk_widget_show (SUBSCRIBE_DIALOG (dialog)->app)
-
-#endif /* _SUBSCRIBE_DIALOG_H_ */
diff --git a/mail/upgrade-mailer.c b/mail/upgrade-mailer.c
deleted file mode 100644
index e2dfc1bc8d..0000000000
--- a/mail/upgrade-mailer.c
+++ /dev/null
@@ -1,1170 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Jeffrey Stedfast 
- *
- *  Copyright 2002 Ximian, Inc. (www.ximian.com)
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include 
-#endif
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-struct _storeinfo {
-	char *base_url;
-	char *namespace;
-	char *encoded_namespace;
-	char dir_sep;
-	GPtrArray *folders;
-};
-
-
-
-static char
-find_dir_sep (const char *lsub_response)
-{
-	register const unsigned char *inptr;
-	const unsigned char *inend;
-	
-	inptr = (const unsigned char *) lsub_response;
-	inend = inptr + strlen (inptr);
-	
-	if (strncmp (inptr, "* LSUB (", 8))
-		return '\0';
-	
-	inptr += 8;
-	while (inptr < inend && *inptr != ')')
-		inptr++;
-	
-	if (inptr >= inend)
-		return '\0';
-	
-	inptr++;
-	while (inptr < inend && isspace ((int) *inptr))
-		inptr++;
-	
-	if (inptr >= inend)
-		return '\0';
-	
-	if (*inptr == '\"')
-		inptr++;
-	
-	return inptr < inend ? *inptr : '\0';
-}
-
-static void
-si_free (struct _storeinfo *si)
-{
-	int i;
-	
-	g_free (si->base_url);
-	g_free (si->namespace);
-	g_free (si->encoded_namespace);
-	if (si->folders) {
-		for (i = 0; i < si->folders->len; i++)
-			g_free (si->folders->pdata[i]);
-		g_ptr_array_free (si->folders, TRUE);
-	}
-	g_free (si);
-}
-
-static unsigned char tohex[16] = {
-	'0', '1', '2', '3', '4', '5', '6', '7',
-	'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
-};
-
-static char *
-hex_encode (const char *in, size_t len)
-{
-	const unsigned char *inend = in + len;
-	unsigned char *inptr, *outptr;
-	char *outbuf;
-	
-	outptr = outbuf = g_malloc ((len * 3) + 1);
-	
-	inptr = (unsigned char *) in;
-	while (inptr < inend) {
-		if (*inptr > 127 || isspace ((int) *inptr)) {
-			*outptr++ = '%';
-			*outptr++ = tohex[(*inptr >> 4) & 0xf];
-			*outptr++ = tohex[*inptr & 0xf];
-			inptr++;
-		} else
-			*outptr++ = *inptr++;
-	}
-	
-	*outptr = '\0';
-	
-	return outbuf;
-}
-
-#define HEXVAL(c) (isdigit (c) ? (c) - '0' : tolower (c) - 'a' + 10)
-
-static char *
-hex_decode (const char *in, size_t len)
-{
-	const unsigned char *inend = in + len;
-	unsigned char *inptr, *outptr;
-	char *outbuf;
-	
-	outptr = outbuf = g_malloc (len + 1);
-	
-	inptr = (unsigned char *) in;
-	while (inptr < inend) {
-		if (*inptr == '%') {
-			if (isxdigit ((int) inptr[1]) && isxdigit ((int) inptr[2])) {
-				*outptr++ = HEXVAL (inptr[1]) * 16 + HEXVAL (inptr[2]);
-				inptr += 3;
-			} else
-				*outptr++ = *inptr++;
-		} else
-			*outptr++ = *inptr++;
-	}
-	
-	*outptr = '\0';
-	
-	return outbuf;
-}
-
-static char *
-parse_lsub (const char *lsub, char *dir_sep)
-{
-	const unsigned char *inptr = (const unsigned char *) lsub;
-	const unsigned char *inend;
-	int inlen, quoted = 0;
-	
-	inend = inptr + strlen (inptr);
-	if (strncmp (inptr, "* LSUB (", 8))
-		return NULL;
-	
-	inptr += 8;
-	while (inptr < inend && *inptr != ')')
-		inptr++;
-	
-	if (inptr >= inend)
-		return NULL;
-	
-	inptr++;
-	while (inptr < inend && isspace ((int) *inptr))
-		inptr++;
-	
-	if (inptr >= inend)
-		return NULL;
-	
-	/* skip over the dir sep */
-	if (*inptr == '\"')
-		inptr++;
-	
-	*dir_sep = (char) *inptr++;
-	if (*inptr == '\"')
-		inptr++;
-	
-	if (inptr >= inend)
-		return NULL;
-	
-	while (inptr < inend && isspace ((int) *inptr))
-		inptr++;
-	
-	if (inptr >= inend)
-		return NULL;
-	
-	if (*inptr == '\"') {
-		inptr++;
-		quoted = 1;
-	} else
-		quoted = 0;
-	
-	inlen = strlen (inptr) - quoted;
-	
-	return g_strndup (inptr, inlen);
-}
-
-static void
-cache_upgrade (struct _storeinfo *si, const char *folder_name)
-{
-	const char *old_folder_name = folder_name;
-	char *oldpath, *newpath, *p;
-	struct dirent *dent;
-	DIR *dir = NULL;
-	
-	if (si->namespace && strcmp ("INBOX", folder_name)) {
-		if (!strncmp (old_folder_name, si->namespace, strlen (si->namespace))) {
-			old_folder_name += strlen (si->namespace);
-			if (*old_folder_name == si->dir_sep)
-				old_folder_name++;
-		}
-	}
-	
-	oldpath = g_strdup_printf ("%s/evolution/mail/imap/%s/%s", getenv ("HOME"),
-				   si->base_url + 7, old_folder_name);
-	
-	newpath = g_strdup_printf ("%s/evolution/mail/imap/%s/folders/%s",
-				   getenv ("HOME"), si->base_url + 7, folder_name);
-	
-	if (!strcmp (folder_name, "folders"))
-		goto special_case_folders;
-	
-	if (si->dir_sep != '/') {
-		p = newpath + strlen (newpath) - strlen (folder_name) - 1;
-		while (*p) {
-			if (*p == si->dir_sep)
-				*p = '/';
-			p++;
-		}
-	}
-	
-	/* make sure all parent directories exist */
-	if ((p = strrchr (newpath, '/'))) {
-		*p = '\0';
-		camel_mkdir_hier (newpath, 0755);
-		*p = '/';
-	}
-	
-	if (rename (oldpath, newpath) == -1) {
-		fprintf (stderr, "Failed to upgrade cache for imap folder %s/%s: %s\n",
-			 si->base_url, folder_name, g_strerror (errno));
-	}
-	
-	g_free (oldpath);
-	g_free (newpath);
-	
-	return;
-	
- special_case_folders:
-	
-	/* the user had a toplevel folder named "folders" */
-	if (camel_mkdir_hier (newpath, 0755) == -1) {
-		/* we don't bother to check EEXIST because well, if
-                   folders/folders exists then we're pretty much
-                   fucked */
-		goto exception;
-	}
-	
-	if (!(dir = opendir (oldpath)))
-		goto exception;
-	
-	while ((dent = readdir (dir))) {
-		char *old_path, *new_path;
-		
-		if (!strcmp (dent->d_name, ".") || !strcmp (dent->d_name, ".."))
-			continue;
-		
-		old_path = g_strdup_printf ("%s/%s", oldpath, dent->d_name);
-		new_path = g_strdup_printf ("%s/%s", newpath, dent->d_name);
-		
-		/* make sure all parent directories exist */
-		if ((p = strrchr (new_path, '/'))) {
-			*p = '\0';
-			camel_mkdir_hier (new_path, 0755);
-			*p = '/';
-		}
-		
-		if (rename (old_path, new_path) == -1) {
-			g_free (old_path);
-			g_free (new_path);
-			goto exception;
-		}
-		
-		g_free (old_path);
-		g_free (new_path);
-	}
-	
-	closedir (dir);
-	
-	g_free (oldpath);
-	g_free (newpath);
-	
-	return;
-	
- exception:
-	
-	fprintf (stderr, "Failed to upgrade cache for imap folder %s/%s: %s\n",
-		 si->base_url, folder_name, g_strerror (errno));
-	
-	if (dir)
-		closedir (dir);
-	
-	g_free (oldpath);
-	g_free (newpath);
-}
-
-static int
-foldercmp (const void *f1, const void *f2)
-{
-	const char **folder1 = (const char **) f1;
-	const char **folder2 = (const char **) f2;
-	
-	return strcmp (*folder1, *folder2);
-}
-
-static void
-cache_upgrade_and_free (gpointer key, gpointer val, gpointer user_data)
-{
-	struct _storeinfo *si = val;
-	GPtrArray *folders;
-	char *path = NULL;
-	char dir_sep;
-	int i;
-	
-	if (si->folders) {
-		path = g_strdup_printf ("%s/evolution/mail/imap/%s/folders",
-					getenv ("HOME"), si->base_url + 7);
-		
-		if (mkdir (path, 0755) == -1 && errno != EEXIST) {
-			fprintf (stderr, "Failed to create directory %s: %s", path, g_strerror (errno));
-			goto exception;
-		}
-		
-		g_free (path);
-		folders = g_ptr_array_new ();
-		for (i = 0; i < si->folders->len; i++) {
-			if ((path = parse_lsub (si->folders->pdata[i], &dir_sep))) {
-				g_ptr_array_add (folders, path);
-			}
-		}
-		
-		/* sort the folders so that parents get created before
-                   their children */
-		qsort (folders->pdata, folders->len, sizeof (void *), foldercmp);
-		
-		for (i = 0; i < folders->len; i++) {
-			cache_upgrade (si, folders->pdata[i]);
-			g_free (folders->pdata[i]);
-		}
-	}
-	
-	si_free (si);
-	
-	return;
-	
- exception:
-	
-	fprintf (stderr, "Could not upgrade imap cache for %s: %s\n",
-		 si->base_url + 7, g_strerror (errno));
-	
-	g_free (path);
-	
-	si_free (si);
-}
-
-static char *
-get_base_url (const char *protocol, const char *uri)
-{
-	unsigned char *base_url, *p;
-	
-	p = (unsigned char *) uri + strlen (protocol) + 1;
-	if (!strncmp (p, "//", 2))
-		p += 2;
-	
-	base_url = p;
-	p = strchr (p, '/');
-	base_url = g_strdup_printf ("%s://%.*s", protocol, p ? (int) (p - base_url) : (int) strlen (base_url), base_url);
-	
-	return base_url;
-}
-
-static char *
-imap_namespace (const char *uri)
-{
-	unsigned char *name, *p;
-	
-	if ((name = strstr (uri, ";namespace=\"")) == NULL)
-		return NULL;
-	
-	name += strlen (";namespace=\"");
-	p = name;
-	while (*p && *p != '\"')
-		p++;
-	
-	return g_strndup (name, p - name);
-}
-
-static char *
-find_folder (GPtrArray *folders, const char *folder, char *dir_sep)
-{
-	const unsigned char *inptr, *inend;
-	int inlen, len, diff, i;
-	int quoted;
-	
-	len = strlen (folder);
-	
-	for (i = 0; i < folders->len; i++) {
-		inptr = folders->pdata[i];
-		inend = inptr + strlen (inptr);
-		if (strncmp (inptr, "* LSUB (", 8))
-			continue;
-		
-		inptr += 8;
-		while (inptr < inend && *inptr != ')')
-			inptr++;
-		
-		if (inptr >= inend)
-			continue;
-		
-		inptr++;
-		while (inptr < inend && isspace ((int) *inptr))
-			inptr++;
-		
-		if (inptr >= inend)
-			continue;
-		
-		/* skip over the dir sep */
-		if (*inptr == '\"')
-			inptr++;
-		
-		*dir_sep = *inptr++;
-		if (*inptr == '\"')
-			inptr++;
-		
-		if (inptr >= inend)
-			continue;
-		
-		while (inptr < inend && isspace ((int) *inptr))
-			inptr++;
-		
-		if (inptr >= inend)
-			continue;
-		
-		if (*inptr == '\"') {
-			inptr++;
-			quoted = 1;
-		} else
-			quoted = 0;
-		
-		inlen = strlen (inptr) - quoted;
-		if (len > inlen)
-			continue;
-		
-		diff = inlen - len;
-		if (!strncmp (inptr + diff, folder, len))
-			return hex_encode (inptr, inlen);
-	}
-	
-	*dir_sep = '\0';
-	
-	return NULL;
-}
-
-static char *
-imap_url_upgrade (GHashTable *imap_sources, const char *uri)
-{
-	struct _storeinfo *si;
-	unsigned char *base_url, *folder, *p, *new = NULL;
-	char dir_sep;
-	
-	base_url = get_base_url ("imap", uri);
-	
-	fprintf (stderr, "checking for %s... ", base_url);
-	if (!(si = g_hash_table_lookup (imap_sources, base_url))) {
-		fprintf (stderr, "not found.\n");
-		g_warning ("Unknown imap account: %s", base_url);
-		g_free (base_url);
-		return NULL;
-	}
-	
-	fprintf (stderr, "found.\n");
-	p = (unsigned char *) uri + strlen (base_url) + 1;
-	if (!strcmp (p, "INBOX")) {
-		new = g_strdup_printf ("%s/INBOX", base_url);
-		g_free (base_url);
-		return new;
-	}
-	
-	p = hex_decode (p, strlen (p));
-	
-	fprintf (stderr, "checking for folder %s on %s... ", p, base_url);
-	folder = si->folders ? find_folder (si->folders, p, &dir_sep) : NULL;
-	if (folder == NULL) {
-		fprintf (stderr, "not found.\n");
-		folder = p;
-		if (si->namespace) {
-			if (!si->dir_sep) {
-				fprintf (stderr, "checking for directory separator in namespace param... ");
-				if (*si->namespace == '/') {
-					dir_sep = '/';
-				} else {
-					p = si->namespace;
-					while (*p && !ispunct ((int) *p))
-						p++;
-					
-					dir_sep = (char) *p;
-				}
-			} else {
-				dir_sep = si->dir_sep;
-			}
-			
-			if (dir_sep) {
-				fprintf (stderr, "found: '%c'\n", dir_sep);
-				p = folder;
-				folder = hex_encode (folder, strlen (folder));
-				new = g_strdup_printf ("%s/%s%c%s", base_url, si->encoded_namespace, dir_sep, folder);
-				g_free (folder);
-				folder = p;
-				
-				p = new + strlen (base_url) + 1;
-				while (*p) {
-					if (*p == dir_sep)
-						*p = '/';
-					p++;
-				}
-			} else {
-				fprintf (stderr, "not found.");
-				g_warning ("Cannot update settings for imap folder %s: unknown directory separator", uri);
-			}
-		} else {
-			g_warning ("Cannot update settings for imap folder %s: unknown namespace", uri);
-		}
-		
-		g_free (base_url);
-		g_free (folder);
-		
-		return new;
-	} else
-		g_free (p);
-	
-	fprintf (stderr, "found.\n");
-	new = g_strdup_printf ("%s/%s", base_url, folder);
-	g_free (folder);
-	
-	if (!si->dir_sep)
-		si->dir_sep = dir_sep;
-	
-	if (dir_sep) {
-		p = new + strlen (base_url) + 1;
-		while (*p) {
-			if (*p == dir_sep)
-				*p = '/';
-			p++;
-		}
-	}
-	
-	g_free (base_url);
-	
-	return new;
-}
-
-static char *
-exchange_url_upgrade (const char *uri)
-{
-	unsigned char *base_url, *folder;
-	char *url;
-	
-	base_url = get_base_url ("exchange", uri);
-	folder = (unsigned char *) uri + strlen (base_url) + 1;
-	
-	if (strncmp (folder, "exchange/", 9))
-		return g_strdup (uri);
-	
-	folder += 9;
-	while (*folder && *folder != '/')
-		folder++;
-	if (*folder == '/')
-		folder++;
-	
-	folder = hex_decode (folder, strlen (folder));
-	url = g_strdup_printf ("%s/personal/%s", base_url, folder);
-	g_free (base_url);
-	g_free (folder);
-	
-	return url;
-}
-
-static int
-mailer_upgrade_account_info (Bonobo_ConfigDatabase db, const char *key, int num, GHashTable *imap_sources)
-{
-	char *path, *uri, *new;
-	int i;
-	
-	for (i = 0;  i < num; i++) {
-		path = g_strdup_printf ("/Mail/Accounts/account_%s_folder_uri_%d", key, i);
-		uri = bonobo_config_get_string (db, path, NULL);
-		if (uri) {
-			if (!strncmp (uri, "imap:", 5)) {
-				new = imap_url_upgrade (imap_sources, uri);
-				if (new) {
-					bonobo_config_set_string (db, path, new, NULL);
-					g_free (new);
-				}
-			} else if (!strncmp (uri, "exchange:", 9)) {
-				new = exchange_url_upgrade (uri);
-				bonobo_config_set_string (db, path, new, NULL);
-				g_free (new);
-			}
-		}
-		
-		g_free (uri);
-		g_free (path);
-	}
-	
-	return 0;
-}
-
-static int
-mailer_upgrade_xml_file (GHashTable *imap_sources, const char *filename)
-{
-	unsigned char *buffer, *inptr, *start, *uri, *new;
-	ssize_t nread = 0, nwritten, n;
-	gboolean url_need_upgrade;
-	struct stat st;
-	size_t len;
-	char *bak;
-	int fd;
-	
-	bak = g_strdup_printf ("%s.bak-1.0", filename);
-	if (stat (bak, &st) != -1) {
-		/* seems we have already converted this file? */
-		fprintf (stderr, "\n%s already exists, assuming %s has already been upgraded\n", bak, filename);
-		g_free (bak);
-		return 0;
-	}
-	
-	if (stat (filename, &st) == -1 || (fd = open (filename, O_RDONLY)) == -1) {
-		/* file doesn't exist? I guess nothing to upgrade here */
-		fprintf (stderr, "\nCould not open %s: %s\n", filename, strerror (errno));
-		g_free (bak);
-		return 0;
-	}
-	
-	start = buffer = g_malloc (st.st_size + 1);
-	do {
-		do {
-			n = read (fd, buffer + nread, st.st_size - nread);
-		} while (n == -1 && errno == EINTR);
-		
-		if (n > 0)
-			nread += n;
-	} while (n != -1 && nread < st.st_size);
-	buffer[nread] = '\0';
-	
-	if (nread < st.st_size) {
-		/* failed to load the entire file? */
-		fprintf (stderr, "\nFailed to load %s: %s\n", filename, strerror (errno));
-		g_free (buffer);
-		g_free (bak);
-		close (fd);
-		return -1;
-	}
-	
-	close (fd);
-	
-	inptr = buffer;
-	url_need_upgrade = FALSE;
-	do {
-		inptr = strstr (inptr, "uri=\"");
-		if (inptr) {
-			inptr += 5;
-			url_need_upgrade = !strncmp (inptr, "imap:", 5) || !strncmp (inptr, "exchange:", 9);
-		}
-	} while (inptr && !url_need_upgrade);
-	
-	if (inptr == NULL) {
-		/* no imap urls in this xml file, so no need to "upgrade" it */
-		fprintf (stdout, "\nNo updates required for %s\n", filename);
-		g_free (buffer);
-		g_free (bak);
-		return 0;
-	}
-	
-	if (rename (filename, bak) == -1) {
-		/* failed to backup xml file */
-		fprintf (stderr, "\nFailed to create backup file %s: %s\n", bak, strerror (errno));
-		g_free (buffer);
-		g_free (bak);
-		return -1;
-	}
-	
-	if ((fd = open (filename, O_WRONLY | O_CREAT | O_TRUNC, 0644)) == -1) {
-		/* failed to create new xml file */
-		fprintf (stderr, "\nFailed to create new %s: %s\n", filename, strerror (errno));
-		rename (bak, filename);
-		g_free (buffer);
-		g_free (bak);
-		return -1;
-	}
-	
-	while (inptr != NULL) {
-		len = inptr - start;
-		nwritten = 0;
-		do {
-			do {
-				n = write (fd, start + nwritten, len - nwritten);
-			} while (n == -1 && errno == EINTR);
-			
-			if (n > 0)
-				nwritten += n;
-		} while (n != -1 && nwritten < len);
-		
-		if (nwritten < len)
-			goto exception;
-		
-		start = inptr;
-		while (*start && *start != '"')
-			start++;
-		
-		uri = g_strndup (inptr, start - inptr);
-		if (!strncmp (uri, "imap:", 5)) {
-			if ((new = imap_url_upgrade (imap_sources, uri)) == NULL) {
-				new = uri;
-				uri = NULL;
-			}
-		} else if (!strncmp (uri, "exchange:", 9)) {
-			new = exchange_url_upgrade (uri);
-		} else {
-			new = uri;
-			uri = NULL;
-		}
-		g_free (uri);
-		
-		nwritten = 0;
-		len = strlen (new);
-		do {
-			do {
-				n = write (fd, new + nwritten, len - nwritten);
-			} while (n == -1 && errno == EINTR);
-			
-			if (n > 0)
-				nwritten += n;
-		} while (n != -1 && nwritten < len);
-		
-		g_free (new);
-		
-		if (nwritten < len)
-			goto exception;
-		
-		inptr = start;
-		url_need_upgrade = FALSE;
-		do {
-			inptr = strstr (inptr, "uri=\"");
-			if (inptr) {
-				inptr += 5;
-				url_need_upgrade = !strncmp (inptr, "imap:", 5) || !strncmp (inptr, "exchange:", 9);
-			}
-		} while (inptr && !url_need_upgrade);
-	}
-	
-	nwritten = 0;
-	len = strlen (start);
-	do {
-		do {
-			n = write (fd, start + nwritten, len - nwritten);
-		} while (n == -1 && errno == EINTR);
-		
-		if (n > 0)
-			nwritten += n;
-	} while (n != -1 && nwritten < len);
-	
-	if (nwritten < len)
-		goto exception;
-	
-	if (fsync (fd) == -1)
-		goto exception;
-	
-	close (fd);
-	g_free (buffer);
-	
-	fprintf (stdout, "\nSuccessfully upgraded %s\nPrevious settings saved in %s\n\n", filename, bak);
-	
-	g_free (bak);
-	
-	return 0;
-	
- exception:
-	
-	fprintf (stderr, "\nFailed to save updated settings to %s: %s\n\n", filename, strerror (errno));
-	
-	close (fd);
-	g_free (buffer);
-	unlink (filename);
-	rename (bak, filename);
-	g_free (bak);
-	
-	return -1;
-}
-
-static char *
-shortcuts_upgrade_uri (GHashTable *accounts, GHashTable *imap_sources, const char *account, const char *folder)
-{
-	char *url, *name, *decoded, *new = NULL;
-	struct _storeinfo *si;
-	int type;
-	
-	type = GPOINTER_TO_INT ((si = g_hash_table_lookup (accounts, account)));
-	if (type == 1) {
-		/* exchange */
-		decoded = hex_decode (folder, strlen (folder));
-		name = g_strdup_printf ("personal/%s", decoded);
-		g_free (decoded);
-		
-		return name;
-	} else {
-		/* imap */
-		url = g_strdup_printf ("%s/%s", si->base_url, folder);
-		new = imap_url_upgrade (imap_sources, url);
-		g_free (url);
-		
-		if (new) {
-			name = new + strlen (si->base_url) + 1;
-			name = hex_decode (name, strlen (name));
-			g_free (new);
-			
-			return name;
-		}
-	}
-	
-	return NULL;
-}
-
-static int
-shortcuts_upgrade_xml_file (GHashTable *accounts, GHashTable *imap_sources, const char *filename)
-{
-	char *bak, *uri, *account, *folder, *new, *new_uri, *type;
-	struct stat st;
-	xmlDoc *doc;
-	xmlNode *group, *item;
-	int account_len;
-	gboolean changed = FALSE;
-	
-	bak = g_strdup_printf ("%s.bak-1.0", filename);
-	if (stat (bak, &st) != -1) {
-		/* seems we have already converted this file? */
-		fprintf (stderr, "\n%s already exists, assuming %s has already been upgraded\n", bak, filename);
-		g_free (bak);
-		return 0;
-	}
-	
-	if (stat (filename, &st) == -1) {
-		/* file doesn't exist? I guess nothing to upgrade here */
-		fprintf (stderr, "\nCould not open %s: %s\n", filename, strerror (errno));
-		g_free (bak);
-		return 0;
-	}
-	
-	doc = xmlParseFile (filename);
-	if (!doc || !doc->xmlRootNode) {
-		/* failed to load/parse the file? */
-		fprintf (stderr, "\nFailed to load %s\n", filename);
-		g_free (bak);
-		return -1;
-	}
-	
-	for (group = doc->xmlRootNode->xmlChildrenNode; group; group = group->next) {
-		for (item = group->xmlChildrenNode; item; item = item->next) {
-			/* Fix IMAP/Exchange URIs */
-			uri = xmlNodeGetContent (item);
-			if (!strncmp (uri, "evolution:/", 11)) {
-				if (!strcmp (uri, "evolution:/local/Inbox")) {
-					xmlNodeSetContent (item, "default:mail");
-					changed = TRUE;
-				} else if (!strcmp (uri, "evolution:/local/Calendar")) {
-					xmlNodeSetContent (item, "default:calendar");
-					changed = TRUE;
-				} else if (!strcmp (uri, "evolution:/local/Contacts")) {
-					xmlNodeSetContent (item, "default:contacts");
-					changed = TRUE;
-				} else if (!strcmp (uri, "evolution:/local/Tasks")) {
-					xmlNodeSetContent (item, "default:tasks");
-					changed = TRUE;
-				} else {
-					account_len = strcspn (uri + 11, "/");
-					account = g_strndup (uri + 11, account_len);
-					if (g_hash_table_lookup (accounts, account)) {
-						folder = uri + 11 + account_len;
-						if (*folder)
-							folder++;
-						new = shortcuts_upgrade_uri (accounts, imap_sources, account, folder);
-						new_uri = g_strdup_printf ("evolution:/%s/%s", account, new);
-						xmlNodeSetContent (item, new_uri);
-						changed = TRUE;
-						g_free (new_uri);
-					}
-					g_free (account);
-				}
-			}
-			xmlFree (uri);
-			
-			/* Fix LDAP shortcuts */
-			type = xmlGetProp (item, "type");
-			if (type) {
-				if (!strcmp (type, "ldap-contacts")) {
-					xmlSetProp (item, "type", "contacts/ldap");
-					changed = TRUE;
-				}
-				xmlFree (type);
-			}
-		}
-	}
-	
-	if (!changed) {
-		fprintf (stdout, "\nNo updates required for %s\n", filename);
-		xmlFreeDoc (doc);
-		g_free (bak);
-		return 0;
- 	}
-	
-	if (rename (filename, bak) == -1) {
-		/* failed to backup xml file */
-		fprintf (stderr, "\nFailed to create backup file %s: %s\n", bak, strerror (errno));
-		xmlFreeDoc (doc);
-		g_free (bak);
-		return -1;
-	}
-	
-	if (e_xml_save_file (filename, doc) == -1) {
-		fprintf (stderr, "\nFailed to save updated settings to %s: %s\n\n", filename, strerror (errno));
-		xmlFreeDoc (doc);
-		unlink (filename);
-		rename (bak, filename);
-		g_free (bak);
-		return -1;
-	}
-	
-	fprintf (stdout, "\nSuccessfully upgraded %s\nPrevious settings saved in %s\n\n", filename, bak);
-	
-	xmlFreeDoc (doc);
-	g_free (bak);
-	
-	return 0;
-}
-
-
-static int
-mailer_upgrade (Bonobo_ConfigDatabase db)
-{
-	GHashTable *imap_sources, *accounts;
-	char *path, *uri;
-	char *account, *transport;
-	int num, i;
-	
-	if ((num = bonobo_config_get_long_with_default (db, "/Mail/Accounts/num", 0, NULL)) == 0) {
-		/* nothing to upgrade */
-		return 0;
-	}
-	
-	accounts = g_hash_table_new (g_str_hash, g_str_equal);
-	imap_sources = g_hash_table_new (g_str_hash, g_str_equal);
-	for (i = 0; i < num; i++) {
-		struct _storeinfo *si;
-		struct stat st;
-		char *string;
-		guint32 tmp;
-		FILE *fp;
-		int j;
-		
-		path = g_strdup_printf ("/Mail/Accounts/source_url_%d", i);
-		uri = bonobo_config_get_string (db, path, NULL);
-		g_free (path);
-		if (uri && !strncmp (uri, "imap:", 5)) {
-			path = g_strdup_printf ("/Mail/Accounts/account_name_%d", i);
-			account = bonobo_config_get_string (db, path, NULL);
-			g_free (path);
-			
-			si = g_new (struct _storeinfo, 1);
-			si->base_url = get_base_url ("imap", uri);
-			si->namespace = imap_namespace (uri);
-			si->encoded_namespace = NULL;
-			si->dir_sep = '\0';
-			si->folders = NULL;
-			
-			path = si->base_url + 7;
-			
-			path = g_strdup_printf ("%s/evolution/mail/imap/%s/storeinfo", getenv ("HOME"), path);
-			if (stat (path, &st) != -1 && (fp = fopen (path, "r")) != NULL) {
-				camel_file_util_decode_uint32 (fp, &tmp);
-				camel_file_util_decode_uint32 (fp, &tmp);
-				
-				j = 0;
-				si->folders = g_ptr_array_new ();
-				while (camel_file_util_decode_string (fp, &string) != -1) {
-					if (j++ > 0) {
-						g_ptr_array_add (si->folders, string);
-					} else {
-						if (!si->namespace)
-							si->namespace = string;
-						else
-							g_free (string);
-						
-						camel_file_util_decode_uint32 (fp, &tmp);
-						si->dir_sep = (char) tmp & 0xff;
-					}
-				}
-				
-				fclose (fp);
-			}
-			g_free (path);
-			
-			if (si->folders && si->folders->len > 0)
-				si->dir_sep = find_dir_sep (si->folders->pdata[0]);
-			
-			if (si->namespace) {
-				/* strip trailing dir_sep from namespace if it's there */
-				j = strlen (si->namespace) - 1;
-				if (si->namespace[j] == si->dir_sep)
-					si->namespace[j] = '\0';
-				
-				/* set the encoded version of the namespace */
-				si->encoded_namespace = g_strdup (si->namespace);
-				for (j = 0; j < strlen (si->encoded_namespace); j++) {
-					if (si->encoded_namespace[j] == '/')
-						si->encoded_namespace[j] = '.';
-				}
-			}
-			
-			g_hash_table_insert (imap_sources, si->base_url, si);
-			
-			if (account)
-				g_hash_table_insert (accounts, account, si);
-		} else if (uri && !strncmp (uri, "exchange:", 9)) {
-			/* Upgrade transport uri */
-			path = g_strdup_printf ("/Mail/Accounts/transport_url_%d", i);
-			transport = bonobo_config_get_string (db, path, NULL);
-			if (transport && !strncmp (transport, "exchanget:", 10))
-				bonobo_config_set_string (db, path, uri, NULL);
-			g_free (transport);
-			g_free (path);
-			
-			path = g_strdup_printf ("/Mail/Accounts/account_name_%d", i);
-			account = bonobo_config_get_string (db, path, NULL);
-			g_free (path);
-			
-			if (account)
-				g_hash_table_insert (accounts, account, GINT_TO_POINTER (1));
-		}
-		
-		g_free (uri);
-	}
-	
-	if (g_hash_table_size (accounts) == 0) {
-		/* user doesn't have any imap/exchange accounts - nothing to upgrade */
-		g_hash_table_destroy (imap_sources);
-		return 0;
-	}
-	
-	/* upgrade user's account info (bug #29135) */
-	mailer_upgrade_account_info (db, "drafts", num, imap_sources);
-	mailer_upgrade_account_info (db, "sent", num, imap_sources);
-	
-	/* upgrade user's filters/vfolders (bug #24451) */
-	path = g_strdup_printf ("%s/evolution/filters.xml", getenv ("HOME"));
-	mailer_upgrade_xml_file (imap_sources, path);
-	g_free (path);
-	
-	path = g_strdup_printf ("%s/evolution/vfolders.xml", getenv ("HOME"));
-	mailer_upgrade_xml_file (imap_sources, path);
-	g_free (path);
-	
-	/* upgrade user's shortcuts (there's no bug # for this one) */
-	path = g_strdup_printf ("%s/evolution/shortcuts.xml", getenv ("HOME"));
-	shortcuts_upgrade_xml_file (accounts, imap_sources, path);
-	g_free (path);
-	
-	g_hash_table_foreach (imap_sources, cache_upgrade_and_free, NULL);
-	g_hash_table_destroy (imap_sources);
-#if 0
-	path = g_strdup_printf ("%s/evolution/mail/imap", getenv ("HOME"));
-	bak = g_strdup_printf ("%s.bak-1.0", path);
-	
-	if (rename (path, bak) == -1)
-		fprintf (stderr, "\nFailed to backup Evolution 1.0's IMAP cache: %s\n", strerror (errno));
-	
-	g_free (path);
-	g_free (bak);
-#endif
-	
-	return 0;
-}
-
-static Bonobo_ConfigDatabase
-get_config_db (void)
-{
-	Bonobo_ConfigDatabase db;
-	CORBA_Environment ev;
-	
-	CORBA_exception_init (&ev);
-	
-	db = bonobo_get_object ("wombat:", "Bonobo/ConfigDatabase", &ev);
-	if (BONOBO_EX (&ev) || db == CORBA_OBJECT_NIL) {
-		fprintf (stderr, "get_config_db(): Could not get the config database object '%s'",
-			 bonobo_exception_get_text (&ev));
-		db = CORBA_OBJECT_NIL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	return db;
-}
-
-static int
-upgrade (void)
-{
-	Bonobo_ConfigDatabase db;
-	CORBA_Environment ev;
-	
-	if ((db = get_config_db ()) == CORBA_OBJECT_NIL)
-		g_error ("Could not get config db");
-	
-	mailer_upgrade (db);
-	
-	CORBA_exception_init (&ev);
-	Bonobo_ConfigDatabase_sync (db, &ev);
-	
-	gtk_main_quit ();
-	
-	return FALSE;
-}
-
-int main (int argc, char **argv)
-{
-	CORBA_ORB orb;
-	
-	gnome_init ("evolution-upgrade", "1.0", argc, argv);
-	
-	if ((orb = oaf_init (argc, argv)) == NULL)
-		g_error ("Cannot init oaf");
-	
-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
-		g_error ("Cannot init bonobo");
-	
-	gtk_idle_add ((GtkFunction) upgrade, NULL);
-	
-	bonobo_main ();
-	
-	return 0;
-}
-- 
cgit v1.2.3