diff options
| author | Robert Xu <[email protected]> | 2012-02-01 00:31:59 -0500 |
|---|---|---|
| committer | Robert Xu <[email protected]> | 2012-02-01 00:31:59 -0500 |
| commit | f599f39717d771b8b7a2aff006cda6c31e8b12da (patch) | |
| tree | f601e3c0303a193cda6f8c6f956619dda9673c70 /opensuse/core/tdelibs/kde3rc.dif | |
| parent | ead369ac94473139a2320a1c90cda64dd887b94a (diff) | |
| parent | 27c9e783c6283f8916ebee3a23c6d1ba909a5126 (diff) | |
| download | tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.tar.gz tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.zip | |
Merge branch 'suse'
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)) |