diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2003-11-07 05:54:49 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-11-07 05:54:49 +0800 |
| commit | 49265bef8d773e845ec967acf6e2c1f1b670c995 (patch) | |
| tree | bebf284de1b5844d639e489cba0d2d942ac664c5 /mail/mail-autofilter.c | |
| parent | 621d5972f4c85456bc51de36fd2dd2c58520c7f4 (diff) | |
| download | gsoc2013-evolution-49265bef8d773e845ec967acf6e2c1f1b670c995.tar gsoc2013-evolution-49265bef8d773e845ec967acf6e2c1f1b670c995.tar.gz gsoc2013-evolution-49265bef8d773e845ec967acf6e2c1f1b670c995.tar.bz2 gsoc2013-evolution-49265bef8d773e845ec967acf6e2c1f1b670c995.tar.lz gsoc2013-evolution-49265bef8d773e845ec967acf6e2c1f1b670c995.tar.xz gsoc2013-evolution-49265bef8d773e845ec967acf6e2c1f1b670c995.tar.zst gsoc2013-evolution-49265bef8d773e845ec967acf6e2c1f1b670c995.zip | |
User vfolder rules should be in ${evolution_dir}/mail/vfolders.xml rather
2003-11-06 Jeffrey Stedfast <fejj@ximian.com>
* mail-vfolder.c (mail_vfolder_delete_uri): User vfolder rules
should be in ${evolution_dir}/mail/vfolders.xml rather than
${evolution_dir}/vfolders.xml
(mail_vfolder_rename_uri): Same.
(store_folder_deleted): Here too.
(store_folder_renamed): And here.
(vfolder_load_storage): Again here.
(vfolder_editor_response): Same.
(edit_rule_response): And here.
(new_rule_clicked): Here too.
* mail-session.c (main_get_filter_driver): User filter rules
should be in ${evolution_dir}/mail/filters.xml rather than
${evolution_dir}/filters.xml
* mail-autofilter.c (filter_gui_add_from_message): Same.
(mail_filter_rename_uri): And here.
(mail_filter_delete_uri): Here too.
* em-utils.c (filter_editor_response): Again here.
(em_utils_edit_filters): Same.
* em-migrate.c (em_migrate_filter_file): Same (also for
vfolders.xml)
2003-11-05 Jeffrey Stedfast <fejj@ximian.com>
* em-migrate.[c,h]: New source files to migrate from the old mail
directory to the new mail directory.
* mail-component.c (mail_component_init): Changed to use
~/.evolution and added code to migrate the old mail folders over
if ~/.evolution/mail does not yet exist.
svn path=/trunk/; revision=23201
Diffstat (limited to 'mail/mail-autofilter.c')
| -rw-r--r-- | mail/mail-autofilter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index 06149ed3dd..3eee3ad8eb 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -355,7 +355,7 @@ filter_gui_add_from_message (CamelMimeMessage *msg, const char *source, int flag g_return_if_fail (msg != NULL); fc = filter_context_new (); - user = g_strdup_printf ("%s/filters.xml", + user = g_strdup_printf ("%s/mail/filters.xml", mail_component_peek_base_directory (mail_component_peek ())); system = EVOLUTION_PRIVDATADIR "/filtertypes.xml"; rule_context_load ((RuleContext *)fc, system, user); @@ -377,7 +377,7 @@ mail_filter_rename_uri(CamelStore *store, const char *olduri, const char *newuri GList *changed; fc = filter_context_new (); - user = g_strdup_printf ("%s/filters.xml", mail_component_peek_base_directory (mail_component_peek ())); + user = g_strdup_printf ("%s/mail/filters.xml", mail_component_peek_base_directory (mail_component_peek ())); system = EVOLUTION_PRIVDATADIR "/filtertypes.xml"; rule_context_load ((RuleContext *)fc, system, user); @@ -402,7 +402,7 @@ mail_filter_delete_uri(CamelStore *store, const char *uri) GList *deleted; fc = filter_context_new (); - user = g_strdup_printf ("%s/filters.xml", mail_component_peek_base_directory (mail_component_peek ())); + user = g_strdup_printf ("%s/mail/filters.xml", mail_component_peek_base_directory (mail_component_peek ())); system = EVOLUTION_PRIVDATADIR "/filtertypes.xml"; rule_context_load ((RuleContext *)fc, system, user); |