summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/applauncher.cpp23
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
@@ -27,7 +27,7 @@
#ifndef QTOPIA_PROGRAM_MONITOR
#define QTOPIA_PROGRAM_MONITOR
#endif
-#include <qtopia/qpeglobal.h>
+#include <qtopia/global.h>
#ifndef Q_OS_WIN32
#include <sys/stat.h>
@@ -61,6 +61,7 @@
#include "applauncher.h"
#include "documentlist.h"
+#include "launcherglobal.h"
const int AppLauncher::RAISE_TIMEOUT_MS = 5000;
@@ -403,10 +404,11 @@ void AppLauncher::sigStopped(int sigPid, int sigStatus)
if ( exitStatus == 255 ) { //could not find app (because global returns -1)
QMessageBox::information(0, tr("Application not found"), tr("<qt>Could not locate application <b>%1</b></qt>").arg( app->exec() ) );
} 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;
}
}
@@ -444,8 +446,8 @@ bool AppLauncher::isRunning(const QString &app)
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();
// Attempt to execute the app using a builtin class for the app
if (builtin) {
@@ -483,6 +485,7 @@ bool AppLauncher::executeBuiltin(const QString &c, const QString &document)
bool AppLauncher::execute(const QString &c, const QString &docParam, bool noRaise)
{
+ qWarning("AppLauncher::execute");
// Convert the command line in to a list of arguments
QStringList list = QStringList::split(QRegExp(" *"),c);
if ( !docParam.isEmpty() )
@@ -494,7 +497,7 @@ bool AppLauncher::execute(const QString &c, const QString &docParam, bool noRais
channel += appName.latin1();
// 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) ) {
#ifndef Q_OS_WIN32
flock(f.handle(), LOCK_EX);
@@ -528,7 +531,7 @@ 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 );
#else
@@ -635,6 +638,10 @@ int AppLauncher::pidForName( const QString &appName )
void AppLauncher::createQuickLauncher()
{
+ static bool disabled = FALSE;
+ if (disabled)
+ return;
+
qlReady = FALSE;
qlPid = ::vfork();
if ( !qlPid ) {
@@ -648,6 +655,8 @@ void AppLauncher::createQuickLauncher()
setenv( "LD_BIND_NOW", "1", 1 );
::execv( QPEApplication::qpeDir()+"bin/quicklauncher", args );
::execvp( "quicklauncher", args );
+ delete []args;
+ disabled = TRUE;
_exit( -1 );
} else if ( qlPid == -1 ) {
qlPid = 0;