Fix crash with LC_ALL=fr@euro. Patch & testing by Cyril Brulebois (KiBi).

Reported in http://synfig.org/forums/viewtopic.php?t=327

git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2327 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-studio/trunk/AUTHORS b/synfig-studio/trunk/AUTHORS
index 36438a4..abdd35e 100644 (file)
--- a/synfig-studio/trunk/AUTHORS
+++ b/synfig-studio/trunk/AUTHORS
@@ -18,6 +18,7 @@ Chris Norman (pixelgeek)
 Timo Paulssen (timonator)
 IL'dar AKHmetgaleev (AkhIL)
 Gerald Young (Yoyobuae)
+Cyril Brulebois (KiBi)
 
 Translators:
 

diff --git a/synfig-studio/trunk/src/gtkmm/main.cpp b/synfig-studio/trunk/src/gtkmm/main.cpp
index 5e34cfa..36bf16d 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/main.cpp
+++ b/synfig-studio/trunk/src/gtkmm/main.cpp
@@ -62,6 +62,7 @@ int main(int argc, char **argv)
 #ifdef ENABLE_NLS
        setlocale(LC_ALL, "");
        bindtextdomain("synfigstudio", LOCALEDIR);
+       bind_textdomain_codeset("synfigstudio", "UTF-8");
        textdomain("synfigstudio");
 #endif
 

diff --git a/synfig-studio/trunk/src/synfigapp/main.cpp b/synfig-studio/trunk/src/synfigapp/main.cpp
index 1c3ec5d..fb3da8f 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/main.cpp
+++ b/synfig-studio/trunk/src/synfigapp/main.cpp
@@ -100,6 +100,7 @@ synfigapp::Main::Main(const synfig::String &basepath, synfig::ProgressCallback *
 
 #ifdef ENABLE_NLS
        bindtextdomain("synfigstudio", LOCALEDIR);
+       bind_textdomain_codeset("synfigstudio", "UTF-8");
 #endif
 
        action_main=new synfigapp::Action::Main();