diff options
| author | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-02 14:23:19 +0100 |
|---|---|---|
| committer | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-02 14:23:19 +0100 |
| commit | ed2b6731ab373ac335fde87af177351facbd2f15 (patch) | |
| tree | 81cc3d45c8c30aceadb4f597be819dc2863a3a3a /opensuse/core/tdelibs/kde3rc.dif | |
| parent | 021036598a306d8cf7204d6d62ff090278f7ecf1 (diff) | |
| parent | 5f93960dbb108c2c6d09964d1ee0d2e390b1498c (diff) | |
| download | tde-packaging-ed2b6731ab373ac335fde87af177351facbd2f15.tar.gz tde-packaging-ed2b6731ab373ac335fde87af177351facbd2f15.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'opensuse/core/tdelibs/kde3rc.dif')
| -rw-r--r-- | opensuse/core/tdelibs/kde3rc.dif | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/opensuse/core/tdelibs/kde3rc.dif b/opensuse/core/tdelibs/kde3rc.dif new file mode 100644 index 000000000..72465757e --- /dev/null +++ b/opensuse/core/tdelibs/kde3rc.dif @@ -0,0 +1,17 @@ +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/tderc"), R_OK)) ++ etc_kderc = QString::fromLatin1("/etc/tderc"); ++ else ++ etc_kderc = QString::fromLatin1("/etc/kde3rc"); + #endif + + if (checkAccess(etc_kderc, R_OK)) |