Index: scribus.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/scribus.cpp,v
retrieving revision 1.228.2.502
diff -u -r1.228.2.502 scribus.cpp
--- scribus.cpp	27 Aug 2005 21:18:19 -0000	1.228.2.502
+++ scribus.cpp	29 Aug 2005 18:11:08 -0000
@@ -8529,23 +8534,27 @@
 
 void ScribusApp::GetCMSProfiles()
 {
+	QString profDir;
+	QStringList profDirs;
 	MonitorProfiles.clear();
 	PrinterProfiles.clear();
 	InputProfiles.clear();
 	InputProfilesCMYK.clear();
 	QString pfad = ScPaths::instance().libDir();
 	pfad += "profiles/";
-	GetCMSProfilesDir(pfad);
-	if (!prefsManager->appPrefs.ProfileDir.isEmpty())
-	{
-		if(prefsManager->appPrefs.ProfileDir.right(1) != "/")
-			prefsManager->appPrefs.ProfileDir += "/";
-		GetCMSProfilesDir(prefsManager->appPrefs.ProfileDir);
-	}
-#if defined(Q_WS_X11)
-	GetCMSProfilesDir("/usr/share/color/icc/");
-	GetCMSProfilesDir(QDir::convertSeparators(QDir::homeDirPath()+"/.color/icc/"));
-#endif
+	profDirs = ScPaths::getSystemProfilesDirs();
+	profDirs.prepend( prefsManager->appPrefs.ProfileDir );
+	profDirs.prepend( pfad );
+	for(unsigned int i = 0; i < profDirs.count(); i++)
+	{
+		profDir = profDirs[i];
+		if(!profDir.isEmpty())
+		{
+			if(profDir.right(1) != "/")
+				profDir += "/";
+			GetCMSProfilesDir(profDir);
+		}
+	}
 	if ((!PrinterProfiles.isEmpty()) && (!InputProfiles.isEmpty()) && (!MonitorProfiles.isEmpty()))
 		CMSavail = true;
 	else