From kde-commits Mon Aug 16 16:33:45 2010 From: David Faure Date: Mon, 16 Aug 2010 16:33:45 +0000 To: kde-commits Subject: KDE/kdelibs/kdeui/icons Message-Id: <20100816163346.050F9AC854 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=128197629200845 SVN commit 1164381 by dfaure: Look for index.theme before index.desktop. New results: After: 73750 * access, 16678 * stat, 1082 * open CCBUG: 240009 M +5 -5 kicontheme.cpp --- trunk/KDE/kdelibs/kdeui/icons/kicontheme.cpp #1164380:1164381 @@ -164,14 +164,14 @@ if (KStandardDirs::exists(cDir)) { themeDirs += cDir; if (d->mDir.isEmpty()) { - if (KStandardDirs::exists(cDir + "index.desktop")) { + if (KStandardDirs::exists(cDir + "index.theme")) { d->mDir = cDir; + fileName = d->mDir + "index.theme"; + mainSection = "Icon Theme"; + } else if (KStandardDirs::exists(cDir + "index.desktop")) { + d->mDir = cDir; fileName = d->mDir + "index.desktop"; mainSection = "KDE Icon Theme"; - } else if (KStandardDirs::exists(cDir + "index.theme")) { - d->mDir = cDir; - fileName = d->mDir + "index.theme"; - mainSection = "Icon Theme"; } } }