summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/desktop.cpp5
-rw-r--r--core/launcher/main.cpp3
2 files changed, 3 insertions, 5 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index fb10602..1ec477c 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -613,13 +613,13 @@ void Desktop::togglePower()
excllock = true;
bool wasloggedin = loggedin;
loggedin=0;
suspendTime = QDateTime::currentDateTime();
- qpe_setBacklight ( 0 ); // force LCD off
+// qpe_setBacklight ( 0 ); // force LCD off (sandman: why ????)
if ( wasloggedin )
blankScreen();
ODevice::inst ( )-> suspend ( );
@@ -633,15 +633,12 @@ void Desktop::togglePower()
if ( wasloggedin )
login(TRUE);
execAutoStart();
//qcopBridge->closeOpenConnections();
- //qDebug("called togglePower()!!!!!!");
-
- qApp-> processEvents ( );
excllock = false;
}
void Desktop::toggleLight()
{
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 3ee5e26..5cf624b 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -349,24 +349,25 @@ void create_pidfile ( )
void remove_pidfile ( )
{
::unlink ( pidfile_path );
}
-void handle_sigterm ( int sig )
+void handle_sigterm ( int /* sig */ )
{
if ( qApp )
qApp-> quit ( );
}
int main( int argc, char ** argv )
{
#ifndef SINGLE_APP
::signal( SIGCHLD, SIG_IGN );
::signal ( SIGTERM, handle_sigterm );
+ ::signal ( SIGINT, handle_sigterm );
::setsid ( );
::setpgid ( 0, 0 );
::atexit ( remove_pidfile );
create_pidfile ( );