Fixed a handful of bugs, including:

[synfig.git] / synfig-core / trunk / src / synfig / general.h

diff --git a/synfig-core/trunk/src/synfig/general.h b/synfig-core/trunk/src/synfig/general.h
index 3be6cce..9dc0059 100644 (file)
--- a/synfig-core/trunk/src/synfig/general.h
+++ b/synfig-core/trunk/src/synfig/general.h
@@ -41,7 +41,7 @@
 //#define gettext(x)   (x)
 #endif
 
-#define SYNFIG_COPYRIGHT "Copyright (c) 2001-2004 Voria Software, LLC"
+#define SYNFIG_COPYRIGHT "Copyright (c) 2001-2005 Robert B. Quattlebaum Jr., Adrian Bentley"
 
 
 #ifdef _DEBUG
@@ -63,16 +63,15 @@
 namespace synfig {
 
 class ChangeLocale {
-    const char *previous;
-    int category;
+    const String previous;
+    const int category;
 public:
     ChangeLocale(int category, const char *locale):
-        previous(setlocale(category,NULL)),category(category)
+        previous(setlocale(category,locale)),category(category)
     {
-            setlocale(category,locale);
     }
     ~ChangeLocale() {
-        setlocale(category,previous);
+        setlocale(category,previous.c_str());
     }
 };