diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-13 12:21:22 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-13 12:21:22 -0500 |
commit | f65bcb8326e06816d7dc49e58bda120182dbbcd6 (patch) | |
tree | 4e7fef001fc523929450778d10c86b41e6e32eda /opensuse/tdelibs/kde3rc.dif | |
parent | 131df957b41b4683571b1e36e6fed9d614d32356 (diff) | |
parent | fa41f32b69994ecd75b7359fa2df08ea5a3480ab (diff) | |
download | tde-packaging-f65bcb8326e06816d7dc49e58bda120182dbbcd6.tar.gz tde-packaging-f65bcb8326e06816d7dc49e58bda120182dbbcd6.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'opensuse/tdelibs/kde3rc.dif')
-rw-r--r-- | opensuse/tdelibs/kde3rc.dif | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/opensuse/tdelibs/kde3rc.dif b/opensuse/tdelibs/kde3rc.dif new file mode 100644 index 000000000..2a33aaf1e --- /dev/null +++ b/opensuse/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/kde3rc"), R_OK)) ++ etc_kderc = QString::fromLatin1("/etc/kde3rc"); ++ else ++ etc_kderc = QString::fromLatin1("/etc/kderc"); + #endif + + if (checkAccess(etc_kderc, R_OK)) |