diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-04-24 19:21:48 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:27:11 +0200 |
| commit | eaf5fadba819d19042e8ba6aee637a54b29cc8aa (patch) | |
| tree | c9af17178b98847227fd2906258e32cab3765ef3 /kdesktop/lock/main.cc | |
| parent | 33d5f26e9ee2830794bdce99522fe324001d42a7 (diff) | |
| download | tdebase-eaf5fadba819d19042e8ba6aee637a54b29cc8aa.tar.gz tdebase-eaf5fadba819d19042e8ba6aee637a54b29cc8aa.zip | |
Fix SAK dialog momentary display when SAK disabled
Clean up build warnings in kdesktop
(cherry picked from commit 30617b6fb78c56e76aedd1480429dd4e68da201a)
Diffstat (limited to 'kdesktop/lock/main.cc')
| -rw-r--r-- | kdesktop/lock/main.cc | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 89dc1917c..66aa62243 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -29,6 +29,7 @@ #include <kdebug.h> #include <kglobalsettings.h> #include <dcopref.h> +#include <ksimpleconfig.h> #include <kdmtsak.h> @@ -199,7 +200,19 @@ int main( int argc, char **argv ) trinity_desktop_lock_use_system_modal_dialogs = !KDesktopSettings::useUnmanagedLockWindows(); trinity_desktop_lock_delay_screensaver_start = KDesktopSettings::delaySaverStart(); - trinity_desktop_lock_use_sak = KDesktopSettings::useTDESAK(); + + // RAJA + struct stat st; + KSimpleConfig* tdmconfig; + if( stat( KDE_CONFDIR "/kdm/kdmdistrc" , &st ) == 0) { + tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" )); + } + else { + tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); + } + tdmconfig->setGroup("X-*-Greeter"); + trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true); + delete tdmconfig; if (args->isSet( "internal" )) { while (signalled_run == FALSE) { |