[evolution] Bug #682820 - Settings not converted on backup restore

[Milan Crha <mcrha src gnome org>]

commit 39cf487cca102d159a224a7c7c6d2096021b1c1d
Author: Milan Crha <mcrha redhat com>
Date:   Wed Sep 5 11:07:48 2012 +0200

    Bug #682820 - Settings not converted on backup restore

 modules/backup-restore/evolution-backup-tool.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c
index 9f46d90..bc6ee27 100644
--- a/modules/backup-restore/evolution-backup-tool.c
+++ b/modules/backup-restore/evolution-backup-tool.c
@@ -578,6 +578,8 @@ restore (const gchar *filename,
 				EVOLUTION_DIR ANCIENT_GCONF_DUMP_FILE,
 				EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
 			run_cmd ("gconftool-2 --load " EVOLUTION_DIR ANCIENT_GCONF_DUMP_FILE);
+			/* do not forget to convert GConf keys into GSettings */
+			run_cmd ("gsettings-data-convert");
 			run_cmd ("rm " EVOLUTION_DIR ANCIENT_GCONF_DUMP_FILE);
 		} else {
 			replace_in_file (
@@ -611,6 +613,9 @@ restore (const gchar *filename,
 		run_cmd (command);
 		g_free (command);
 
+		/* do not forget to convert GConf keys into GSettings */
+		run_cmd ("gsettings-data-convert");
+
 		command = g_strconcat ("rm ", gconf_dump_file, NULL);
 		run_cmd (command);
 		g_free (command);