projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more updates
[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
06c1db3
..
f1e8567
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/autorecover.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/autorecover.cpp
@@
-1,4
+1,4
@@
-/* === S
I N F G ==
========================================================= */
+/* === S
Y N F I G
========================================================= */
/*! \file autorecover.cpp
** \brief Template File
**
/*! \file autorecover.cpp
** \brief Template File
**
@@
-32,8
+32,8
@@
//#include <unistd.h>
#include "app.h"
//#include <unistd.h>
#include "app.h"
-#include <s
inf
g/savecanvas.h>
-#include <s
inf
g/loadcanvas.h>
+#include <s
ynfi
g/savecanvas.h>
+#include <s
ynfi
g/loadcanvas.h>
#include <fstream>
#include <iostream>
#include "instance.h"
#include <fstream>
#include <iostream>
#include "instance.h"
@@
-64,7
+64,7
@@
using namespace std;
using namespace etl;
using namespace std;
using namespace etl;
-using namespace s
inf
g;
+using namespace s
ynfi
g;
using namespace studio;
/* === M A C R O S ========================================================= */
using namespace studio;
/* === M A C R O S ========================================================= */
@@
-87,11
+87,11
@@
AutoRecover::AutoRecover()
if(mkdir(get_shadow_directory().c_str(),ACCESSPERMS)<0)
{
if(errno!=EEXIST)
if(mkdir(get_shadow_directory().c_str(),ACCESSPERMS)<0)
{
if(errno!=EEXIST)
- s
inf
g::error("UNABLE TO CREATE \"%s\"",get_shadow_directory().c_str());
+ s
ynfi
g::error("UNABLE TO CREATE \"%s\"",get_shadow_directory().c_str());
}
else
{
}
else
{
- s
inf
g::info("Created directory \"%s\"",get_shadow_directory().c_str());
+ s
ynfi
g::info("Created directory \"%s\"",get_shadow_directory().c_str());
}
}
}
}
@@
-99,7
+99,7
@@
AutoRecover::~AutoRecover()
{
}
{
}
-s
inf
g::String
+s
ynfi
g::String
AutoRecover::get_shadow_directory()
{
return Glib::build_filename(App::get_user_app_directory(),"tmp");
AutoRecover::get_shadow_directory()
{
return Glib::build_filename(App::get_user_app_directory(),"tmp");
@@
-122,8
+122,8
@@
AutoRecover::set_timeout(int milliseconds)
// auto_backup_connect=App::main.get_context()->signal_timeout().connect(sigc::mem_fun(&AutoRecover::auto_backup),timeout);
}
// auto_backup_connect=App::main.get_context()->signal_timeout().connect(sigc::mem_fun(&AutoRecover::auto_backup),timeout);
}
-s
inf
g::String
-AutoRecover::get_shadow_file_name(const s
inf
g::String& filename)
+s
ynfi
g::String
+AutoRecover::get_shadow_file_name(const s
ynfi
g::String& filename)
{
unsigned int hash1(0xdeadbeef);
unsigned int hash2(0x83502529);
{
unsigned int hash1(0xdeadbeef);
unsigned int hash2(0x83502529);
@@
-165,15
+165,15
@@
AutoRecover::cleanup_pid(int pid)
int status=0;
if(waitpid(pid,&status,WNOHANG)==-1)
{
int status=0;
if(waitpid(pid,&status,WNOHANG)==-1)
{
- s
inf
g::info("PID %d isn't a zombie yet",pid);
+ s
ynfi
g::info("PID %d isn't a zombie yet",pid);
return true;
}
if(WEXITSTATUS(status)!=0)
{
return true;
}
if(WEXITSTATUS(status)!=0)
{
- s
inf
g::error("Autobackup seems to have failed! (PID=%d)",pid);
+ s
ynfi
g::error("Autobackup seems to have failed! (PID=%d)",pid);
}
else
}
else
- s
inf
g::info("PID=%d has been cleaned up",pid);
+ s
ynfi
g::info("PID=%d has been cleaned up",pid);
#endif
return false;
}
#endif
return false;
}
@@
-219,12
+219,12
@@
AutoRecover::auto_backup()
}
if(savecount)
}
if(savecount)
- s
inf
g::info("AutoRecover::auto_backup(): %d Files backed up.",savecount);
+ s
ynfi
g::info("AutoRecover::auto_backup(): %d Files backed up.",savecount);
}
catch(...)
{
}
catch(...)
{
- s
inf
g::error("AutoRecover::auto_backup(): UNKNOWN EXCEPTION THROWN.");
- s
inf
g::error("AutoRecover::auto_backup(): FILES NOT BACKED UP.");
+ s
ynfi
g::error("AutoRecover::auto_backup(): UNKNOWN EXCEPTION THROWN.");
+ s
ynfi
g::error("AutoRecover::auto_backup(): FILES NOT BACKED UP.");
}
#ifdef HAVE_FORK
}
#ifdef HAVE_FORK
@@
-313,7
+313,7
@@
AutoRecover::normal_shutdown()
}
void
}
void
-AutoRecover::clear_backup(s
inf
g::Canvas::Handle canvas)
+AutoRecover::clear_backup(s
ynfi
g::Canvas::Handle canvas)
{
if(canvas)
remove(get_shadow_file_name(canvas->get_file_name()).c_str());
{
if(canvas)
remove(get_shadow_file_name(canvas->get_file_name()).c_str());