aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-07-10 21:17:22 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-07-10 21:19:28 +0800
commit1c31145422a94f45be82ca95438cbc91ce2f173e (patch)
treebeb6fbaf7d57200e626f0caaa92b66d06bec78e7
parent7d7a00b92c2dddb767ef79bca6e805c2e9074016 (diff)
downloadgsoc2013-evolution-1c31145422a94f45be82ca95438cbc91ce2f173e.tar
gsoc2013-evolution-1c31145422a94f45be82ca95438cbc91ce2f173e.tar.gz
gsoc2013-evolution-1c31145422a94f45be82ca95438cbc91ce2f173e.tar.bz2
gsoc2013-evolution-1c31145422a94f45be82ca95438cbc91ce2f173e.tar.lz
gsoc2013-evolution-1c31145422a94f45be82ca95438cbc91ce2f173e.tar.xz
gsoc2013-evolution-1c31145422a94f45be82ca95438cbc91ce2f173e.tar.zst
gsoc2013-evolution-1c31145422a94f45be82ca95438cbc91ce2f173e.zip
Bug 702664 - Settings migration issue from "headers" to "show-headers"
My previous patch didn't go far enough to repair an already-corrupted "show-headers" key. Need to actually reset it to its default value if the "headers" key is empty.
-rw-r--r--modules/settings/e-settings-deprecated.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/settings/e-settings-deprecated.c b/modules/settings/e-settings-deprecated.c
index d22dbf99e8..9e2d17615f 100644
--- a/modules/settings/e-settings-deprecated.c
+++ b/modules/settings/e-settings-deprecated.c
@@ -526,6 +526,8 @@ settings_deprecated_constructed (GObject *object)
if (variant != NULL)
g_settings_set_value (
priv->mail_settings, "show-headers", variant);
+ else
+ g_settings_reset (priv->mail_settings, "show-headers");
g_strfreev (strv_value);
/* XXX The "reply-style" key uses a completely different