1 files changed, 6 insertions, 2 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index da535d9..680cc06 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -210,64 +210,68 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e )
 	      if ( !press && cardSendTimer ) {
 		    emit contacts();
 		    delete cardSendTimer;
 		  } else if ( press ) {
 		    cardSendTimer = new QTimer();
 		    cardSendTimer->start( 2000, TRUE );
 		    connect( cardSendTimer, SIGNAL( timeout() ), this, SLOT( sendCard() ) );
 		  }
 		  return TRUE;
 	    }
 	    /* menu key now opens application menu/toolbar
 		   if ( ke->simpleData.keycode == Key_F11 ) {
 		   if ( press ) emit menu();
 		   return TRUE;
 		   }
 	    */
 	    if ( ke->simpleData.keycode == Key_F12 ) {
 		  while( activePopupWidget() )
 		    activePopupWidget()->close();
 		  if ( press ) emit launch();
 		  return TRUE;
 	    }
 	    if ( ke->simpleData.keycode == Key_F13 ) {
 		  if ( press ) emit email();
 		  return TRUE;
 	    }
 	  }
 
 	  if ( ke->simpleData.keycode == Key_F34 ) {
 	    if ( press ) emit power();
 	    return TRUE;
 	  }
+	  if ( ke->simpleData.keycode == Key_SysReq ) {
+	    if ( press ) emit power();
+	    return TRUE;
+	  }
 	  if ( ke->simpleData.keycode == Key_F35 ) {
 	    if ( press ) emit backlight();
 	    return TRUE;
 	  }
 	  if ( ke->simpleData.keycode == Key_F32 ) {
 	    if ( press ) QCopEnvelope e( "QPE/Desktop", "startSync()" );
 	    return TRUE;
 	  }
 	  if ( ke->simpleData.keycode == Key_F31 && !ke->simpleData.modifiers ) {
 	    if ( press ) emit symbol();
 	    return TRUE;
 	  }
 	  if ( ke->simpleData.keycode == Key_NumLock ) {
 	    if ( press ) emit numLockStateToggle();
 	  }
 	  if ( ke->simpleData.keycode == Key_CapsLock ) {
 	    if ( press ) emit capsLockStateToggle();
 	  }
 	  if ( press )
 	    qpedesktop->keyClick();
     } else {
 	  if ( e->type == QWSEvent::Mouse ) {
 	    QWSMouseEvent *me = (QWSMouseEvent *)e;
 	    static bool up = TRUE;
 	    if ( me->simpleData.state&LeftButton ) {
 		  if ( up ) {
 		    up = FALSE;
 		    qpedesktop->screenClick();
 		  }
 	    } else {
 		  up = TRUE;
 	    }
@@ -523,75 +527,75 @@ void Desktop::execAutoStart()
 #include <time.h>
 #endif
 
 static bool blanked=FALSE;
 
 static void blankScreen()
 {
     if ( !qt_screen ) return;
     /* Should use a big black window instead.
     QGfx* g = qt_screen->screenGfx();
     g->fillRect(0,0,qt_screen->width(),qt_screen->height());
     delete g;
     */
     blanked = TRUE;
 }
 
 static void darkScreen()
 {
     extern void qpe_setBacklight(int);
     qpe_setBacklight(0); // force off
 }
 
 
 void Desktop::togglePower()
 {
   bool wasloggedin = loggedin;
   loggedin=0;
   darkScreen();
   if ( wasloggedin )
     blankScreen();
   
   system("apm --suspend");
-  execAutoStart();
+  
   QWSServer::screenSaverActivate( FALSE );
   {
     QCopEnvelope("QPE/Card", "mtabChanged()" ); // might have changed while asleep
     QCopEnvelope e("QPE/System", "setBacklight(int)");
     e << -3; // Force on
   }
   if ( wasloggedin ) {
     login(TRUE);
   }
-  
+  execAutoStart();
   //qcopBridge->closeOpenConnections();
   //qDebug("called togglePower()!!!!!!");
 }
 
 void Desktop::toggleLight()
 {
     QCopEnvelope e("QPE/System", "setBacklight(int)");
     e << -2; // toggle
 }
 
 void Desktop::toggleSymbolInput()
 {
     tb->toggleSymbolInput();
 }
 
 void Desktop::toggleNumLockState()
 {
     tb->toggleNumLockState();
 }
 
 void Desktop::toggleCapsLockState()
 {
     tb->toggleCapsLockState();
 }
 
 void Desktop::styleChange( QStyle &s )
 {
     QWidget::styleChange( s );
     int displayw = qApp->desktop()->width();
     int displayh = qApp->desktop()->height();
 
     QSize sz = tb->sizeHint();