You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
tde-packaging/mandriva/2010.2/kdebase/kdebase-3.5.4-fix-gtk-style...

25 lines
1.0 KiB

--- 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)
{
+ TQString userFile = TQDir::homeDirPath()+userGtkrc(version);
+ KConfig kglobalsStyle("kdeglobals", true, false);
+ kglobalsStyle.setGroup("General");
+ TQString styleName = kglobalsStyle.readEntry("widgetStyle");
+ if(!TQDir(userFile).exists() && styleName =="ia_ora")
+ return;
+
TQString gtkkde = locateLocal("config", 2==version?"gtkrc-2.0":"gtkrc");
TQCString gtkrc = getenv(gtkEnvVar(version));
TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc));
if (list.count() == 0)
{
list.append(TQString::fromLatin1(sysGtkrc(version)));
- list.append(TQDir::homeDirPath()+userGtkrc(version));
+ list.append(userFile);
}
list.remove(gtkkde);
list.append(gtkkde);