1 files changed, 31 insertions, 17 deletions

diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index a00fae2..4587ec6 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -31,49 +31,48 @@
 #include "packageslave.h"
 
 #include <qpe/applnk.h>
 #include <qpe/mimetype.h>
 #include <qpe/password.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
 #ifdef QT_QWS_CUSTOM
 #include "qpe/custom.h"
 #endif
 
 #include <qgfx_qws.h>
 #include <qmainwindow.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qwindowsystem_qws.h>
 
 #include <qvaluelist.h>
 
 #include <stdlib.h>
 #include <unistd.h>
 
-
 class QCopKeyRegister
 {
 public:
   QCopKeyRegister() : keyCode(0) { }
   QCopKeyRegister(int k, const QString &c, const QString &m) 
 	: keyCode(k), channel(c), message(m) { }
 
   int getKeyCode() const { return keyCode; }
   QString getChannel() const { return channel; }
   QString getMessage() const { return message; }
 
 private:
   int keyCode;
   QString channel, message;
 };
 
 typedef QValueList<QCopKeyRegister> KeyRegisterList;
 KeyRegisterList keyRegisterList;
 
 static Desktop* qpedesktop = 0;
 static int loggedin=0;
 static void login(bool at_poweron)
 {
     if ( !loggedin ) {
@@ -476,98 +475,113 @@ void Desktop::executeOrModify(const QString& appLnkFile)
     }
 }
 
 void Desktop::raiseDatebook()
 {
     executeOrModify("Applications/datebook.desktop");
 }
 
 void Desktop::raiseContacts()
 {
     executeOrModify("Applications/addressbook.desktop");
 }
 
 void Desktop::raiseMenu()
 {
     Global::terminateBuiltin("calibrate");
     tb->startMenu()->launch();
 }
 
 void Desktop::raiseEmail()
 {
     executeOrModify("Applications/qtmail.desktop");
 }
 
+// autoStarts apps on resume and start
+void Desktop::execAutoStart()
+{
+  QString appName;
+  Config cfg( "autostart" );
+  cfg.setGroup( "AutoStart" );
+  appName = cfg.readEntry("Apps", "");
+  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;
 
 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");
-    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);
-    //qcopBridge->closeOpenConnections();
-    //qDebug("called 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);
+  }
+  
+  //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 )