X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fgeneral.h;h=639eb514098448521f6e372bb1e2e0500573cace;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=38b4565486a206bb030cb73cba0824c084836747;hpb=4ec81d053bf1d0cbcd9f0bf048914ec8eca08f4c;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/general.h b/synfig-core/trunk/src/synfig/general.h
index 38b4565..639eb51 100644
--- a/synfig-core/trunk/src/synfig/general.h
+++ b/synfig-core/trunk/src/synfig/general.h
@@ -30,15 +30,21 @@
 #include <ETL/stringf>
 #include "string.h"
 #include "version.h"
-#include <locale.h>
+#ifdef ENABLE_NLS
+ #include <locale.h>
+ #include <libintl.h>
+#endif
 
 /* === M A C R O S ========================================================= */
 
-// Quick hack to keep stuff working until gettext support is added
-#ifndef _
-#define _(x)		(x)
-#define N_(x)		(x)
-//#define gettext(x)	(x)
+#ifdef ENABLE_NLS
+#define _(x) dgettext("synfig",x)
+#define gettext_noop(x) x
+#define N_(x) gettext_noop(x)
+#else
+#define dgettext(a,x) (x)
+#define _(x) (x)
+#define N_(x) (x)
 #endif
 
 #define SYNFIG_COPYRIGHT "Copyright (c) 2001-2005 Robert B. Quattlebaum Jr., Adrian Bentley"
@@ -119,19 +125,6 @@ public:
 	virtual bool valid() const { return cb != 0; }
 };
 
-/*! \class SoftwareExpired
-**	\brief This class is thrown when the software timeout has been reached.
-*/
-class SoftwareExpired
-{
-}; // END of class SoftwareExpired
-
-
-#ifdef DEATH_TIME
-inline void CHECK_EXPIRE_TIME() { if(time(0)>DEATH_TIME) throw SoftwareExpired(); }
-#else
-#define CHECK_EXPIRE_TIME() while(0){ }
-#endif
 
 /*
 extern bool add_to_module_search_path(const std:string &path);