small fix for autostart

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
@@ -187,35 +187,35 @@ enum MemState { Unknown, VeryLow, Low, Normal } memstate=Unknown;
 bool DesktopApplication::qwsEventFilter( QWSEvent *e )
 {
     qpedesktop->checkMemory();
 
     if ( e->type == QWSEvent::Key ) {
     QWSKeyEvent *ke = (QWSKeyEvent *)e;
     if ( !loggedin && ke->simpleData.keycode != Key_F34 )
       return TRUE;
     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());
           }
       }
     }
 
     if ( !keyboardGrabbed() ) {
       if ( ke->simpleData.keycode == Key_F9 ) {
       if ( press ) emit datebook();
       return TRUE;
       }
       if ( ke->simpleData.keycode == Key_F10 ) {
         if ( !press && cardSendTimer ) {
@@ -237,33 +237,33 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e )
       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;
     }
-// 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();
       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();
@@ -546,41 +546,40 @@ void Desktop::raiseEmail()
     QString tempItem;
     tempItem = cfg.readEntry("RightEnd","Mail");
     if(tempItem == "Mail" || tempItem == "qtmail" || tempItem.isEmpty())  executeOrModify("Applications/qtmail.desktop");
     else {
         QCopEnvelope e("QPE/System","execute(QString)");
         e << tempItem;
     }
 }
 
 // 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>
 #include <unistd.h>
 #include <errno.h>
 #include <linux/ioctl.h>
 #include <time.h>
 #endif
 
 static bool blanked=FALSE;
 
@@ -594,66 +593,66 @@ static void blankScreen()
     */
     blanked = TRUE;
 }
 
 static void darkScreen()
 {
     extern void qpe_setBacklight(int);
     qpe_setBacklight(0); // force off
 }
 
 
 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
 
         if ( wasloggedin )
             blankScreen();
 
         ODevice::inst ( )-> suspend ( );
 
         QWSServer::screenSaverActivate ( false );
 
         qpe_setBacklight ( -3 ); // force LCD on
 
         {
                 QCopEnvelope("QPE/Card", "mtabChanged()" ); // might have changed while asleep
         }
 
         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
 }
 
 void Desktop::toggleSymbolInput()
 {
     tb->toggleSymbolInput();
 }
 
 void Desktop::toggleNumLockState()
 {
@@ -687,38 +686,38 @@ void DesktopApplication::shutdown()
 }
 
 void DesktopApplication::shutdown( ShutdownImpl::Type t )
 {
     switch ( t ) {
   case ShutdownImpl::ShutdownSystem:
       execlp("shutdown", "shutdown", "-h", "now", (void*)0);
       break;
   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);
 
 #ifdef Q_WS_QWS
     for ( int fd = 3; fd < 100; fd++ )
   close( fd );
 #if defined(QT_DEMO_SINGLE_FLOPPY)
     execl( "/sbin/init", "qpe", 0 );
 #elif defined(QT_QWS_CASSIOPEIA)
     execl( "/bin/sh", "sh", 0 );
@@ -785,26 +784,26 @@ void Desktop::screenClick()
   if ( touchclick )
       ODevice::inst ( )-> touchSound ( );
 }
 
 void Desktop::soundAlarm()
 {
   if ( qpedesktop-> alarmsound )
     ODevice::inst ( )-> alarmSound ( );
 }
 
 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;
 }