Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-core / tags / stable / src / synfig / main.cpp

diff --git a/synfig-core/tags/stable/src/synfig/main.cpp b/synfig-core/tags/stable/src/synfig/main.cpp
index a911a48..8d593ae 100644 (file)
--- a/synfig-core/tags/stable/src/synfig/main.cpp
+++ b/synfig-core/tags/stable/src/synfig/main.cpp
@@ -6,7 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**     Copyright (c) 2007 Chris Moore
+**     Copyright (c) 2007, 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
@@ -55,10 +55,6 @@
 
 #include "mutex.h"
 
-#ifdef DEATH_TIME
-#include <time.h>
-#endif
-
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif
@@ -81,13 +77,6 @@ static etl::reference_counter synfig_ref_count_(0);
 
 /* === M E T H O D S ======================================================= */
 
-
-
-
-
-
-
-
 const char *
 synfig::get_version()
 {
@@ -104,21 +93,11 @@ synfig::get_build_date()
        return __DATE__;
 }
 
-const char *
-synfig::get_build_time()
-{
-       return __TIME__;
-}
-
-extern const char *get_build_time();
-
 bool
 synfig::check_version_(int version,int vec_size, int color_size,int canvas_size,int layer_size)
 {
        bool ret=true;
 
-       CHECK_EXPIRE_TIME();
-
        if(version!=SYNFIG_LIBRARY_VERSION)
        {
                synfig::error(_("API Version mismatch (LIB:%d, PROG:%d)"),SYNFIG_LIBRARY_VERSION,version);
@@ -199,15 +178,9 @@ bool retrieve_modules_to_load(String filename,std::list<String> &modules_to_load
                }
        }
 
-
-
        return true;
 }
 
-
-
-
-
 synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
        ref_count_(synfig_ref_count_)
 {
@@ -219,8 +192,9 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
 
        // Add initialization after this point
 
-
-       CHECK_EXPIRE_TIME();
+#ifdef ENABLE_NLS
+       bindtextdomain("synfig", LOCALEDIR);
+#endif
 
        String prefix=basepath+"/..";
        unsigned int i;
@@ -277,8 +251,6 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
        // Load up the list importer
        Importer::book()[String("lst")]=ListImporter::create;
 
-
-
        // Load up the modules
        std::list<String> modules_to_load;
        std::vector<String> locations;
@@ -344,9 +316,6 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
 
 //     load_modules(cb);
 
-       CHECK_EXPIRE_TIME();
-
-
        if(cb)cb->amount_complete(100, 100);
        if(cb)cb->task(_("DONE"));
 }
@@ -370,25 +339,38 @@ synfig::Main::~Main()
                }
        }
 
-       synfig::info("ValueNode::subsys_stop()");
+       // synfig::info("ValueNode::subsys_stop()");
        ValueNode::subsys_stop();
-       synfig::info("Importer::subsys_stop()");
+       // synfig::info("Importer::subsys_stop()");
        Importer::subsys_stop();
-       synfig::info("Target::subsys_stop()");
+       // synfig::info("Target::subsys_stop()");
        Target::subsys_stop();
-       synfig::info("Layer::subsys_stop()");
+       // synfig::info("Layer::subsys_stop()");
        Layer::subsys_stop();
-       /*! \fixme For some reason, uncommenting the next line will cause things to crash.
-                          This needs to be looked into at some point. */
+       /*! \todo For some reason, uncommenting the next line will cause things to crash.
+                         This needs to be looked into at some point. */
        // synfig::info("Module::subsys_stop()");
        // Module::subsys_stop();
-       synfig::info("Exiting");
+       // synfig::info("Exiting");
        
 #if defined(HAVE_SIGNAL_H) && defined(SIGPIPE)
        signal(SIGPIPE, SIG_DFL);
 #endif
 }
 
+static const String
+current_time()
+{
+       const int buflen = 50;
+       time_t t;
+       struct tm *lt;
+       char b[buflen];
+       time(&t);
+       lt = localtime(&t);
+       strftime(b, buflen, " [%X] ", lt);
+       return String(b);
+}
+
 void
 synfig::error(const char *format,...)
 {
@@ -401,7 +383,7 @@ void
 synfig::error(const String &str)
 {
        static Mutex mutex; Mutex::Lock lock(mutex);
-       cerr<<"synfig("<<getpid()<<"): "<<_("error")<<": "+str<<endl;
+       cerr<<"synfig("<<getpid()<<")"<<current_time()<<_("error")<<": "+str<<endl;
 }
 
 void
@@ -416,7 +398,7 @@ void
 synfig::warning(const String &str)
 {
        static Mutex mutex; Mutex::Lock lock(mutex);
-       cerr<<"synfig("<<getpid()<<"): "<<_("warning")<<": "+str<<endl;
+       cerr<<"synfig("<<getpid()<<")"<<current_time()<<_("warning")<<": "+str<<endl;
 }
 
 void
@@ -431,5 +413,5 @@ void
 synfig::info(const String &str)
 {
        static Mutex mutex; Mutex::Lock lock(mutex);
-       cerr<<"synfig("<<getpid()<<"): "<<_("info")<<": "+str<<endl;
+       cerr<<"synfig("<<getpid()<<")"<<current_time()<<_("info")<<": "+str<<endl;
 }