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.
18 lines
659 B
18 lines
659 B
13 years ago
|
Index: kdecore/kconfigbackend.cpp
|
||
|
|
===================================================================
|
||
|
|
--- kdecore/kconfigbackend.cpp.orig
|
||
|
|
+++ kdecore/kconfigbackend.cpp
|
||
|
|
@@ -352,7 +352,11 @@ bool KConfigINIBackEnd::parseConfigFiles
|
||
|
|
#ifdef Q_WS_WIN
|
||
|
|
QString etc_kderc = QFile::decodeName( QCString(getenv("WINDIR")) + "\\kderc" );
|
||
|
|
#else
|
||
|
|
- QString etc_kderc = QString::fromLatin1("/etc/kderc");
|
||
|
|
+ QString etc_kderc;
|
||
|
|
+ if (checkAccess(QString::fromLatin1("/etc/kde3rc"), R_OK))
|
||
|
|
+ etc_kderc = QString::fromLatin1("/etc/kde3rc");
|
||
|
|
+ else
|
||
|
|
+ etc_kderc = QString::fromLatin1("/etc/kderc");
|
||
|
|
#endif
|
||
|
|
|
||
|
|
if (checkAccess(etc_kderc, R_OK))
|