summaryrefslogtreecommitdiff
authoralwin <alwin>2004-02-21 13:24:51 (UTC)
committer alwin <alwin>2004-02-21 13:24:51 (UTC)
commit76b70b355d2c1c32c0f74e844e0654e39db2a175 (patch) (side-by-side diff)
tree63b32f2e0e9cdcb38e5d23ccfc51b7989894297d
parent814c3c8957f25d1436ce0b63c4201bbd2f340e7f (diff)
downloadopie-76b70b355d2c1c32c0f74e844e0654e39db2a175.zip
opie-76b70b355d2c1c32c0f74e844e0654e39db2a175.tar.gz
opie-76b70b355d2c1c32c0f74e844e0654e39db2a175.tar.bz2
qcop-msg related stuff don't use tmpDirPath 'cause it isn't that good IMHO
first: content of $TEMP can change due login - so it may run into problems when searching for qcop-msg-* files second: TEMP will set by user. The user can set it to a wrong value so cop would fail. But we can mostly guarantee that /tmp will exists.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/applauncher.cpp4
-rw-r--r--core/launcher/main.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/launcher/applauncher.cpp b/core/launcher/applauncher.cpp
index f161e98..a8779a5 100644
--- a/core/launcher/applauncher.cpp
+++ b/core/launcher/applauncher.cpp
@@ -400,13 +400,13 @@ void AppLauncher::sigStopped(int sigPid, int sigStatus)
QString str = tr("<qt><b>%1</b> was terminated due to signal code %2</qt>").arg( app->name() ).arg( sig );
QMessageBox::information(0, tr("Application terminated"), str );
} else {
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(OGlobal::tempDirPath() + "qcop-msg-" + appName);
+ QFileInfo fi(QString::fromLatin1("/tmp/qcop-msg-") + appName);
if ( fi.exists() && fi.size() ) {
emit terminated(sigPid, appName);
qWarning("Re executing obmitted for %s", appName.latin1() );
// execute( appName, QString::null );
return;
}
@@ -493,13 +493,13 @@ bool AppLauncher::execute(const QString &c, const QString &docParam, bool noRais
QString appName = list[0];
if ( isRunning(appName) ) {
QCString channel = "QPE/Application/";
channel += appName.latin1();
// Need to lock it to avoid race conditions with QPEApplication::processQCopFile
- QFile f(OGlobal::tempDirPath() + "qcop-msg-" + appName);
+ QFile f(QString::fromLatin1("/tmp/qcop-msg-") + appName);
if ( !noRaise && f.open(IO_WriteOnly | IO_Append) ) {
#ifndef Q_OS_WIN32
flock(f.handle(), LOCK_EX);
#endif
QDataStream ds(&f);
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index bf06e75..9e53bb0 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -69,13 +69,13 @@
using namespace Opie;
static void cleanup()
{
- QDir dir( OGlobal::tempDirPath(), "qcop-msg-*" );
+ QDir dir( "/tmp", "qcop-msg-*" );
QStringList stale = dir.entryList();
QStringList::Iterator it;
for ( it = stale.begin(); it != stale.end(); ++it ) {
dir.remove( *it );
}