Remove .gitignore do nothing is ignored.

[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 d8b1ae6..1b55eb4 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/autorecover.cpp
+++ b/synfig-studio/trunk/src/gtkmm/autorecover.cpp
@@ -2,10 +2,11 @@
 /*!    \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
+**     Copyright (c) 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -62,6 +63,8 @@
 #include <unistd.h>
 #endif
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -87,7 +90,7 @@ AutoRecover::AutoRecover()
 {
        // Three Minutes
        set_timeout(3*60*1000);
-       
+
        if(mkdir(get_shadow_directory().c_str(),ACCESSPERMS)<0)
        {
                if(errno!=EEXIST)
@@ -133,11 +136,11 @@ AutoRecover::get_shadow_file_name(const synfig::String& filename)
        unsigned int hash2(0x83502529);
        char* str_hash1(reinterpret_cast<char*>(&hash1));
        char* str_hash2(reinterpret_cast<char*>(&hash2));
-       
+
        // First we need to hash up the directory
        {
                String pool(dirname(filename));
-               
+
                while(pool.size()>4)
                {
                        str_hash1[0]^=pool[1];str_hash1[1]^=pool[2];str_hash1[2]^=pool[3];str_hash1[3]^=pool[0];
@@ -156,10 +159,10 @@ AutoRecover::get_shadow_file_name(const synfig::String& filename)
                }
        }
        hash1^=hash2;
-       
+
        return Glib::build_filename(get_shadow_directory(),strprintf("%08X-%s",hash1,basename(filename).c_str()));
-       
-//     return dirname(filename) + ETL_DIRECTORY_SEPERATOR + ".shadow_" + basename(filename);
+
+//     return dirname(filename) + ETL_DIRECTORY_SEPARATOR + ".shadow_" + basename(filename);
 }
 
 bool
@@ -176,8 +179,8 @@ AutoRecover::cleanup_pid(int 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;
 }
@@ -190,7 +193,7 @@ AutoRecover::auto_backup()
 #ifdef HAVE_FORK
        pid=fork();
 #endif
-       
+
        if(pid<=0)
        {
 #ifdef HAVE_SETPRIORITY
@@ -198,16 +201,16 @@ AutoRecover::auto_backup()
                // cause the machine to slow down too much
                setpriority(PRIO_PROCESS,0,15);
 #endif
-               
+
                try
                {
                        std::list<etl::handle<Instance> >::iterator iter;
-       
+
                        std::string filename=App::get_config_file("autorecovery");
                        std::ofstream file(filename.c_str());
-                       
+
                        int savecount(0);
-                       
+
                        for(iter=App::instance_list.begin();iter!=App::instance_list.end();++iter)
                        {
                                // If this file hasn't even been changed
@@ -215,22 +218,22 @@ AutoRecover::auto_backup()
                                // backing it up.
                                if((*iter)->get_action_count()==0)
                                        continue;
-                                       
+
                                Canvas::Handle canvas((*iter)->get_canvas());
                                file<<canvas->get_file_name()<<endl;
                                save_canvas(get_shadow_file_name(canvas->get_file_name()),canvas);
                                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(...)
                {
                        synfig::error("AutoRecover::auto_backup(): UNKNOWN EXCEPTION THROWN.");
                        synfig::error("AutoRecover::auto_backup(): FILES NOT BACKED UP.");
                }
-               
+
 #ifdef HAVE_FORK
                if(pid==0)
                {
@@ -247,11 +250,11 @@ AutoRecover::auto_backup()
                ),
                60*1000
        );
-#endif 
-       
+#endif
+
        // Also go ahead and save the settings
        App::save_settings();
-       
+
        return true;
 }
 
@@ -270,19 +273,20 @@ AutoRecover::recovery_needed()const
                if(!filename.empty())
                        return true;
        }
-       
+
        return false;
 }
 
 bool
-AutoRecover::recover()
+AutoRecover::recover(int& number_recovered)
 {
        std::string filename=App::get_config_file("autorecovery");
        std::ifstream file(filename.c_str());
+       number_recovered = 0;
        if(!file)
                return false;
        bool success=true;
-       
+
        while(file)
        {
                std::string filename;
@@ -295,9 +299,11 @@ AutoRecover::recover()
                {
                        // Correct the file name
                        App::instance_list.back()->set_file_name(filename);
-                       
+
                        // This file isn't saved! mark it as such
                        App::instance_list.back()->inc_action_count();
+
+                       number_recovered++;
                }
                else
                        success=false;