@ -59,7 +59,7 @@ KioskRun::KioskRun( TQObject* parent, const char* name)
s_self = this ;
s_self = this ;
m_saveConfigCache . setAutoDelete ( true ) ;
m_saveConfigCache . setAutoDelete ( true ) ;
m_immutableStatusCache . setAutoDelete ( true ) ;
m_immutableStatusCache . setAutoDelete ( true ) ;
m_homeDir = TQDir : : homeDirPath ( ) + " /. kde -test" ;
m_homeDir = TQDir : : homeDirPath ( ) + " /. trinity -test" ;
KCmdLineArgs * args = KCmdLineArgs : : parsedArgs ( ) ;
KCmdLineArgs * args = KCmdLineArgs : : parsedArgs ( ) ;
m_kderc = TQFile : : decodeName ( args - > getOption ( " kderc " ) ) ;
m_kderc = TQFile : : decodeName ( args - > getOption ( " kderc " ) ) ;
m_isRoot = ( getuid ( ) = = 0 ) ;
m_isRoot = ( getuid ( ) = = 0 ) ;
@ -162,14 +162,14 @@ void
KioskRun : : applyEnvironment ( KProcess * p )
KioskRun : : applyEnvironment ( KProcess * p )
{
{
p - > setEnvironment ( " HOME " , m_homeDir ) ;
p - > setEnvironment ( " HOME " , m_homeDir ) ;
p - > setEnvironment ( " KDEHOME " , m_homeDir + " /. kde " ) ;
p - > setEnvironment ( " KDEHOME " , m_homeDir + " /. trinity " ) ;
p - > setEnvironment ( " KDEROOTHOME " , m_homeDir + " /. kde " ) ;
p - > setEnvironment ( " KDEROOTHOME " , m_homeDir + " /. trinity " ) ;
p - > setEnvironment ( " KDEDIRS " , m_kdeDirs . join ( " : " ) ) ;
p - > setEnvironment ( " KDEDIRS " , m_kdeDirs . join ( " : " ) ) ;
p - > setEnvironment ( " XDG_DATA_HOME " , m_homeDir + " /.local/share " ) ;
p - > setEnvironment ( " XDG_DATA_HOME " , m_homeDir + " /.local/share " ) ;
p - > setEnvironment ( " XDG_DATA_DIRS " , m_xdgDataDirs . join ( " : " ) ) ;
p - > setEnvironment ( " XDG_DATA_DIRS " , m_xdgDataDirs . join ( " : " ) ) ;
p - > setEnvironment ( " XDG_CONFIG_HOME " , m_homeDir + " /.config " ) ;
p - > setEnvironment ( " XDG_CONFIG_HOME " , m_homeDir + " /.config " ) ;
p - > setEnvironment ( " XDG_CONFIG_DIRS " , m_xdgConfigDirs . join ( " : " ) ) ;
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 " ) ;
p - > setEnvironment ( " KDE_KIOSK_NO_PROFILES " , " true " ) ;
if ( m_noRestrictions )
if ( m_noRestrictions )
p - > setEnvironment ( " KDE_KIOSK_NO_RESTRICTIONS " , " true " ) ;
p - > setEnvironment ( " KDE_KIOSK_NO_RESTRICTIONS " , " true " ) ;
@ -247,7 +247,7 @@ KioskRun::setupConfigEnv()
TQString newSocketDir = : : locateLocal ( " socket " , " kioskdir " ) ;
TQString newSocketDir = : : locateLocal ( " socket " , " kioskdir " ) ;
SetEnv home ( " HOME " , m_homeDir ) ;
SetEnv home ( " HOME " , m_homeDir ) ;
TQString kdeHome = m_homeDir + " /. kde " ;
TQString kdeHome = m_homeDir + " /. trinity " ;
SetEnv kdehome ( " KDEHOME " , kdeHome ) ;
SetEnv kdehome ( " KDEHOME " , kdeHome ) ;
SetEnv kderoothome ( " KDEROOTHOME " , kdeHome ) ;
SetEnv kderoothome ( " KDEROOTHOME " , kdeHome ) ;
SetEnv kdedirs ( " KDEDIRS " , m_kdeDirs . join ( " : " ) ) ;
SetEnv kdedirs ( " KDEDIRS " , m_kdeDirs . join ( " : " ) ) ;
@ -274,7 +274,7 @@ KioskRun::setupConfigEnv()
: : mkdir ( TQFile : : encodeName ( newSocketDir ) , 0700 ) ;
: : mkdir ( TQFile : : encodeName ( newSocketDir ) , 0700 ) ;
: : symlink ( TQFile : : encodeName ( newSocketDir ) , TQFile : : encodeName ( socketDir ) ) ;
: : 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 " ) ;
m_instance = new KInstance ( " kioskrun " ) ;
( void ) m_instance - > dirs ( ) ; // Create KStandardDirs obj
( void ) m_instance - > dirs ( ) ; // Create KStandardDirs obj
@ -743,7 +743,7 @@ KioskRun::setupRuntimeEnv()
char hostname [ 256 ] ;
char hostname [ 256 ] ;
hostname [ 0 ] = 0 ;
hostname [ 0 ] = 0 ;
gethostname ( hostname , 255 ) ;
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 ) ;
deleteDir ( cacheDir ) ;
KStandardDirs : : makeDir ( cacheDir ) ;
KStandardDirs : : makeDir ( cacheDir ) ;
@ -757,7 +757,7 @@ KioskRun::setupRuntimeEnv()
TQString xAuth = TQString ( " %1/.Xauthority " ) . arg ( TQDir : : homeDirPath ( ) ) ;
TQString xAuth = TQString ( " %1/.Xauthority " ) . arg ( TQDir : : homeDirPath ( ) ) ;
setenv ( " XAUTHORITY " , TQFile : : encodeName ( xAuth ) , 0 ) ; // Don't overwrite existing setting
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 ;
KProcess kdeinit ;