summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-03-21 20:21:29 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-03-21 20:21:29 -0500
commit2e6d8f1b552cb9a4870291fcd7c8c1d52c101608 (patch)
tree317ac8561145ec0900f0264d7620df2db28d5fc1
parentbe73d75739e41342bfded44f2f71072664db15f1 (diff)
downloadtdebase-2e6d8f1b552cb9a4870291fcd7c8c1d52c101608.tar.gz
tdebase-2e6d8f1b552cb9a4870291fcd7c8c1d52c101608.zip
Remove broken delay when wallpaper not available
This is related to Bug 1288
-rw-r--r--kdesktop/lock/lockprocess.cc27
-rw-r--r--kdesktop/lock/lockprocess.h1
2 files changed, 2 insertions, 26 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index aaa3998af..315b42655 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 TQt3 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 1694a0eb4..57caede60 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__