diff options
| author | Suman Manjunath <msuman@src.gnome.org> | 2008-06-30 15:04:19 +0800 |
|---|---|---|
| committer | Suman Manjunath <msuman@src.gnome.org> | 2008-06-30 15:04:19 +0800 |
| commit | 49f22ddf6e7839230954af3cbbc64f2da8a1ffe9 (patch) | |
| tree | ee4be91ce0848f4813daf3e4e0cf446e8bbb9021 /plugins/backup-restore | |
| parent | cdf763e9d7f65a2bb94ab64f88b43b41a29e3e89 (diff) | |
| download | gsoc2013-evolution-49f22ddf6e7839230954af3cbbc64f2da8a1ffe9.tar.gz gsoc2013-evolution-49f22ddf6e7839230954af3cbbc64f2da8a1ffe9.tar.zst gsoc2013-evolution-49f22ddf6e7839230954af3cbbc64f2da8a1ffe9.zip | |
Patch from Milan Crha <mcrha@redhat.com> ** Fix for bug #536488 (Remove the .running file before backup and after restore).
svn path=/trunk/; revision=35704
Diffstat (limited to 'plugins/backup-restore')
| -rw-r--r-- | plugins/backup-restore/ChangeLog | 8 | ||||
| -rw-r--r-- | plugins/backup-restore/backup.c | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog index 04c319f227..cfa1dcc8ad 100644 --- a/plugins/backup-restore/ChangeLog +++ b/plugins/backup-restore/ChangeLog @@ -1,3 +1,11 @@ +2008-06-30 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #536488 + + * backup.c: (backup), (restore): Remove '~/.evolution/.running' + file before backup/after restore, thus Evolution will not claim + next start it was closed incorrectly. + 2008-06-30 Tobias Mueller <muelli@auftrags-killer.org> ** Fix for bug #540516 diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 8711871581..d923b3bd92 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -72,6 +72,8 @@ backup (const char *filename) /* FIXME Will the versioned setting always work? */ s (EVOLUTION " --force-shutdown"); + s ("rm $HOME/.evolution/.running"); + CANCEL (complete); txt = _("Backing Evolution accounts and settings"); s ("gconftool-2 --dump " GCONF_DIR " > " GCONF_DUMP_PATH); @@ -136,6 +138,7 @@ restore (const char *filename) s ("rm -rf " GCONF_DUMP_PATH); s ("rm -rf " EVOLUTION_DIR_BACKUP); s ("rm -rf $HOME/.camel_certs_old"); + s ("rm $HOME/.evolution/.running"); if (restart_arg) { CANCEL (complete); |