summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-11-04 01:07:37 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-11-04 01:07:37 -0500
commit09dc16646df05482a0c83e31436bdbb92ddb2149 (patch)
treee0194cb6171b5c557aaabdd3b5918aef4ca11a87
parent08ba413548c3cab272f8fec55c5d5604beeccd9b (diff)
downloadkiosktool-09dc16646df05482a0c83e31436bdbb92ddb2149.tar.gz
kiosktool-09dc16646df05482a0c83e31436bdbb92ddb2149.zip
Fix references to user profile directory.
-rw-r--r--doc/da/profiles.docbook2
-rw-r--r--doc/it/profiles.docbook2
-rw-r--r--doc/kiosktool/profiles.docbook2
-rw-r--r--doc/pt/profiles.docbook2
-rw-r--r--doc/sv/profiles.docbook2
-rw-r--r--kiosktool/kioskgui.cpp2
-rw-r--r--kiosktool/kioskrun.cpp16
7 files changed, 14 insertions, 14 deletions
diff --git a/doc/da/profiles.docbook b/doc/da/profiles.docbook
index 92ca5f8..2a77722 100644
--- a/doc/da/profiles.docbook
+++ b/doc/da/profiles.docbook
@@ -15,7 +15,7 @@
>kombineres</ulink
> inden de bruges. Funktionen <ulink url="http://www.kde.org/areas/sysadmin/config_file.php#lock_down"
>låsning</ulink
-> kontrollerer om indstillinger i brugerens hjemmemappe ($TDEHOME eller ~/.kde) tages i betragtning eller ej. </para>
+> kontrollerer om indstillinger i brugerens hjemmemappe ($TDEHOME eller ~/.trinity) tages i betragtning eller ej. </para>
<para
>En profil består af en almindelig KDE-mappestruktur på sit eget sted med indstillinger og information som vælges af dig. </para>
diff --git a/doc/it/profiles.docbook b/doc/it/profiles.docbook
index c9ca758..198ec82 100644
--- a/doc/it/profiles.docbook
+++ b/doc/it/profiles.docbook
@@ -15,7 +15,7 @@
>combinate</ulink
> prima di essere usate. Le funzionalità di <ulink url="http://www.kde.org/areas/sysadmin/config_file.php#lock_down"
>blocco</ulink
-> regolano se le impostazioni nella cartella dell'utente ($TDEHOME o ~/.kde) sono tenute in conto o meno. </para>
+> regolano se le impostazioni nella cartella dell'utente ($TDEHOME o ~/.trinity) sono tenute in conto o meno. </para>
<para
>Un profilo consiste di una struttura delle cartelle standard di KDE in una posizione personalizzata con impostazioni e informazioni che scegli tu. </para>
diff --git a/doc/kiosktool/profiles.docbook b/doc/kiosktool/profiles.docbook
index 56a2491..1753c11 100644
--- a/doc/kiosktool/profiles.docbook
+++ b/doc/kiosktool/profiles.docbook
@@ -16,7 +16,7 @@ found in the various locations are
<ulink url="http://www.kde.org/areas/sysadmin/config_file.php#cascading">combined</ulink>
before they are used.
<ulink url="http://www.kde.org/areas/sysadmin/config_file.php#lock_down">Lock down</ulink>
-features control whether settings in the user's home folder ($TDEHOME or ~/.kde)
+features control whether settings in the user's home folder ($TDEHOME or ~/.trinity)
are taken into account or not.
</para>
diff --git a/doc/pt/profiles.docbook b/doc/pt/profiles.docbook
index dac762e..972f35a 100644
--- a/doc/pt/profiles.docbook
+++ b/doc/pt/profiles.docbook
@@ -15,7 +15,7 @@
>combinados</ulink
> antes de poderem ser usados. As <ulink url="http://www.kde.org/areas/sysadmin/config_file.php#lock_down"
>Lock funcionalidades bloqueadas</ulink
-> controlam se as opções na pasta pessoal do utilizador (a $TDEHOME ou a ~/.kde) são tidas em conta ou não. </para>
+> controlam se as opções na pasta pessoal do utilizador (a $TDEHOME ou a ~/.trinity) são tidas em conta ou não. </para>
<para
>Um perfil consiste numa estrutura de pastas normal do KDE numa localização personalizada com opções e informações escolhidas para si. </para>
diff --git a/doc/sv/profiles.docbook b/doc/sv/profiles.docbook
index 7cf2981..bf3310b 100644
--- a/doc/sv/profiles.docbook
+++ b/doc/sv/profiles.docbook
@@ -15,7 +15,7 @@
>kombineras</ulink
> innan de används. Funktionen <ulink url="http://www.kde.org/areas/sysadmin/config_file.php#lock_down"
>låsning</ulink
-> styr om inställningar i användarens hemkatalog ($TDEHOME eller ~/.kde) tas hänsyn till eller inte. </para>
+> styr om inställningar i användarens hemkatalog ($TDEHOME eller ~/.trinity) tas hänsyn till eller inte. </para>
<para
>En profil består av en vanlig KDE-katalogstruktur på en egen plats med inställningar och information som väljes av dig. </para>
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 79d01a6..064f93d 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("TDEHOME", m_homeDir+"/.kde");
- p->setEnvironment("TDEROOTHOME", m_homeDir+"/.kde");
+ p->setEnvironment("TDEHOME", m_homeDir+"/.trinity");
+ p->setEnvironment("TDEROOTHOME", m_homeDir+"/.trinity");
p->setEnvironment("TDEDIRS", 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("TDE_KIOSK_NO_PROFILES", "true");
if (m_noRestrictions)
p->setEnvironment("TDE_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 tdehome("TDEHOME", kdeHome);
SetEnv tderoothome("TDEROOTHOME", kdeHome);
SetEnv tdedirs("TDEDIRS", 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 tdeinit;