Fix 1862720: "libltdl library and headers out of sync" - applied patch by Daniel...

[synfig.git] / synfig-core / trunk / src / synfig / main.cpp

diff --git a/synfig-core/trunk/src/synfig/main.cpp b/synfig-core/trunk/src/synfig/main.cpp
index 2c5be13..fa2018e 100644 (file)
--- a/synfig-core/trunk/src/synfig/main.cpp
+++ b/synfig-core/trunk/src/synfig/main.cpp
@@ -55,10 +55,6 @@
 
 #include "mutex.h"
 
-#ifdef DEATH_TIME
-#include <time.h>
-#endif
-
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif
@@ -117,8 +113,6 @@ synfig::check_version_(int version,int vec_size, int color_size,int canvas_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);
@@ -219,8 +213,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;
@@ -344,8 +339,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"));
@@ -378,8 +371,8 @@ synfig::Main::~Main()
        Target::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");