evolution/bnc-433448-backup-restore-fails.patch

21 lines
645 B
Diff
Raw Normal View History

Index: plugins/backup-restore/backup.c
===================================================================
--- plugins/backup-restore/backup.c (revision 36769)
+++ plugins/backup-restore/backup.c (working copy)
@@ -39,6 +39,7 @@
#include "e-util/e-util.h"
#define EVOLUTION "evolution"
+#define PKILL "/usr/bin/pkill"
#define EVOLUTION_DIR "$HOME/.evolution/"
#define EVOLUTION_DIR_BACKUP "$HOME/.evolution-old/"
#define GCONF_DUMP_FILE "backup-restore-gconf.xml"
@@ -272,6 +273,7 @@
CANCEL (complete);
txt = _("Loading Evolution settings");
+ s (PKILL " gconf");
s ("gconftool-2 --load " GCONF_DUMP_PATH);
CANCEL (complete);