Don't migrate stuff here anymore.

2004-01-07  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-component.c (mail_component_init): Don't migrate stuff here
	anymore.

	* mail-ops.c (uid_cachename_hack): Removed a hack that checked for
	the really old uid cache location and make the uid cache live in a
	better location (why have mail/pop/<account> and
	mail/pop3/cache-<account>? simply put the cache file in
	mail/pop/<account>/uid-cache).

	* em-migrate.c (em_migrate_dir): When copying over mbox folders,
	don't abort if we fail to copy over a summary file (big
	whoop). Also, if indexing was turned on in the evolution 1.4
	version of the folder, turn on indexing for that folder in the
	migrated mbox folder as well.
	(em_migrate_pop_uid_caches): Migrate the pop3 uid-cache
	files. Fixes bug #52464.
	(em_migrate): Call em_migrate_pop_uid_caches().

svn path=/trunk/; revision=24094

1 files changed, 0 insertions, 23 deletions

diff --git a/mail/mail-component.c b/mail/mail-component.c
index a764e1b7c6..a05dbd7526 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -473,8 +473,6 @@ mail_component_init (MailComponent *component)
 {
 	MailComponentPrivate *priv;
 	EAccountList *accounts;
-	struct stat st;
-	char *mail_dir;
 	
 	priv = g_new0 (MailComponentPrivate, 1);
 	component->priv = priv;
@@ -493,27 +491,6 @@ mail_component_init (MailComponent *component)
 	priv->async_event = mail_async_event_new();
 	priv->store_hash = g_hash_table_new (NULL, NULL);
 	
-	/* migrate evolution 1.x folders to 2.0's location/format */
-	mail_dir = g_strdup_printf ("%s/mail", priv->base_directory);
-	if (stat (mail_dir, &st) == -1) {
-		CamelException ex;
-		
-		camel_exception_init (&ex);
-		if (em_migrate (component, &ex) == -1) {
-			GtkWidget *dialog;
-			
-			dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
-							 _("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);
-			gtk_widget_show (dialog);
-			
-			camel_exception_clear (&ex);
-		}
-	}
-	g_free (mail_dir);
-	
 	setup_local_store (component);
 	
 	accounts = mail_config_get_accounts ();