3 files changed, 80 insertions, 29 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
@@ -54,3 +54,2 @@
 
-
 class QCopKeyRegister
@@ -499,2 +498,13 @@ void Desktop::raiseEmail()
 
+// 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)
@@ -533,18 +543,22 @@ 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()!!!!!!");
 }
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h
index f0a7cba..de0dbf0 100644
--- a/core/launcher/desktop.h
+++ b/core/launcher/desktop.h
@@ -101,2 +101,3 @@ public slots:
     void raiseEmail();
+    void execAutoStart();
     void togglePower();
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 66a2ce5..0573330 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -20,2 +20,6 @@
 
+// WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
+//      have this class.
+#define QTOPIA_INTERNAL_FSLP
+
 #include <qpe/qcopenvelope_qws.h>
@@ -633,5 +637,35 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
         e << locked;
+        // register an app for autostart
+        // if clear is send the list is cleared.
+    } else if ( msg == "autoStart(QString)" ) {
+      QString appName;
+      stream >> appName;
+      Config cfg( "autostart" );
+      cfg.setGroup( "AutoStart" );
+      if ( appName.compare("clear") == 0){
+        cfg.writeEntry("Apps", "");
+      }
+    } else if ( msg == "autoStart(QString,QString)" ) {
+      QString modifier, appName;
+      stream >> modifier >> appName;
+      Config cfg( "autostart" );
+      cfg.setGroup( "AutoStart" );
+      if ( modifier.compare("add") == 0 ){
+        // only add it appname is entered
+        if (!appName.isEmpty()) {
+          cfg.writeEntry("Apps", appName);
+        }
+      } else if (modifier.compare("remove") == 0 ) {
+        // need to change for multiple entries
+        // actually remove is right now simular to clear, but in future there 
+        // should be multiple apps in autostart possible.
+        QString checkName;
+        checkName = cfg.readEntry("Apps", "");
+        if (checkName == appName) {
+          cfg.writeEntry("Apps", "");
+        }
+      }
     } else if ( msg == "sendCardInfo()" ) {
-        QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" );
-        const QList<FileSystem> &fs = storage->fileSystems();
+        QCopEnvelope e( "QPE/Desktop", "cardInfo(QString)" );
+        const QList<FileSystem> &fs = storage->fileSystems();
         QListIterator<FileSystem> it ( fs );
@@ -699,3 +733,2 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
             DocLnk *doc = it.current();
-            QString lfn = doc->linkFile();
             QFileInfo fi( doc->file() );
@@ -704,11 +737,14 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
 
-
-
-            QFile f( lfn );
-            if ( f.open( IO_ReadOnly ) ) {
-                QTextStream ts( &f );
-                ts.setEncoding( QTextStream::UnicodeUTF8 );
-                contents += ts.read();
-                f.close();
-            } else {
+            bool fake = !doc->linkFileKnown();
+            if ( !fake ) {
+                QFile f( doc->linkFile() );
+                if ( f.open( IO_ReadOnly ) ) {
+                    QTextStream ts( &f );
+                    ts.setEncoding( QTextStream::UnicodeUTF8 );
+                    contents += ts.read();
+                    f.close();
+                } else
+                    fake = TRUE;
+            }
+            if (fake) {
                 contents += "[Desktop Entry]\n";