Remove .gitignore do nothing is ignored.

[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 c97d0ed..9e0a56a 100644 (file)
--- a/synfig-core/trunk/src/synfig/main.cpp
+++ b/synfig-core/trunk/src/synfig/main.cpp
@@ -165,6 +165,7 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
 
 #ifdef ENABLE_NLS
        bindtextdomain("synfig", LOCALEDIR);
+       bind_textdomain_codeset("synfig", "UTF-8");
 #endif
 
        String prefix=basepath+"/..";
@@ -232,7 +233,8 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
        {
                locations.push_back("./"MODULE_LIST_FILENAME);
                locations.push_back("../etc/"MODULE_LIST_FILENAME);
-               locations.push_back("~/.synfig/"MODULE_LIST_FILENAME);
+               if(getenv("HOME"))
+                       locations.push_back(strprintf("%s/.synfig/%s", getenv("HOME"), MODULE_LIST_FILENAME));
        #ifdef SYSCONFDIR
                locations.push_back(SYSCONFDIR"/"MODULE_LIST_FILENAME);
        #endif
@@ -241,7 +243,8 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
        #ifdef __APPLE__
                locations.push_back("/Library/Frameworks/synfig.framework/Resources/"MODULE_LIST_FILENAME);
                locations.push_back("/Library/Synfig/"MODULE_LIST_FILENAME);
-               locations.push_back("~/Library/Synfig/"MODULE_LIST_FILENAME);
+               if(getenv("HOME"))
+                       locations.push_back(strprintf("%s/Library/Synfig/%s", getenv("HOME"), MODULE_LIST_FILENAME));
        #endif
        #ifdef WIN32
                locations.push_back("C:\\Program Files\\Synfig\\etc\\"MODULE_LIST_FILENAME);
@@ -311,7 +314,7 @@ synfig::Main::~Main()
        // synfig::info("Module::subsys_stop()");
        // Module::subsys_stop();
        // synfig::info("Exiting");
-       
+
 #if defined(HAVE_SIGNAL_H) && defined(SIGPIPE)
        signal(SIGPIPE, SIG_DFL);
 #endif