From 68dbed3700f1c97f58a14e01b761ae0d95b7d95e Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 5 May 2011 18:28:41 -0400
Subject: mail-config.c: Don't try to rename obsolete config files.

---
 mail/mail-config.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/mail/mail-config.c b/mail/mail-config.c
index eb359bd6ec..02d6f68cfe 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -227,11 +227,7 @@ uri_to_evname (const gchar *uri, const gchar *prefix)
 
 	safe = g_strdup (uri);
 	e_filename_make_safe (safe);
-	/* blah, easiest thing to do */
-	if (prefix[0] == '*')
-		tmp = g_strdup_printf ("%s/%s%s.xml", data_dir, prefix + 1, safe);
-	else
-		tmp = g_strdup_printf ("%s/%s%s", data_dir, prefix, safe);
+	tmp = g_strdup_printf ("%s/%s%s.xml", data_dir, prefix, safe);
 	g_free (safe);
 
 	return tmp;
@@ -364,11 +360,8 @@ folder_renamed_cb (MailFolderCache *cache,
 	gint i;
 
 	const gchar *cachenames[] = {
-		"config/hidestate-",
-		"config/et-expanded-",
-		"config/et-header-",
-		"*views/current_view-",
-		"*views/custom_view-",
+		"views/current_view-",
+		"views/custom_view-",
 		NULL };
 
 	class = CAMEL_STORE_GET_CLASS (store);
-- 
cgit v1.2.3