3 files changed, 58 insertions, 7 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
@@ -52,7 +52,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-
 class QCopKeyRegister
 {
 public:
@@ -497,6 +496,17 @@ 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>
 
@@ -536,15 +546,19 @@ void Desktop::togglePower()
     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 )
+  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
@@ -99,6 +99,7 @@ public slots:
     void raiseMenu();
     void raiseLauncher();
     void raiseEmail();
+    void execAutoStart();
     void togglePower();
     void toggleLight();
     void toggleNumLockState();
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
@@ -18,6 +18,10 @@
 **
 **********************************************************************/
 
+// WARNING: Do *NOT* define this yourself. The SL5xxx from SHARP does NOT
+//      have this class.
+#define QTOPIA_INTERNAL_FSLP
+
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
@@ -631,6 +635,36 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
 	e << home;
 	int locked = (int) Desktop::screenLocked();
 	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();
@@ -697,20 +731,22 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data)
 
 	for ( QListIterator<DocLnk> it( docsFolder->children() ); it.current(); ++it ) {
 	    DocLnk *doc = it.current();
-	    QString lfn = doc->linkFile();
 	    QFileInfo fi( doc->file() );
 	    if ( !fi.exists() )
 		continue;
 
-
-
-	    QFile f( lfn );
+	    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 {
+		} else
+		    fake = TRUE;
+	    }
+	    if (fake) {
 		contents += "[Desktop Entry]\n";
 		contents += "Categories = " + Qtopia::Record::idsToString( doc->categories() ) + "\n";
 		contents += "File = "+doc->file()+"\n";