From cc692562f528115284d338dea12f8809d1efd17f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 12 Mar 2008 12:25:24 +0000 Subject: ** Fixes breakage caused by bug #513951 2008-03-12 Matthew Barnes ** Fixes breakage caused by bug #513951 * mail-autofilter.c (filter_gui_add_from_message), (mail_filter_rename_uri), (mail_filter_delete_uri): * mail-tools.c (mail_tool_get_local_movemail_path): * mail-vfolder.c (mail_vfolder_delete_uri), (mail_vfolder_rename_uri), (store_folder_deleted), (store_folder_renamed), (vfolder_load_storage), (vfolder_revert), (em_vfolder_editor_response), (edit_rule_response), (new_rule_clicked): * em-folder-browser.c (emfb_search_search_activated): * em-folder-tree.c (em_folder_tree_new): * mail-ops.c (uid_cachename_hack), (empty_trash_exec): * em-folder-view.c (emfv_setup_view_instance): * em-utils.c (em_filter_editor_response), (em_utils_edit_filters): * importers/mail-importer.c (import_folders_rec): * mail-folder-cache.c (rename_folders): * em-format-html.c (em_format_html_get_type): * mail-session.c (main_get_filter_driver): * mail-config.c (gconf_mime_types_changed), (uri_to_evname), (mail_config_folder_to_cachename), (get_new_signature_filename): Adapt to new meaning of mail_component_peek_base_directory(). * mail-component.c (mail_component_init): Add back initialization of priv->base_directory. Accidentally removed it somehow in last commit. svn path=/trunk/; revision=35179 --- mail/mail-ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/mail-ops.c') diff --git a/mail/mail-ops.c b/mail/mail-ops.c index f11c2e0258..36f45efe6e 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -252,7 +252,7 @@ uid_cachename_hack (CamelStore *store) e_filename_make_safe (encoded_url); evolution_dir = mail_component_peek_base_directory (mail_component_peek ()); - filename = g_build_filename (evolution_dir, "mail", "pop", encoded_url, "uid-cache", NULL); + filename = g_build_filename (evolution_dir, "pop", encoded_url, "uid-cache", NULL); g_free (encoded_url); return filename; @@ -1647,7 +1647,7 @@ empty_trash_exec (struct _empty_trash_msg *m) trash = mail_tool_get_trash (m->account->source->url, FALSE, &m->base.ex); } else { evolution_dir = mail_component_peek_base_directory (mail_component_peek ()); - uri = g_strdup_printf ("mbox:%s/mail/local", evolution_dir); + uri = g_strdup_printf ("mbox:%s/local", evolution_dir); trash = mail_tool_get_trash (uri, TRUE, &m->base.ex); g_free (uri); } -- cgit