Uncomment and fix Layer::simple_clone() to clone a layer without cloning all its...

[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 9133b2f..a1b0ca3 100644 (file)
--- a/synfig-core/trunk/src/synfig/main.cpp
+++ b/synfig-core/trunk/src/synfig/main.cpp
@@ -230,18 +230,20 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
                locations.push_back(getenv("SYNFIG_MODULE_LIST"));
        else
        {
-               locations.push_back("./"MODULE_LIST_FILENAME);  //1
-               locations.push_back("../etc/"MODULE_LIST_FILENAME);     //1
-               locations.push_back("~/.synfig/"MODULE_LIST_FILENAME); //2
+               locations.push_back("./"MODULE_LIST_FILENAME);
+               locations.push_back("../etc/"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
-               locations.push_back(prefix+"/etc/"+MODULE_LIST_FILENAME); //3
+               locations.push_back(prefix+"/etc/"+MODULE_LIST_FILENAME);
                locations.push_back("/usr/local/etc/"MODULE_LIST_FILENAME);
        #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);