aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-05-06 06:28:41 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-05-06 06:37:07 +0800
commit68dbed3700f1c97f58a14e01b761ae0d95b7d95e (patch)
tree7da90fc2919763089c69f0a5e5d9a2f2a086ae45
parentb8bb681c179c59e18a0fd361806cfbdaafd7c269 (diff)
downloadgsoc2013-evolution-68dbed3700f1c97f58a14e01b761ae0d95b7d95e.tar.gz
gsoc2013-evolution-68dbed3700f1c97f58a14e01b761ae0d95b7d95e.tar.zst
gsoc2013-evolution-68dbed3700f1c97f58a14e01b761ae0d95b7d95e.zip
mail-config.c: Don't try to rename obsolete config files.
-rw-r--r--mail/mail-config.c13
1 files 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);