[evolution] Bug 702664 - Settings migration issue from "headers" to "show-headers"

[Matthew Barnes <mbarnes src gnome org>]

commit 1c31145422a94f45be82ca95438cbc91ce2f173e
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Jul 10 09:17:22 2013 -0400

    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.

 modules/settings/e-settings-deprecated.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/modules/settings/e-settings-deprecated.c b/modules/settings/e-settings-deprecated.c
index d22dbf9..9e2d176 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