From f365f870630b4708d5db05efb0dfe769eb8d1756 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 18 Sep 2011 21:24:06 +0000 Subject: 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 --- kcontrol/kdm/main.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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); -- cgit v1.2.3