c4faf3231f
Copy from home:vuntz:branches:GNOME:Factory/evolution via accept of submit request 27636 revision 4. Request was accepted with message: accept OBS-URL: https://build.opensuse.org/request/show/27636 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=55
21 lines
707 B
Diff
21 lines
707 B
Diff
Index: plugins/backup-restore/backup.c
|
|
===================================================================
|
|
--- plugins/backup-restore/backup.c.orig
|
|
+++ plugins/backup-restore/backup.c
|
|
@@ -35,6 +35,7 @@
|
|
#define EVOUSERDATADIR_MAGIC "#EVO_USERDATADIR#"
|
|
|
|
#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"
|
|
@@ -267,6 +268,7 @@ restore (const gchar *filename)
|
|
|
|
replace_in_file (GCONF_DUMP_PATH, EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
|
|
|
|
+ run_cmd (PKILL " gconf");
|
|
run_cmd ("gconftool-2 --load " GCONF_DUMP_PATH);
|
|
|
|
CANCEL (complete);
|