projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check if Gtk::AboutDialog::set_program_name is available and only use it if it is...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
autorecover.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/autorecover.cpp
b/synfig-studio/trunk/src/gtkmm/autorecover.cpp
index
1f1dea3
..
b97f7fb
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/autorecover.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/autorecover.cpp
@@
-2,7
+2,7
@@
/*! \file autorecover.cpp
** \brief Template File
**
/*! \file autorecover.cpp
** \brief Template File
**
-** $Id
: autorecover.cpp,v 1.1.1.1 2005/01/07 03:34:35 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-62,6
+62,8
@@
#include <unistd.h>
#endif
#include <unistd.h>
#endif
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-159,7
+161,7
@@
AutoRecover::get_shadow_file_name(const synfig::String& filename)
return Glib::build_filename(get_shadow_directory(),strprintf("%08X-%s",hash1,basename(filename).c_str()));
return Glib::build_filename(get_shadow_directory(),strprintf("%08X-%s",hash1,basename(filename).c_str()));
-// return dirname(filename) + ETL_DIRECTORY_SEP
E
RATOR + ".shadow_" + basename(filename);
+// return dirname(filename) + ETL_DIRECTORY_SEP
A
RATOR + ".shadow_" + basename(filename);
}
bool
}
bool
@@
-176,8
+178,8
@@
AutoRecover::cleanup_pid(int pid)
{
synfig::error("Autobackup seems to have failed! (PID=%d)",pid);
}
{
synfig::error("Autobackup seems to have failed! (PID=%d)",pid);
}
-
else
-
synfig::info("PID=%d has been cleaned up",pid);
+
//
else
+
//
synfig::info("PID=%d has been cleaned up",pid);
#endif
return false;
}
#endif
return false;
}
@@
-222,8
+224,8
@@
AutoRecover::auto_backup()
savecount++;
}
savecount++;
}
-
if(savecount)
-
synfig::info("AutoRecover::auto_backup(): %d Files backed up.",savecount);
+
//
if(savecount)
+
//
synfig::info("AutoRecover::auto_backup(): %d Files backed up.",savecount);
}
catch(...)
{
}
catch(...)
{
@@
-275,10
+277,11
@@
AutoRecover::recovery_needed()const
}
bool
}
bool
-AutoRecover::recover()
+AutoRecover::recover(
int& number_recovered
)
{
std::string filename=App::get_config_file("autorecovery");
std::ifstream file(filename.c_str());
{
std::string filename=App::get_config_file("autorecovery");
std::ifstream file(filename.c_str());
+ number_recovered = 0;
if(!file)
return false;
bool success=true;
if(!file)
return false;
bool success=true;
@@
-298,6
+301,8
@@
AutoRecover::recover()
// This file isn't saved! mark it as such
App::instance_list.back()->inc_action_count();
// This file isn't saved! mark it as such
App::instance_list.back()->inc_action_count();
+
+ number_recovered++;
}
else
success=false;
}
else
success=false;