diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-14 01:58:37 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-14 01:58:37 -0500 |
commit | 46b27ed1c011f5950f5b0b3af13f315236857392 (patch) | |
tree | 84294dd1a101925c751789836ea34a471144a105 /opensuse/tdelibs/kde3rc.dif | |
parent | 7237cc8490e51880edf69db58c4f5a7569caa3cf (diff) | |
parent | 77710e1c2abc8e8e1c65b8400b8c61fbd1253a2e (diff) | |
download | tde-packaging-46b27ed1c011f5950f5b0b3af13f315236857392.tar.gz tde-packaging-46b27ed1c011f5950f5b0b3af13f315236857392.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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/opensuse/tdelibs/kde3rc.dif b/opensuse/tdelibs/kde3rc.dif index 2a33aaf1e..72465757e 100644 --- a/opensuse/tdelibs/kde3rc.dif +++ b/opensuse/tdelibs/kde3rc.dif @@ -8,10 +8,10 @@ Index: kdecore/kconfigbackend.cpp #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"); ++ if (checkAccess(QString::fromLatin1("/etc/tderc"), R_OK)) ++ etc_kderc = QString::fromLatin1("/etc/tderc"); + else -+ etc_kderc = QString::fromLatin1("/etc/kderc"); ++ etc_kderc = QString::fromLatin1("/etc/kde3rc"); #endif if (checkAccess(etc_kderc, R_OK)) |