diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2008-03-12 20:25:24 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-03-12 20:25:24 +0800 |
| commit | cc692562f528115284d338dea12f8809d1efd17f (patch) | |
| tree | 07150f4269ee1125a5c867fbd7dc72de81520873 /mail/mail-folder-cache.c | |
| parent | da53bb3e1f23f696e1245676b71fe617a5f4a48a (diff) | |
| download | gsoc2013-evolution-cc692562f528115284d338dea12f8809d1efd17f.tar.gz gsoc2013-evolution-cc692562f528115284d338dea12f8809d1efd17f.tar.zst gsoc2013-evolution-cc692562f528115284d338dea12f8809d1efd17f.zip | |
** Fixes breakage caused by bug #513951
2008-03-12 Matthew Barnes <mbarnes@redhat.com>
** 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
Diffstat (limited to 'mail/mail-folder-cache.c')
| -rw-r--r-- | mail/mail-folder-cache.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index 417f115999..95709e7d5f 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -646,13 +646,13 @@ rename_folders(struct _store_info *si, const char *oldbase, const char *newbase, e_filename_make_safe(olduri); newuri = folder_to_url(si->store, fi->full_name); e_filename_make_safe(newuri); - oldfile = g_strdup_printf("%s/mail/config/custom_view-%s.xml", mail_component_peek_base_directory(NULL), olduri); - newfile = g_strdup_printf("%s/mail/config/custom_view-%s.xml", mail_component_peek_base_directory(NULL), newuri); + oldfile = g_strdup_printf("%s/config/custom_view-%s.xml", mail_component_peek_base_directory(NULL), olduri); + newfile = g_strdup_printf("%s/config/custom_view-%s.xml", mail_component_peek_base_directory(NULL), newuri); g_rename(oldfile, newfile); g_free(oldfile); g_free(newfile); - oldfile = g_strdup_printf("%s/mail/config/current_view-%s.xml", mail_component_peek_base_directory(NULL), olduri); - newfile = g_strdup_printf("%s/mail/config/current_view-%s.xml", mail_component_peek_base_directory(NULL), newuri); + oldfile = g_strdup_printf("%s/config/current_view-%s.xml", mail_component_peek_base_directory(NULL), olduri); + newfile = g_strdup_printf("%s/config/current_view-%s.xml", mail_component_peek_base_directory(NULL), newuri); g_rename(oldfile, newfile); g_free(oldfile); g_free(newfile); |