Go back to generating the cachename ourselves, but continue doing it the

2001-09-17  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-config.c (mail_config_folder_to_cachename): Go back to
	generating the cachename ourselves, but continue doing it the way
	the dfault implementation of camel_folder_get_uri worked.

svn path=/trunk/; revision=12908

2 files changed, 12 insertions, 3 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 253396513f..1afc37de19 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-17  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* mail-config.c (mail_config_folder_to_cachename): Go back to
+	generating the cachename ourselves, but continue doing it the way
+	the dfault implementation of camel_folder_get_uri worked.
+
 2001-09-16  Christopher James Lahey  <clahey@ximian.com>
 
 	* message-list.c (ml_get_node_by_id): Made save_id const here.
diff --git a/mail/mail-config.c b/mail/mail-config.c
index d351907564..6ef4f15378 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -1806,15 +1806,18 @@ void
 mail_config_service_set_save_passwd (MailConfigService *service, gboolean save_passwd)
 {
 	service->save_passwd = save_passwd;
-	mail_config_write (); /*bleah*/
 }
 
 char *
 mail_config_folder_to_cachename (CamelFolder *folder, const char *prefix)
 {
-	char *url, *filename;
+	CamelService *service = CAMEL_SERVICE (folder->parent_store);
+	char *service_url, *url, *filename;
+	
+	service_url = camel_url_to_string (service->url, CAMEL_URL_HIDE_ALL);
+	url = g_strdup_printf ("%s/%s", service_url, folder->full_name);
+	g_free (service_url);
 	
-	url = camel_folder_get_uri (folder);
 	e_filename_make_safe (url);
 	
 	filename = g_strdup_printf ("%s/config/%s%s", evolution_dir, prefix, url);