From a3c53fc74c798cd883d20832d66e6009b86f1e62 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 4 Nov 2012 01:07:37 -0500 Subject: Fix references to user profile directory. (cherry picked from commit 09dc16646df05482a0c83e31436bdbb92ddb2149) --- doc/da/profiles.docbook | 2 +- doc/it/profiles.docbook | 2 +- doc/kiosktool/profiles.docbook | 2 +- doc/pt/profiles.docbook | 2 +- doc/sv/profiles.docbook | 2 +- kiosktool/kioskgui.cpp | 2 +- kiosktool/kioskrun.cpp | 16 ++++++++-------- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/da/profiles.docbook b/doc/da/profiles.docbook index a404a10..725c6f3 100644 --- a/doc/da/profiles.docbook +++ b/doc/da/profiles.docbook @@ -15,7 +15,7 @@ >kombineres inden de bruges. Funktionen låsning kontrollerer om indstillinger i brugerens hjemmemappe ($KDEHOME eller ~/.kde) tages i betragtning eller ej. +> kontrollerer om indstillinger i brugerens hjemmemappe ($KDEHOME eller ~/.trinity) tages i betragtning eller ej. En profil består af en almindelig KDE-mappestruktur på sit eget sted med indstillinger og information som vælges af dig. diff --git a/doc/it/profiles.docbook b/doc/it/profiles.docbook index b7ab88c..61a9586 100644 --- a/doc/it/profiles.docbook +++ b/doc/it/profiles.docbook @@ -15,7 +15,7 @@ >combinate prima di essere usate. Le funzionalità di blocco regolano se le impostazioni nella cartella dell'utente ($KDEHOME o ~/.kde) sono tenute in conto o meno. +> regolano se le impostazioni nella cartella dell'utente ($KDEHOME o ~/.trinity) sono tenute in conto o meno. Un profilo consiste di una struttura delle cartelle standard di KDE in una posizione personalizzata con impostazioni e informazioni che scegli tu. diff --git a/doc/kiosktool/profiles.docbook b/doc/kiosktool/profiles.docbook index 53a6b49..513aa71 100644 --- a/doc/kiosktool/profiles.docbook +++ b/doc/kiosktool/profiles.docbook @@ -16,7 +16,7 @@ found in the various locations are combined before they are used. Lock down -features control whether settings in the user's home folder ($KDEHOME or ~/.kde) +features control whether settings in the user's home folder ($KDEHOME or ~/.trinity) are taken into account or not. diff --git a/doc/pt/profiles.docbook b/doc/pt/profiles.docbook index a6123b3..33d4d86 100644 --- a/doc/pt/profiles.docbook +++ b/doc/pt/profiles.docbook @@ -15,7 +15,7 @@ >combinados antes de poderem ser usados. As Lock funcionalidades bloqueadas controlam se as opções na pasta pessoal do utilizador (a $KDEHOME ou a ~/.kde) são tidas em conta ou não. +> controlam se as opções na pasta pessoal do utilizador (a $KDEHOME ou a ~/.trinity) são tidas em conta ou não. Um perfil consiste numa estrutura de pastas normal do KDE numa localização personalizada com opções e informações escolhidas para si. diff --git a/doc/sv/profiles.docbook b/doc/sv/profiles.docbook index 4ae8f69..4c2855e 100644 --- a/doc/sv/profiles.docbook +++ b/doc/sv/profiles.docbook @@ -15,7 +15,7 @@ >kombineras innan de används. Funktionen låsning styr om inställningar i användarens hemkatalog ($KDEHOME eller ~/.kde) tas hänsyn till eller inte. +> styr om inställningar i användarens hemkatalog ($KDEHOME eller ~/.trinity) tas hänsyn till eller inte. En profil består av en vanlig KDE-katalogstruktur på en egen plats med inställningar och information som väljes av dig. 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; -- cgit v1.2.3