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-component.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'mail/mail-component.c') diff --git a/mail/mail-component.c b/mail/mail-component.c index 66f0833658..abe98170a0 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -1209,6 +1209,18 @@ mail_component_init (MailComponent *component) priv->lock = g_mutex_new(); priv->quit_state = -1; + /* FIXME This is used as both a filename and URI path throughout + * the mail code. Need to clean this up; maybe provide a + * mail_component_get_base_uri() function. */ + priv->base_directory = g_build_filename (e_get_user_data_dir (), "mail", NULL); +#ifdef G_OS_WIN32 + { + char *p = priv->base_directory; + while ((p = strchr(p, '\\'))) + *p++ = '/'; + } +#endif + if (g_mkdir_with_parents (e_get_user_data_dir (), 0777) == -1 && errno != EEXIST) abort (); -- cgit v1.2.3