small fix for autostart

1 files changed, 2 insertions, 3 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
@@ -182,629 +182,628 @@ void DesktopApplication::receive( const QCString &msg, const QByteArray &data )
 }
 
 enum MemState { Unknown, VeryLow, Low, Normal } memstate=Unknown;
 
 #ifdef Q_WS_QWS
 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())  { 
       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 ) {
         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;
     }
 // 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();
       return TRUE;
     }
     if ( ke->simpleData.keycode == Key_NumLock ) {
       if ( press ) emit numLockStateToggle();
     }
     if ( ke->simpleData.keycode == Key_CapsLock ) {
       if ( press ) emit capsLockStateToggle();
     }
     if (( press && !autoRepeat ) || ( !press && autoRepeat ))
       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;
       }
     }
     }
 
     return QPEApplication::qwsEventFilter( e );
 }
 #endif
 
 void DesktopApplication::psTimeout()
 {
     qpedesktop->checkMemory(); // in case no events are being generated
 
     *ps = PowerStatusManager::readStatus();
 
     if ( (ps->batteryStatus() == PowerStatus::VeryLow ) ) {
   pa->alert( tr( "Battery is running very low." ), 6 );
     }
 
     if (  ps->batteryStatus() == PowerStatus::Critical ) {
   pa->alert(  tr( "Battery level is critical!\n"
       "Keep power off until power restored!" ), 1 );
     }
 
     if (  ps->backupBatteryStatus() == PowerStatus::VeryLow ) {
   pa->alert( tr( "The Back-up battery is very low.\nPlease charge the back-up battery." ), 3 );
     }
 }
 
 
 void DesktopApplication::sendCard()
 {
     delete cardSendTimer;
     cardSendTimer = 0;
     QString card = getenv("HOME");
     card += "/Applications/addressbook/businesscard.vcf";
 
     if ( QFile::exists( card ) ) {
   QCopEnvelope e("QPE/Obex", "send(QString,QString,QString)");
   QString mimetype = "text/x-vCard";
   e << tr("business card") << card << mimetype;
     }
 }
 
 #if defined(QPE_HAVE_MEMALERTER)
 QPE_MEMALERTER_IMPL
 #endif
 
 //===========================================================================
 
 Desktop::Desktop() :
     QWidget( 0, 0, WStyle_Tool | WStyle_Customize ),
     qcopBridge( 0 ),
     transferServer( 0 ),
     packageSlave( 0 )
 {
     qpedesktop = this;
 
 //    bg = new Info( this );
     tb = new TaskBar;
 
     launcher = new Launcher( 0, 0, WStyle_Customize | QWidget::WGroupLeader );
 
     connect(launcher, SIGNAL(busy()), tb, SLOT(startWait()));
     connect(launcher, SIGNAL(notBusy(const QString&)), tb, SLOT(stopWait(const QString&)));
 
     int displayw = qApp->desktop()->width();
     int displayh = qApp->desktop()->height();
 
 
     QSize sz = tb->sizeHint();
 
     setGeometry( 0, displayh-sz.height(), displayw, sz.height() );
     tb->setGeometry( 0, displayh-sz.height(), displayw, sz.height() );
 
     tb->show();
     launcher->showMaximized();
     launcher->show();
     launcher->raise();
 #if defined(QPE_HAVE_MEMALERTER)
     initMemalerter();
 #endif
     // start services
     startTransferServer();
     (void) new IrServer( this );
     rereadVolumes();
 
     packageSlave = new PackageSlave( this );
     connect(qApp, SIGNAL(volumeChanged(bool)), this, SLOT(rereadVolumes()));
 
     qApp->installEventFilter( this );
 }
 
 void Desktop::show()
 {
     login(TRUE);
     QWidget::show();
 }
 
 Desktop::~Desktop()
 {
     delete launcher;
     delete tb;
     delete qcopBridge;
     delete transferServer;
 }
 
 bool Desktop::recoverMemory()
 {
     return tb->recoverMemory();
 }
 
 void Desktop::checkMemory()
 {
 #if defined(QPE_HAVE_MEMALERTER)
     static bool ignoreNormal=FALSE;
     static bool existingMessage=FALSE;
 
     if(existingMessage)
   return; // don't show a second message while still on first
 
     existingMessage = TRUE;
     switch ( memstate ) {
   case Unknown:
       break;
   case Low:
       memstate = Unknown;
       if ( recoverMemory() )
     ignoreNormal = TRUE;
       else
     QMessageBox::warning( 0 , "Memory Status",
         "The memory smacks of shortage. \n"
         "Please save data. " );
       break;
   case Normal:
       memstate = Unknown;
       if ( ignoreNormal )
     ignoreNormal = FALSE;
       else
     QMessageBox::information ( 0 , "Memory Status",
         "There is enough memory again." );
       break;
   case VeryLow:
       memstate = Unknown;
       QMessageBox::critical( 0 , "Memory Status",
     "The memory is very low. \n"
     "Please end this application \n"
     "immediately." );
       recoverMemory();
     }
     existingMessage = FALSE;
 #endif
 }
 
 static bool isVisibleWindow(int wid)
 {
     const QList<QWSWindow> &list = qwsServer->clientWindows();
     QWSWindow* w;
     for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
   if ( w->winId() == wid )
       return !w->isFullyObscured();
     }
     return FALSE;
 }
 
 static bool hasVisibleWindow(const QString& clientname)
 {
     const QList<QWSWindow> &list = qwsServer->clientWindows();
     QWSWindow* w;
     for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) {
   if ( w->client()->identity() == clientname && !w->isFullyObscured() )
       return TRUE;
     }
     return FALSE;
 }
 
 void Desktop::raiseLauncher()
 {
     Config cfg("qpe"); //F12 'Home'
     cfg.setGroup("AppsKey");
     QString tempItem;
     tempItem = cfg.readEntry("Middle","Home");
     if(tempItem == "Home" || tempItem.isEmpty()) {
         if ( isVisibleWindow(launcher->winId()) )
             launcher->nextView();
         else
             launcher->raise();
     } else {
         QCopEnvelope e("QPE/System","execute(QString)");
         e << tempItem;
     }
 }
 
 void Desktop::executeOrModify(const QString& appLnkFile)
 {
     AppLnk lnk(MimeType::appsFolderName() + "/" + appLnkFile);
     if ( lnk.isValid() ) {
   QCString app = lnk.exec().utf8();
   Global::terminateBuiltin("calibrate");
   if ( QCopChannel::isRegistered("QPE/Application/" + app) ) {
       MRUList::addTask(&lnk);
       if ( hasVisibleWindow(app) )
     QCopChannel::send("QPE/Application/" + app, "nextView()");
       else
     QCopChannel::send("QPE/Application/" + app, "raise()");
   } else {
       lnk.execute();
   }
     }
 }
 
 void Desktop::raiseDatebook()
 {
     Config cfg("qpe"); //F9 'Activity'
     cfg.setGroup("AppsKey");
     QString tempItem;
     tempItem = cfg.readEntry("LeftEnd","Calender");
     if(tempItem == "Calender" || tempItem.isEmpty())  executeOrModify("Applications/datebook.desktop");
     else {
         QCopEnvelope e("QPE/System","execute(QString)");
         e << tempItem;
     }
 }
 
 void Desktop::raiseContacts()
 {
     Config cfg("qpe"); //F10, 'Contacts'
     cfg.setGroup("AppsKey");
     QString tempItem;
     tempItem = cfg.readEntry("Left2nd","Address Book");
     if(tempItem == "Address Book" || tempItem.isEmpty())  executeOrModify("Applications/addressbook.desktop");
     else {
         QCopEnvelope e("QPE/System","execute(QString)");
         e << tempItem;
     }
 }
 
 void Desktop::raiseMenu()
 {
     Config cfg("qpe"); //F11, 'Menu'
     cfg.setGroup("AppsKey");
     QString tempItem;
     tempItem = cfg.readEntry("Right2nd","Popup Menu");
     if(tempItem == "Popup Menu" || tempItem.isEmpty()) {
     Global::terminateBuiltin("calibrate");
     tb->startMenu()->launch();
     } else {
         QCopEnvelope e("QPE/System","execute(QString)");
         e << tempItem;
     }
 }
 
 void Desktop::raiseEmail()
 {
     Config cfg("qpe"); //F13, 'Mail'
     cfg.setGroup("AppsKey");
     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();
     // If the time between suspend and resume was longer then the
     // value saved as delay, start the app
-    if ( suspendTime.secsTo(now) >= (delay*60) ) {
+    if ( suspendTime.secsTo( now ) >= ( delay * 60 )  && !appName.isEmpty() ) {
         QCopEnvelope e("QPE/System", "execute(QString)");
         e << QString(appName);
-    } //else {
-    //}
+    }
 }
 
 #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;
 
 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()
 {
 	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()
 {
     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();
 
     tb->setGeometry( 0, displayh-sz.height(), displayw, sz.height() );
 }
 
 void DesktopApplication::shutdown()
 {
     if ( type() != GuiServer )
   return;
     ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose );
     connect( sd, SIGNAL(shutdown(ShutdownImpl::Type)),
        this, SLOT(shutdown(ShutdownImpl::Type)) );
     sd->showMaximized();
 }
 
 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()      
       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 );
 #else
     execl( (qpeDir()+"/bin/qpe").latin1(), "qpe", 0 );
 #endif
     exit(1);
 #endif
 }
 
 void Desktop::startTransferServer()
 {
     // start qcop bridge server
     qcopBridge = new QCopBridge( 4243 );
     if ( !qcopBridge->ok() ) {
   delete qcopBridge;
   qcopBridge = 0;
     }
     // start transfer server
     transferServer = new TransferServer( 4242 );
     if ( !transferServer->ok() ) {
   delete transferServer;
   transferServer = 0;
     }
     if ( !transferServer || !qcopBridge )
   startTimer( 2000 );
 }
 
 void Desktop::timerEvent( QTimerEvent *e )
 {
     killTimer( e->timerId() );
     startTransferServer();
 }
 
 void Desktop::terminateServers()
 {
     delete transferServer;
     delete qcopBridge;
     transferServer = 0;
     qcopBridge = 0;
 }
 
 void Desktop::rereadVolumes()
 {
     Config cfg("qpe");
     cfg.setGroup("Volume");
     touchclick = cfg.readBoolEntry("TouchSound");
     keyclick = cfg.readBoolEntry("KeySound");
     alarmsound = cfg.readBoolEntry("AlarmSound");
 //     Config cfg("Sound");
 //     cfg.setGroup("System");
 //     touchclick = cfg.readBoolEntry("Touch");
 //     keyclick = cfg.readBoolEntry("Key");
 }
 
 void Desktop::keyClick()
 {
   if ( keyclick )
       ODevice::inst ( )-> keySound ( );
 }
 
 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;
 }