diff options
Diffstat (limited to 'kiosktool/kioskrun.cpp')
| -rw-r--r-- | kiosktool/kioskrun.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp index bc6acfe..5242749 100644 --- a/kiosktool/kioskrun.cpp +++ b/kiosktool/kioskrun.cpp @@ -749,9 +749,22 @@ KioskRun::setupRuntimeEnv() TDEStandardDirs::makeDir(cacheDir); deleteDir(m_homeDir+"/.qt"); ::unlink(TQFile::encodeName(m_homeDir+".tderc")); - - TQString iceAuth = TQString("%1/.ICEauthority").arg(TQDir::homeDirPath()); + TQString iceFileBase = "ICEauthority"; + TQString iceAuth; + if (getenv("XDG_RUNTIME_DIR")) + { + iceAuth = TQString("%1/%2").arg(getenv("XDG_RUNTIME_DIR")).arg(iceFileBase); + TQFileInfo fi(iceAuth); + if (!fi.exists()) + { + iceAuth = TQString::null; + } + } + if (iceAuth.isEmpty()) + { + iceAuth = TQString("%1/.%2").arg(TQDir::homeDirPath()).arg(iceFileBase); + } setenv("ICEAUTHORITY", TQFile::encodeName(iceAuth), 0); // Don't overwrite existing setting TQString xAuth = TQString("%1/.Xauthority").arg(TQDir::homeDirPath()); @@ -765,7 +778,7 @@ KioskRun::setupRuntimeEnv() tdeinit << "tdeinit"; - connect(&tdeinit, TQT_SIGNAL(processExited(TDEProcess *)), &dlg, TQT_SLOT(slotFinished())); + connect(&tdeinit, TQ_SIGNAL(processExited(TDEProcess *)), &dlg, TQ_SLOT(slotFinished())); tdeinit.start(TDEProcess::NotifyOnExit); @@ -1650,7 +1663,7 @@ KioskRunProgressDialog::KioskRunProgressDialog(TQWidget *parent, const char *nam const TQString &caption, const TQString &text) : KProgressDialog(parent, name, caption, text, true) { - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgress())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotProgress())); progressBar()->setTotalSteps(20); m_timeStep = 700; m_timer.start(m_timeStep); @@ -1679,7 +1692,7 @@ KioskRunProgressDialog::slotFinished() { progressBar()->setProgress(20); m_timer.stop(); - TQTimer::singleShot(1000, this, TQT_SLOT(close())); + TQTimer::singleShot(1000, this, TQ_SLOT(close())); } |