1 files changed, 17 insertions, 18 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 552c7c3..fb10602 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -195,19 +195,19 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e )
     bool press = ke->simpleData.is_press;
     bool autoRepeat= ke->simpleData.is_auto_repeat;
 
     /*
       app that registers key/message to be sent back to the app, when it doesn't have focus,
       when user presses key, unless keyboard has been requested from app.
       will not send multiple repeats if user holds key
       i.e. one shot
-      
+
      */
-    if (!keyRegisterList.isEmpty())  { 
+    if (!keyRegisterList.isEmpty())  {
       KeyRegisterList::Iterator it;
       for( it = keyRegisterList.begin(); it != keyRegisterList.end(); ++it ) {
           if ((*it).getKeyCode() == ke->simpleData.keycode &&  !autoRepeat && !keyboardGrabbed() && press) {
               if(press) qDebug("press"); else qDebug("release");
               QCopEnvelope((*it).getChannel().utf8(), (*it).getMessage().utf8());
           }
       }
     }
@@ -245,17 +245,17 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e )
       return TRUE;
       }
     }
 
     if ( ke->simpleData.keycode == Key_F34 ) {
       if ( press ) emit power();
       return TRUE;
     }
-// This was used for the iPAQ PowerButton 
+// This was used for the iPAQ PowerButton
 // See main.cpp for new KeyboardFilter
 //
 //    if ( ke->simpleData.keycode == Key_SysReq ) {
 //      if ( press ) emit power();
 //      return TRUE;
 //    }
     if ( ke->simpleData.keycode == Key_F35 ) {
       if ( press ) emit backlight();
@@ -554,25 +554,24 @@ void Desktop::raiseEmail()
 
 // autoStarts apps on resume and start
 void Desktop::execAutoStart() {
     QString appName;
     int delay;
     QDateTime now = QDateTime::currentDateTime();
     Config cfg( "autostart" );
     cfg.setGroup( "AutoStart" );
-    appName = cfg.readEntry("Apps", "");
-    delay = (cfg.readEntry("Delay", "0" )).toInt();
+    appName = cfg.readEntry( "Apps", "" );
+    delay = ( cfg.readEntry( "Delay", "0" ) ).toInt();
     // If the time between suspend and resume was longer then the
     // value saved as delay, start the app
-    if ( suspendTime.secsTo(now) >= (delay*60) ) {
-        QCopEnvelope e("QPE/System", "execute(QString)");
-        e << QString(appName);
-    } //else {
-    //}
+    if ( suspendTime.secsTo( now ) >= ( delay * 60 )  && !appName.isEmpty() ) {
+        QCopEnvelope e( "QPE/System", "execute(QString)" );
+        e << QString( appName );
+    }
 }
 
 #if defined(QPE_HAVE_TOGGLELIGHT)
 #include <qpe/config.h>
 
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <fcntl.h>
@@ -602,20 +601,20 @@ static void darkScreen()
 }
 
 
 void Desktop::togglePower()
 {
         extern void qpe_setBacklight ( int ); // We need to toggle the LCD fast - no time to send a QCop
 
         static bool excllock = false;
-        
+
         if ( excllock )
                 return;
-                
+
         excllock = true;
 
         bool wasloggedin = loggedin;
         loggedin=0;
         suspendTime = QDateTime::currentDateTime();
 
         qpe_setBacklight ( 0 ); // force LCD off
 
@@ -633,19 +632,19 @@ void Desktop::togglePower()
         }
 
         if ( wasloggedin )
                 login(TRUE);
 
         execAutoStart();
         //qcopBridge->closeOpenConnections();
         //qDebug("called togglePower()!!!!!!");
-  
+
         qApp-> processEvents ( );
-  
+
           excllock = false;
 }
 
 void Desktop::toggleLight()
 {
     QCopEnvelope e("QPE/System", "setBacklight(int)");
     e << -2; // toggle
 }
@@ -695,22 +694,22 @@ void DesktopApplication::shutdown( ShutdownImpl::Type t )
   case ShutdownImpl::RebootSystem:
       execlp("shutdown", "shutdown", "-r", "now", (void*)0);
       break;
   case ShutdownImpl::RestartDesktop:
       restart();
       break;
   case ShutdownImpl::TerminateDesktop:
       prepareForTermination(FALSE);
-      
+
       // This is a workaround for a Qt bug
       // clipboard applet has to stop its poll timer, or Qt/E
-      // will hang on quit() right before it emits aboutToQuit()      
+      // will hang on quit() right before it emits aboutToQuit()
       emit aboutToQuit ( );
-      
+
       quit();
       break;
     }
 }
 
 void DesktopApplication::restart()
 {
     prepareForTermination(TRUE);
@@ -793,17 +792,17 @@ void Desktop::soundAlarm()
 }
 
 bool Desktop::eventFilter( QObject *, QEvent *ev )
 {
   if ( ev-> type ( ) == QEvent::KeyPress ) {
     QKeyEvent *ke = (QKeyEvent *) ev;
     if ( ke-> key ( ) == Qt::Key_F11 ) { // menu key
       QWidget *active = qApp-> activeWindow ( );
-      
+
       if ( active && active-> isPopup ( ))
         active->close();
 
       raiseMenu ( );
       return true;
     }
   }
   return false;