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/importers/mail-importer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/importers/mail-importer.c') diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index 99241d8ddb..e3a56a4bc8 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -396,9 +396,9 @@ import_folders_rec(struct _import_folders_data *m, const char *filepath, const c break; } /* FIXME: need a better way to get default store location */ - uri = g_strdup_printf("mbox:%s/mail/local#%s", mail_component_peek_base_directory(NULL), folder); + uri = g_strdup_printf("mbox:%s/local#%s", mail_component_peek_base_directory(NULL), folder); } else { - uri = g_strdup_printf("mbox:%s/mail/local#%s/%s", mail_component_peek_base_directory(NULL), folderparent, folder); + uri = g_strdup_printf("mbox:%s/local#%s/%s", mail_component_peek_base_directory(NULL), folderparent, folder); } printf("importing to uri %s\n", uri); -- cgit v1.2.3