evolution r35703 - branches/gnome-2-22/plugins/backup-restore

[msuman svn gnome org]

Author: msuman
Date: Mon Jun 30 07:04:10 2008
New Revision: 35703
URL: http://svn.gnome.org/viewvc/evolution?rev=35703&view=rev

Log:
Patch from Milan Crha <mcrha redhat com> ** Fix for bug #536488 (Remove the .running file before backup and after restore).

Modified:
   branches/gnome-2-22/plugins/backup-restore/ChangeLog
   branches/gnome-2-22/plugins/backup-restore/backup.c

Modified: branches/gnome-2-22/plugins/backup-restore/backup.c
==============================================================================
--- branches/gnome-2-22/plugins/backup-restore/backup.c	(original)
+++ branches/gnome-2-22/plugins/backup-restore/backup.c	Mon Jun 30 07:04:10 2008
@@ -72,6 +72,8 @@
 	/* 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 @@
 	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);