aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-vfolder.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-11-07 05:54:49 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-11-07 05:54:49 +0800
commit49265bef8d773e845ec967acf6e2c1f1b670c995 (patch)
treebebf284de1b5844d639e489cba0d2d942ac664c5 /mail/mail-vfolder.c
parent621d5972f4c85456bc51de36fd2dd2c58520c7f4 (diff)
downloadgsoc2013-evolution-49265bef8d773e845ec967acf6e2c1f1b670c995.tar.gz
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-vfolder.c')
-rw-r--r--mail/mail-vfolder.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 0e8e81dfd4..f47fe4c660 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -471,7 +471,7 @@ mail_vfolder_delete_uri(CamelStore *store, const char *uri)
g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
gtk_widget_show (dialog);
- user = g_strdup_printf ("%s/vfolders.xml",
+ user = g_strdup_printf ("%s/mail/vfolders.xml",
mail_component_peek_base_directory (mail_component_peek ()));
rule_context_save ((RuleContext *) context, user);
g_free (user);
@@ -527,7 +527,7 @@ mail_vfolder_rename_uri(CamelStore *store, const char *from, const char *to)
char *user;
d(printf("Vfolders updated from renamed folder\n"));
- user = g_strdup_printf("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
+ user = g_strdup_printf("%s/mail/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
rule_context_save((RuleContext *)context, user);
g_free(user);
}
@@ -700,8 +700,8 @@ store_folder_deleted(CamelObject *o, void *event_data, void *data)
rule_context_remove_rule((RuleContext *)context, rule);
g_object_unref(rule);
g_signal_connect(context, "rule_removed", G_CALLBACK(context_rule_removed), context);
-
- user = g_strdup_printf("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
+
+ user = g_strdup_printf("%s/mail/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
rule_context_save((RuleContext *)context, user);
g_free(user);
} else {
@@ -742,7 +742,7 @@ store_folder_renamed(CamelObject *o, void *event_data, void *data)
filter_rule_set_name(rule, info->new->full_name);
g_signal_connect(rule, "changed", G_CALLBACK(rule_changed), folder);
- user = g_strdup_printf("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
+ user = g_strdup_printf("%s/mail/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
rule_context_save((RuleContext *)context, user);
g_free(user);
@@ -780,7 +780,7 @@ vfolder_load_storage(void)
mail_component_load_storage_by_uri(mail_component_peek (), storeuri, _("VFolders"));
/* load our rules */
- user = g_strdup_printf ("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
+ user = g_strdup_printf ("%s/mail/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
context = vfolder_context_new ();
if (rule_context_load ((RuleContext *)context,
EVOLUTION_PRIVDATADIR "/vfoldertypes.xml", user) != 0) {
@@ -810,7 +810,7 @@ vfolder_editor_response (GtkWidget *dialog, int button, void *data)
{
char *user;
- user = g_strdup_printf ("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
+ user = g_strdup_printf ("%s/mail/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
switch(button) {
case GTK_RESPONSE_ACCEPT:
@@ -851,7 +851,7 @@ edit_rule_response(GtkWidget *w, int button, void *data)
FilterRule *orig = g_object_get_data (G_OBJECT (w), "orig");
filter_rule_copy(orig, rule);
- user = g_strdup_printf("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
+ user = g_strdup_printf("%s/mail/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
rule_context_save((RuleContext *)context, user);
g_free(user);
}
@@ -930,7 +930,7 @@ new_rule_clicked(GtkWidget *w, int button, void *data)
g_object_ref(rule);
rule_context_add_rule((RuleContext *)context, rule);
- user = g_strdup_printf("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
+ user = g_strdup_printf("%s/mail/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
rule_context_save((RuleContext *)context, user);
g_free(user);
}