From ce042b31b62f51282a3e66d1d0725fd5236d9096 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Tue, 27 Jan 2004 12:35:26 +0000 Subject: ** See bug #53084 and others. 2004-01-27 Not Zed ** See bug #53084 and others. * em-migrate.c (em_migrate): remove the vfolder_revert hack. * em-composer-utils.c (ask_confirm_for_only_bcc): removed unused vars. * mail-tools.c (mail_tool_get_local_inbox): removed, handled by mail_component_get_folder now. * mail-component.c (mail_component_*): Changed the api slightly. Using NULL as the component argument automatically implies you want the default component. (em_uri_from_camel, em_uri_to_camel): moved to em-utils.[ch]. Ok so it isn't namespaced right ... *shrug*. (mail_component_get_local_inbox): removed. (mail_component_get_folder): single entry point for getting standard folders. This is MT-Safe. (mail_component_get_folder_uri): single entry point for getting standard folder uri's. This is MT-Safe. (add_store): removed, moved to mail_component_add_store. (mail_component_load_store_by_uri): call mail_component_add_store directly rather than copying its code. (default_*_folder*): Removed, use accessor methods instead, fixed all callers. (setup_local_store): renamed to mc_setup_local_store, use proper url encoding too. make run-once and thread-safe. (MailComponentPrivate): Added a lock. (mail_control_new): exported properly to kill warnings. (mail_component_init): dont setup_local_store or add accounts here. (impl_createControls): setup local store/accounts here. (mail_component_peek): dont setup vfolder storage here. (mc_startup): internal function to startup stuff needed for gui operation. (setup_search_context): make run-once. (mail_component_peek_search_context): call setup_search_context incase it isn't setup yet. (impl_upgradeFromVersion): remove the local store setup hack. svn path=/trunk/; revision=24462 --- mail/em-composer-utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mail/em-composer-utils.c') diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 09ca8a8b4f..b31ee4f9ee 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -33,6 +33,7 @@ #include "mail-config.h" #include "mail-session.h" #include "mail-send-recv.h" +#include "mail-component.h" #include /* e_notice */ @@ -140,7 +141,6 @@ ask_confirm_for_empty_subject (EMsgComposer *composer) static gboolean ask_confirm_for_only_bcc (EMsgComposer *composer, gboolean hidden_list_case) { - gboolean show_again, res; const char *first_text; /* If the user is mailing a hidden contact list, it is possible for @@ -390,7 +390,7 @@ got_post_folder (char *uri, CamelFolder *folder, void *data) void em_utils_composer_send_cb (EMsgComposer *composer, gpointer user_data) { - extern CamelFolder *outbox_folder; + CamelFolder *outbox_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_OUTBOX); CamelMimeMessage *message; CamelMessageInfo *info; struct _send_data *send; @@ -558,8 +558,8 @@ save_draft_folder (char *uri, CamelFolder *folder, gpointer data) void em_utils_composer_save_draft_cb (EMsgComposer *composer, int quit, gpointer user_data) { - extern char *default_drafts_folder_uri; - extern CamelFolder *drafts_folder; + const char *default_drafts_folder_uri = mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_DRAFTS); + CamelFolder *drafts_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_DRAFTS); struct _save_draft_info *sdi; CamelFolder *folder = NULL; CamelMimeMessage *msg; -- cgit v1.2.3