summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-18 21:24:06 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-18 21:24:06 +0000
commitf365f870630b4708d5db05efb0dfe769eb8d1756 (patch)
tree3b6d811cff5ed59f2b31b3e2e8cf76082cc0c5ed
parent3df918cc405b2449b5c98479a0dbd0eb1a23cbe5 (diff)
downloadtdebase-f365f870630b4708d5db05efb0dfe769eb8d1756.tar.gz
tdebase-f365f870630b4708d5db05efb0dfe769eb8d1756.zip
Use kdmdistrc instead of kdmrc if it exists
This preserves kdmrc as a fallback working configuration git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1254362 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kcontrol/kdm/main.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/kcontrol/kdm/main.cpp b/kcontrol/kdm/main.cpp
index 00239636c..02ec37f9b 100644
--- a/kcontrol/kdm/main.cpp
+++ b/kcontrol/kdm/main.cpp
@@ -173,7 +173,13 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
kdWarning() << "user(s) '" << tgmapci.data().join(",")
<< "' have unknown GID " << tgmapci.key() << endl;
- config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
+ struct stat st;
+ if( stat( KDE_CONFDIR "/kdm/kdmdistrc" ,&st ) == 0) {
+ config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" ));
+ }
+ else {
+ config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
+ }
TQVBoxLayout *top = new TQVBoxLayout(this);
tab = new TQTabWidget(this);