summaryrefslogtreecommitdiff
authorpaule <paule>2007-01-31 05:11:56 (UTC)
committer paule <paule>2007-01-31 05:11:56 (UTC)
commit3a2db1ba1395a6d33de421ed5f3b04df53ced5bc (patch) (side-by-side diff)
tree19af403919546824965303db78820a3f2a176bda
parentf4e6ede30d494ad91fdbd0fd72498ef3a44bf7ee (diff)
downloadopie-3a2db1ba1395a6d33de421ed5f3b04df53ced5bc.zip
opie-3a2db1ba1395a6d33de421ed5f3b04df53ced5bc.tar.gz
opie-3a2db1ba1395a6d33de421ed5f3b04df53ced5bc.tar.bz2
Specify correct parameters to needToAuthenticate() and login() so that appropriate setting is read when determining whether to authenticate or not. Fixes bug #1830.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/serverapp.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index 6fe0479..0e92040 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -557,68 +557,68 @@ namespace {
// If the time between suspend and resume was longer then the
// value saved as delay, start the app
if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) {
QCopEnvelope e( "QPE/System", "execute(QString)" );
e << QString( appName );
}
}
}
void ServerApplication::togglePower()
{
static bool excllock = false;
if ( excllock )
return ;
excllock = true;
bool wasloggedin = loggedin;
loggedin = 0;
m_suspendTime = QDateTime::currentDateTime();
#ifdef QWS
- if ( Opie::Security::MultiauthPassword::needToAuthenticate ( true ) && qt_screen ) {
+ if ( Opie::Security::MultiauthPassword::needToAuthenticate ( false ) && qt_screen ) {
// Should use a big black window instead.
// But this would not show up fast enough
QGfx *g = qt_screen-> screenGfx ( );
g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( ));
delete g;
}
#endif
ODevice::inst ( )-> suspend ( );
ServerApplication::switchLCD ( true ); // force LCD on without slow qcop call
QWSServer::screenSaverActivate ( false );
{
QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep
}
if ( wasloggedin )
- login ( true );
+ login ( false );
execAutoStart(m_suspendTime);
//qcopBridge->closeOpenConnections();
excllock = false;
}
void ServerApplication::toggleLight()
{
#ifndef QT_NO_COP
QCopEnvelope e("QPE/System", "setBacklight(int)");
e << -2; // toggle
#endif
}
/*
* We still listen to key events but handle them in
* a special class
*/
bool ServerApplication::eventFilter( QObject *o, QEvent *e) {
if ( e->type() != QEvent::KeyPress &&
e->type() != QEvent::KeyRelease )