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

1 files changed, 7 insertions, 5 deletions

diff --git a/mail/mail-component.c b/mail/mail-component.c
index afb769564b..f22cb656b3 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -70,6 +70,8 @@
 #include <bonobo/bonobo-widget.h>
 
 
+#define d(x) x
+
 #define MESSAGE_RFC822_TYPE   "message/rfc822"
 #define TEXT_URI_LIST_TYPE    "text/uri-list"
 #define UID_LIST_TYPE         "x-uid-list"
@@ -1009,7 +1011,7 @@ mail_component_init (MailComponent *component)
 			GtkWidget *dialog;
 			
 			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
-							 _("Some of your mail folders were unable to be migrated:\n%s"),
+							 _("The following error occured while migrating your mail data:\n%s"),
 							 camel_exception_get_description (&ex));
 			
 			g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
@@ -1286,8 +1288,9 @@ char *em_uri_from_camel(const char *curi)
 	if (path[0] == '/')
 		path++;
 	euri = g_strdup_printf("email://%s/%s", uid, path);
-	printf("em uri from camel '%s' -> '%s'\n", curi, euri);
-
+	
+	d(printf("em uri from camel '%s' -> '%s'\n", curi, euri));
+	
 	return euri;
 }
 
@@ -1313,7 +1316,6 @@ char *em_uri_to_camel(const char *euri)
 	g_assert(eurl->host != NULL);
 
 	if (strcmp(eurl->user, "local") == 0 && strcmp(eurl->host, "local") == 0) {
-		/* FIXME: needs to track real local store location */
 		curi = g_strdup_printf("mbox:%s/.evolution/mail/local#%s", g_get_home_dir(), eurl->path);
 		camel_url_free(eurl);
 		return curi;
@@ -1344,7 +1346,7 @@ char *em_uri_to_camel(const char *euri)
 	camel_url_free(eurl);
 	camel_url_free(curl);
 
-	printf("em uri to camel '%s' -> '%s'\n", euri, curi);
+	d(printf("em uri to camel '%s' -> '%s'\n", euri, curi));
 
 	return curi;
 }