Sophie

Sophie

distrib > Mandriva > cs4.0 > i586 > by-pkgid > fa9b6a46c8aad7f4f199c98596a0ec2a > files > 20

kdelibs-3.5.4-1.1.20060mlcs4.src.rpm

--- kdelibs-3.5.1/kdecore/kicontheme.cpp.orig	2006-02-08 07:58:26.000000000 -0500
+++ kdelibs-3.5.1/kdecore/kicontheme.cpp	2006-02-08 08:01:51.000000000 -0500
@@ -489,7 +489,14 @@
 // static
 QString KIconTheme::defaultThemeName()
 {
-    return QString::fromLatin1("crystalsvg");
+    //check config
+    QString theme = KStandardDirs::readMenuConfig("IconTheme", QString::null);
+    if (!theme.isNull())
+        return theme;
+    if( KStandardDirs::mandriva_distro_version()==KStandardDirs::DISCOVERY )
+        return QDir("/usr/share/icons/discovery").exists() ? QString::fromLatin1("discovery"): QString::fromLatin1("crystalsvg");
+    else
+        return QString::fromLatin1("crystalsvg");
 }
 
 /*** KIconThemeDir ***/