r15543 by craig - Re-fix palette locations, also fix default location for basic set

[scribus-commit]

Author: craig
Date: Fri Oct 15 21:24:43 2010
New Revision: 15543

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15543
Log:
Re-fix palette locations, also fix default location for basic set

Modified:
    trunk/Scribus/scribus/colorsetmanager.cpp

Modified: trunk/Scribus/scribus/colorsetmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15543&path=/trunk/Scribus/scribus/colorsetmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/colorsetmanager.cpp (original)
+++ trunk/Scribus/scribus/colorsetmanager.cpp Fri Oct 15 21:24:43 2010
@@ -28,7 +28,7 @@
 
 void ColorSetManager::initialiseDefaultPrefs(struct ApplicationPrefs& appPrefs)
 {
-	QString defaultSwatch = ScPaths::instance().libDir() + "swatches/" + "Scribus_Basic.xml";
+	QString defaultSwatch = ScPaths::instance().shareDir() + "swatches/" + "Scribus_Basic.xml";
 	QFile fiC(defaultSwatch);
 	if (!fiC.exists())
 	{
@@ -111,7 +111,7 @@
 {
 	paletteLocations.clear();
 	QStringList locations=ScPaths::instance().getSystemCreateSwatchesDirs();
-	locations << ScPaths::instance().libDir()+"swatches/";
+	locations << ScPaths::instance().shareDir()+"swatches/";
 	locations << ScPaths::instance().getDirsFromEnvVar("XDG_DATA_HOME", "scribus/swatches/");
 	for ( QStringList::Iterator it = locations.begin(); it != locations.end(); ++it )
 	{