Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > 901b66721cd8b67ee1adbc6604574c15 > files > 14

kdebase-3.5.10-6mdv2009.0.src.rpm

--- kdebase-3.5.4/kcontrol/krdb/krdb.cpp--	2006-09-14 08:38:52.000000000 +0200
+++ kdebase-3.5.4/kcontrol/krdb/krdb.cpp	2006-09-14 08:48:18.000000000 +0200
@@ -75,13 +75,20 @@
 // -----------------------------------------------------------------------------
 static void applyGtkStyles(bool active, int version)
 {
+   QString userFile = QDir::homeDirPath()+userGtkrc(version);
+   KConfig kglobalsStyle("kdeglobals", true, false);
+   kglobalsStyle.setGroup("General");
+   QString styleName = kglobalsStyle.readEntry("widgetStyle");
+   if(!QDir(userFile).exists() && styleName =="ia_ora")
+	   return;
+
    QString gtkkde = locateLocal("config", 2==version?"gtkrc-2.0":"gtkrc");
    QCString gtkrc = getenv(gtkEnvVar(version));
    QStringList list = QStringList::split(':', QFile::decodeName(gtkrc));
    if (list.count() == 0)
    {
       list.append(QString::fromLatin1(sysGtkrc(version)));
-      list.append(QDir::homeDirPath()+userGtkrc(version));
+      list.append(userFile);
    }
    list.remove(gtkkde);
    list.append(gtkkde);