r14195 by cbradney - Allow only xml and gpl files to be loaded by the colour manager so we dont try to load the license files

scribus-commit scribus-commit at lists.scribus.net
Mon Oct 19 22:40:18 CEST 2009


Revision: 14195
Author: cbradney
Date: 2009-10-19T18:06:21.325116Z
Commit message: Allow only xml and gpl files to be loaded by the colour manager so we dont try to load the license files

Changeset: 
M  /trunk/Scribus/scribus/colorsetmanager.cpp

Diffs:
Index: scribus/colorsetmanager.cpp
===================================================================
--- scribus/colorsetmanager.cpp	(revision 14194)
+++ scribus/colorsetmanager.cpp	(revision 14195)
@@ -129,7 +129,7 @@
 	for ( QStringList::Iterator it = paletteLocations.begin(); it != paletteLocations.end(); ++it )
 	{
 		path=(*it);
-		QDir dir(path , "*", QDir::Name, QDir::Files | QDir::NoSymLinks);
+		QDir dir(path , "*.xml *.gpl", QDir::Name, QDir::Files | QDir::NoSymLinks);
 		if (dir.exists() && (dir.count() != 0))
 			for (uint i = 0; i < dir.count(); ++i) 
 			{




More information about the scribus-commit mailing list