Make conpile with Opie

If QuickApps exec fails don't try to start it anytime soon
If application fails to start and /tmp/qcop-msg- is present don't try to restart

1 files changed, 16 insertions, 7 deletions

diff --git a/core/launcher/applauncher.cpp b/core/launcher/applauncher.cpp
index 50c1b71..d6f93da 100644
--- a/core/launcher/applauncher.cpp
+++ b/core/launcher/applauncher.cpp
@@ -29,3 +29,3 @@
 #endif
-#include <qtopia/qpeglobal.h>
+#include <qtopia/global.h>
 
@@ -63,2 +63,3 @@
 #include "documentlist.h"
+#include "launcherglobal.h"
 
@@ -405,6 +406,7 @@ void AppLauncher::sigStopped(int sigPid, int sigStatus)
 	} else  {
-	    QFileInfo fi(Global::tempDir() + "qcop-msg-" + appName);
+	    QFileInfo fi(Opie::Global::tempDir() + "qcop-msg-" + appName);
 	    if ( fi.exists() && fi.size() ) {
 		emit terminated(sigPid, appName);
-		execute( appName, QString::null );
+                qWarning("Re executing obmitted for %s", appName.latin1() );
+//		execute( appName, QString::null );
 		return;
@@ -446,4 +448,4 @@ bool AppLauncher::executeBuiltin(const QString &c, const QString &document)
 {
-    Global::Command* builtin = Global::builtinCommands();
-    QGuardedPtr<QWidget> *running = Global::builtinRunning();
+    Global::Command* builtin = Opie::Global::builtinCommands();
+    QGuardedPtr<QWidget> *running = Opie::Global::builtinRunning();
     
@@ -485,2 +487,3 @@ bool AppLauncher::execute(const QString &c, const QString &docParam, bool noRais
 {
+    qWarning("AppLauncher::execute");
     // Convert the command line in to a list of arguments
@@ -496,3 +499,3 @@ bool AppLauncher::execute(const QString &c, const QString &docParam, bool noRais
 	// Need to lock it to avoid race conditions with QPEApplication::processQCopFile
-	QFile f(Global::tempDir() + "qcop-msg-" + appName);
+	QFile f(Opie::Global::tempDir() + "qcop-msg-" + appName);
 	if ( !noRaise && f.open(IO_WriteOnly | IO_Append) ) {
@@ -530,3 +533,3 @@ bool AppLauncher::execute(const QString &c, const QString &docParam, bool noRais
 #ifdef QT_NO_QWS_MULTIPROCESS
-    QMessageBox::warning( 0, tr("Error"), tr("Could not find the application %1").arg(c),
+    QMessageBox::warning( 0, tr("Error"), tr("<qt>Could not find the application %1</qt>").arg(c),
 	tr("OK"), 0, 0, 0, 1 );
@@ -637,2 +640,6 @@ void AppLauncher::createQuickLauncher()
 {
+    static bool disabled = FALSE;
+    if (disabled)
+        return;
+
     qlReady = FALSE;
@@ -650,2 +657,4 @@ void AppLauncher::createQuickLauncher()
 	::execvp( "quicklauncher", args );
+        delete []args;
+        disabled = TRUE;
 	_exit( -1 );