Wait until after setting up the local storage to find the

	* component-factory.c (owner_set_cb): Wait until after setting up
	the local storage to find the Drafts/Outbox/Sent folders.

	* mail-ops.c (do_setup_folder): Use the file: store rather than
	mbox:.

svn path=/trunk/; revision=6704

3 files changed, 16 insertions, 11 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index e5781f0f5b..623c52a8bd 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2000-11-28  Dan Winship  <danw@helixcode.com>
+
+	* component-factory.c (owner_set_cb): Wait until after setting up
+	the local storage to find the Drafts/Outbox/Sent folders.
+
+	* mail-ops.c (do_setup_folder): Use the file: store rather than
+	mbox:.
+
 2000-11-28  Jeffrey Stedfast  <fejj@helixcode.com>
 
 	* folder-browser-factory.c: Added the SaveAs bonobo menu verb
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 6b6f16cca4..b1f50f0a96 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -123,13 +123,7 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 	
 	evolution_dir = g_strdup (evolution_homedir);
 	mail_session_init ();
-
 	mail_config_init ();
-	mail_do_setup_folder ("Drafts", &drafts_folder);
-	mail_do_setup_folder ("Outbox", &outbox_folder);
-	mail_do_setup_folder ("Sent", &sent_folder);
-	/* Don't proceed until those _folder variables are valid. */
-	mail_operation_wait_for_finish ();
 
 	create_vfolder_storage (shell_component);
 
@@ -141,6 +135,12 @@ owner_set_cb (EvolutionShellComponent *shell_component,
 	mail_load_storages (corba_shell, sources);
 
 	mail_local_storage_startup (shell_client, evolution_dir);
+
+	mail_do_setup_folder ("Drafts", &drafts_folder);
+	mail_do_setup_folder ("Outbox", &outbox_folder);
+	mail_do_setup_folder ("Sent", &sent_folder);
+	/* Don't proceed until those _folder variables are valid. */
+	mail_operation_wait_for_finish ();
 }
 
 static void
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 1646c35416..1ef2af4074 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -2229,12 +2229,9 @@ do_setup_folder (gpointer in_data, gpointer op_data, CamelException *ex)
 	setup_folder_input_t *input = (setup_folder_input_t *) in_data;
 	gchar *url;
 
-	url = g_strdup_printf ("mbox://%s/local/%s", evolution_dir,
+	url = g_strdup_printf ("file://%s/local/%s", evolution_dir,
 			       input->name);
-	*(input->folder) = mail_tool_get_folder_from_urlname (url, "mbox",
-							      CAMEL_STORE_FOLDER_CREATE
-							      |CAMEL_STORE_FOLDER_BODY_INDEX,
-							      ex);
+	*(input->folder) = mail_tool_uri_to_folder (url, ex);
 	g_free (url);
 }