From: dooglus <dooglus@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Mon, 25 Feb 2008 16:37:30 +0000 (+0000)
Subject: Fix 1837445: Convert path to profile directory from UTF8 before trying to use it.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=92d8be5960e2fea6cd33c621ef895f4babd45a8e;p=synfig.git

Fix 1837445: Convert path to profile directory from UTF8 before trying to use it.


git-svn-id: http://svn.voria.com/code@1816 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index 653c19b..1e4c3a1 100644
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -1328,7 +1328,12 @@ App::~App()
 String
 App::get_user_app_directory()
 {
+//! \todo do we need locale_from_utf8() on non-Windows boxes too?  (bug #1837445)
+#ifdef WIN32
+	return Glib::locale_from_utf8(Glib::build_filename(Glib::get_home_dir(),SYNFIG_USER_APP_DIR));
+#else
 	return Glib::build_filename(Glib::get_home_dir(),SYNFIG_USER_APP_DIR);
+#endif
 }
 
 synfig::String
@@ -1620,7 +1625,7 @@ App::load_settings()
 		std::string filename=get_config_file("settings");
 		if(!synfigapp::Main::settings().load_from_file(filename))
 		{
-			//std::string filename=Glib::build_filename(Glib::get_home_dir(),".synfigrc");
+			//std::string filename=Glib::locale_from_utf8(Glib::build_filename(Glib::get_home_dir(),".synfigrc"));
 			//if(!synfigapp::Main::settings().load_from_file(filename))
 			{
 				gamma.set_gamma(1.0/2.2);