1) Fixes for suspend/resume (improved it for iPAQ, shouldn't have changed

   anything for Z) -- It seems that this also fixes the 70% CPU load
   problem (needs more testing/feedback though)

2) the launcher now creates a /var/run/opie.pid file containing its pid

3) the launcher catches SIGTERM and kills all its child processes

1 files changed, 16 insertions, 6 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index f90da1a..7f24259 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -604,6 +604,13 @@ static void darkScreen()
 
 void Desktop::togglePower()
 {
+	static bool excllock = false;
+	
+	if ( excllock )
+		return;
+		
+	excllock = true;
+
   bool wasloggedin = loggedin;
   loggedin=0;
   suspendTime = QDateTime::currentDateTime();
@@ -611,23 +618,26 @@ void Desktop::togglePower()
   if ( wasloggedin )
     blankScreen();
 
-  system("apm --suspend");
-
-
+	ODevice::inst ( )-> suspend ( );
 
   QWSServer::screenSaverActivate( FALSE );
+
   {
     QCopEnvelope("QPE/Card", "mtabChanged()" ); // might have changed while asleep
     QCopEnvelope e("QPE/System", "setBacklight(int)");
     e << -3; // Force on
   }
-  if ( wasloggedin ) {
+
+	if ( wasloggedin )
     login(TRUE);
-  }
-  sleep(1);
+
   execAutoStart();
   //qcopBridge->closeOpenConnections();
   //qDebug("called togglePower()!!!!!!");
+  
+	qApp-> processEvents ( );
+  
+  	excllock = false;
 }
 
 void Desktop::toggleLight()