diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-18 19:17:51 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-18 19:17:51 +0000 |
commit | bb335ea2a2da6dc9b8380a5f53f14a346ea2531a (patch) | |
tree | b50322e74b2edca9a4fef728ae69d9cc2e6b457e /kdesktop | |
parent | e81d6b084c909f249cf398b3112a99fad0e91ac8 (diff) | |
download | tdebase-bb335ea2a2da6dc9b8380a5f53f14a346ea2531a.tar.gz tdebase-bb335ea2a2da6dc9b8380a5f53f14a346ea2531a.zip |
Fix kdesktop_lock lock date/time display
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1259560 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdesktop')
-rw-r--r-- | kdesktop/lock/lockprocess.cc | 3 | ||||
-rw-r--r-- | kdesktop/lock/lockprocess.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index f4c22b863..4552d082b 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -186,6 +186,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly) setupPipe(); mShowLockDateTime = KDesktopSettings::showLockDateTime(); + mlockDateTime = TQDateTime::currentDateTime(); kapp->installX11EventFilter(this); @@ -1532,7 +1533,7 @@ bool LockProcess::checkPass() } showVkbd(); - PasswordDlg passDlg( this, &greetPlugin, (mShowLockDateTime)?TQDateTime::currentDateTime():TQDateTime()); + PasswordDlg passDlg( this, &greetPlugin, (mShowLockDateTime)?mlockDateTime:TQDateTime()); int ret = execDialog( &passDlg ); hideVkbd(); diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h index 63291f857..e2c9ee575 100644 --- a/kdesktop/lock/lockprocess.h +++ b/kdesktop/lock/lockprocess.h @@ -20,6 +20,7 @@ #include <tqvaluestack.h> #include <tqmessagebox.h> #include <tqpixmap.h> +#include <tqdatetime.h> #include <X11/Xlib.h> @@ -192,6 +193,8 @@ private: int mBackingStartupDelayTimer; KSMModalDialog* m_startupStatusDialog; + + TQDateTime mlockDateTime; }; #endif |