Fixed spurious library paths being added to Library Browser.

[architektonas] / src / base / rs_system.cpp

diff --git a/src/base/rs_system.cpp b/src/base/rs_system.cpp
index 3b73e3ed8d05e6057ee2f1f8b2c7148a565abe42..2a85c838a8d40663e2219e39a0daa4bd976bfe68 100644 (file)
--- a/src/base/rs_system.cpp
+++ b/src/base/rs_system.cpp
@@ -456,7 +456,7 @@ QStringList RS_System::getDirectoryList(const QString & subDirectory)
        if (subDirectory != "library")
        {
 #endif
-               //local (application) directory has priority over other dirs:
+               // Local (application) directory has priority over other dirs:
                if (!appDir.isEmpty() && appDir != "/" && appDir != getHomeDir())
                {
                        dirList.append(appDir + "/" + subDirectory);
@@ -467,7 +467,10 @@ QStringList RS_System::getDirectoryList(const QString & subDirectory)
                // SuSE style:
                dirList.append("/usr/X11R6/" + appDirName + "/" + subDirectory);
                dirList.append("/usr/X11R6/share/" + appDirName + "/" + subDirectory);
-               dirList.append(getHomeDir() + "/." + appDirName + "/" + subDirectory);
+//This is what's picking up crap in .architektonas...
+//We'll take it out for now...
+//But maybe we can check to see if it's "library" and bypass if so...
+//             dirList.append(getHomeDir() + "/." + appDirName + "/" + subDirectory);
 #ifdef __APPLE__
        }
 #endif
@@ -518,6 +521,7 @@ QStringList RS_System::getDirectoryList(const QString & subDirectory)
                {
                        ret += (*it);
                        RS_DEBUG->print((*it).toLatin1().data());
+//printf("System: *it=\"%s\"\n", (*it).toAscii().data());
                }
        }