[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeui/icons
From:       David Faure <faure () kde ! org>
Date:       2010-08-16 16:33:45
Message-ID: 20100816163346.050F9AC854 () svn ! kde ! org
[Download RAW message or body]

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";
                 }
             }
         }
[prev in list] [next in list] [prev in thread] [next in thread]