diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-03-21 20:21:29 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-03-26 00:33:52 +0100 |
| commit | 51fb305283958f53395a44aa4beb69c90ef57474 (patch) | |
| tree | b1915a75f818f4bc988f97745f16c376849172b7 | |
| parent | 625523a70d8241494a246f887afc551aadd3796a (diff) | |
| download | tdebase-51fb305283958f53395a44aa4beb69c90ef57474.tar.gz tdebase-51fb305283958f53395a44aa4beb69c90ef57474.zip | |
Remove broken delay when wallpaper not available
This is related to Bug 1288
(cherry picked from commit 2e6d8f1b552cb9a4870291fcd7c8c1d52c101608)
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 27 | ||||
| -rw-r--r-- | kdesktop/lock/lockprocess.h | 1 |
2 files changed, 2 insertions, 26 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index a7a46fdf7..0a97f1764 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -4,7 +4,7 @@ // // Copyright (c) 1999 Martin R. Jones <mjones@kde.org> // Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org> -// Copyright (c) 2010-2012 Timothy Pearson <kb9vqf@pearsoncomputing.net> +// Copyright (c) 2010-2013 Timothy Pearson <kb9vqf@pearsoncomputing.net> // //kdesktop keeps running and checks user inactivity @@ -1365,31 +1365,6 @@ bool LockProcess::startSaver() TQPixmap rootWinSnapShot = TQPixmap::grabWindow(TQApplication::desktop()->winId()); slotPaintBackground(rootWinSnapShot); } - else { - // Sometimes KRootPixmap fails...make sure the desktop is hidden regardless - if (backingPixmap.isNull()) { - if (!mEnsureScreenHiddenTimer) { - mEnsureScreenHiddenTimer = new TQTimer( this ); - connect( mEnsureScreenHiddenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForcePaintBackground()) ); - mEnsureScreenHiddenTimer->start(DESKTOP_WALLPAPER_OBTAIN_TIMEOUT_MS, true); - } - - int exitTimer = 0; - while ((backingPixmap.isNull()) && (mEnsureScreenHiddenTimer->isActive())) { - kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); - - // HACK - // Work around an issue with the underlying system whereby the TQTimer sometimes fails to time out! - // This issue was reported in Bug #1288 - usleep(100); - exitTimer++; - if (exitTimer > (DESKTOP_WALLPAPER_OBTAIN_TIMEOUT_MS*10)) { - printf("[WARNING] The Qt3 timer event loop appears to have hung. Aborting wait for desktop background!\n\r"); fflush(stdout); - break; - } - } - } - } if (((!(trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced)) && (!trinity_desktop_lock_in_sec_dlg)) && mHackStartupEnabled) { if (backingPixmap.isNull()) { diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h index 1bd273df9..9cfffbf6d 100644 --- a/kdesktop/lock/lockprocess.h +++ b/kdesktop/lock/lockprocess.h @@ -4,6 +4,7 @@ // // Copyright (c) 1999 Martin R. Jones <mjones@kde.org> // Copyright (c) 2003 Oswald Buddenhagen <ossi@kde.org> +// Copyright (c) 2010-2013 Timothy Pearson <kb9vqf@pearsoncomputing.net> // #ifndef __LOCKENG_H__ |