diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-04 01:07:37 -0500 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-12-30 17:28:34 +0100 |
commit | a3c53fc74c798cd883d20832d66e6009b86f1e62 (patch) | |
tree | b72205dcf8b206d8a39d84b7160dadb9a2a580b7 /kiosktool | |
parent | 586568f920976ae62b9e8d14e12bce71afca0525 (diff) | |
download | kiosktool-a3c53fc74c798cd883d20832d66e6009b86f1e62.tar.gz kiosktool-a3c53fc74c798cd883d20832d66e6009b86f1e62.zip |
Fix references to user profile directory.
(cherry picked from commit 09dc16646df05482a0c83e31436bdbb92ddb2149)
Diffstat (limited to 'kiosktool')
-rw-r--r-- | kiosktool/kioskgui.cpp | 2 | ||||
-rw-r--r-- | kiosktool/kioskrun.cpp | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kiosktool/kioskgui.cpp b/kiosktool/kioskgui.cpp index afdc190..704a893 100644 --- a/kiosktool/kioskgui.cpp +++ b/kiosktool/kioskgui.cpp @@ -109,7 +109,7 @@ KioskGui::~KioskGui() void KioskGui::slotCheckEtcSkel() { - TQString etcSkel = "/etc/skel/.kde"; + TQString etcSkel = "/etc/skel/.trinity"; KioskSync skelDir; skelDir.addDir(etcSkel, KURL()); TQStringList skelFiles = skelDir.listFiles(); diff --git a/kiosktool/kioskrun.cpp b/kiosktool/kioskrun.cpp index 4656465..f0e572c 100644 --- a/kiosktool/kioskrun.cpp +++ b/kiosktool/kioskrun.cpp @@ -59,7 +59,7 @@ KioskRun::KioskRun( TQObject* parent, const char* name) s_self = this; m_saveConfigCache.setAutoDelete(true); m_immutableStatusCache.setAutoDelete(true); - m_homeDir = TQDir::homeDirPath()+"/.kde-test"; + m_homeDir = TQDir::homeDirPath()+"/.trinity-test"; KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); m_kderc = TQFile::decodeName(args->getOption("kderc")); m_isRoot = (getuid() == 0); @@ -162,14 +162,14 @@ void KioskRun::applyEnvironment(KProcess *p) { p->setEnvironment("HOME", m_homeDir); - p->setEnvironment("KDEHOME", m_homeDir+"/.kde"); - p->setEnvironment("KDEROOTHOME", m_homeDir+"/.kde"); + p->setEnvironment("KDEHOME", m_homeDir+"/.trinity"); + p->setEnvironment("KDEROOTHOME", m_homeDir+"/.trinity"); p->setEnvironment("KDEDIRS", m_kdeDirs.join(":")); p->setEnvironment("XDG_DATA_HOME", m_homeDir+"/.local/share"); p->setEnvironment("XDG_DATA_DIRS", m_xdgDataDirs.join(":")); p->setEnvironment("XDG_CONFIG_HOME", m_homeDir+"/.config"); p->setEnvironment("XDG_CONFIG_DIRS", m_xdgConfigDirs.join(":")); - p->setEnvironment("DCOPAUTHORITY", m_homeDir+"/.kde/DCOPserver"); + p->setEnvironment("DCOPAUTHORITY", m_homeDir+"/.trinity/DCOPserver"); p->setEnvironment("KDE_KIOSK_NO_PROFILES", "true"); if (m_noRestrictions) p->setEnvironment("KDE_KIOSK_NO_RESTRICTIONS", "true"); @@ -247,7 +247,7 @@ KioskRun::setupConfigEnv() TQString newSocketDir = ::locateLocal("socket", "kioskdir"); SetEnv home("HOME", m_homeDir); - TQString kdeHome = m_homeDir+"/.kde"; + TQString kdeHome = m_homeDir+"/.trinity"; SetEnv kdehome("KDEHOME", kdeHome); SetEnv kderoothome("KDEROOTHOME", kdeHome); SetEnv kdedirs("KDEDIRS", m_kdeDirs.join(":")); @@ -274,7 +274,7 @@ KioskRun::setupConfigEnv() ::mkdir(TQFile::encodeName(newSocketDir), 0700); ::symlink(TQFile::encodeName(newSocketDir), TQFile::encodeName(socketDir)); - m_configDir = TQString("%1/.kde/share/config/").arg(m_homeDir); + m_configDir = TQString("%1/.trinity/share/config/").arg(m_homeDir); m_instance = new KInstance("kioskrun"); (void) m_instance->dirs(); // Create KStandardDirs obj @@ -743,7 +743,7 @@ KioskRun::setupRuntimeEnv() char hostname[256]; hostname[0] = 0; gethostname(hostname, 255); - TQString cacheDir = TQString("%1/.kde/cache-%2").arg(m_homeDir).arg(hostname); + TQString cacheDir = TQString("%1/.trinity/cache-%2").arg(m_homeDir).arg(hostname); deleteDir(cacheDir); KStandardDirs::makeDir(cacheDir); @@ -757,7 +757,7 @@ KioskRun::setupRuntimeEnv() TQString xAuth = TQString("%1/.Xauthority").arg(TQDir::homeDirPath()); setenv("XAUTHORITY", TQFile::encodeName(xAuth), 0); // Don't overwrite existing setting - TQString dcopServerFile = m_homeDir+"/.kde/DCOPserver"; + TQString dcopServerFile = m_homeDir+"/.trinity/DCOPserver"; KProcess kdeinit; |