[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/sysadmin/kiosktool
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2010-03-10 12:43:56
Message-ID: 1268225036.460790.27843.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1101643 by lunakl:

KDE_DEFAULT_HOME instead of hardcoded .kde



 M  +2 -0      CMakeLists.txt  
 M  +4 -1      kioskgui.cpp  
 M  +7 -5      kioskrun.cpp  


--- trunk/extragear/sysadmin/kiosktool/CMakeLists.txt #1101642:1101643
@@ -8,6 +8,8 @@
         ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_CURRENT_BINARY_DIR} )
 
+set (KDE_DEFAULT_HOME ".kde${_KDE_DEFAULT_HOME_POSTFIX}" CACHE STRING "The default KDE home directory" )
+configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
 
 set ( kiosktool_SRCS
    component.cpp
--- trunk/extragear/sysadmin/kiosktool/kioskgui.cpp #1101642:1101643
@@ -17,6 +17,9 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02111-1307, USA.
  */
+
+#include <config.h>
+
 #include "kioskgui.h"
 
 #include <QDir>
@@ -107,7 +110,7 @@
 
 void KioskGui::slotCheckEtcSkel()
 {
-    QString etcSkel = "/etc/skel/.kde";
+    QString etcSkel = "/etc/skel/" KDE_DEFAULT_HOME;
     KioskSync skelDir;
     skelDir.addDir(etcSkel, KUrl());
     QStringList skelFiles = skelDir.listFiles();
--- trunk/extragear/sysadmin/kiosktool/kioskrun.cpp #1101642:1101643
@@ -18,6 +18,8 @@
  *   Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02111-1307, USA.
  */
 
+#include <config.h>
+
 #include "kioskrun.h"
 
 
@@ -171,8 +173,8 @@
 KioskRun::applyEnvironment(KProcess *p)
 {
    p->setEnv(QLatin1String("HOME"),  m_homeDir);
-   p->setEnv(QLatin1String("KDEHOME"),  QString(m_homeDir + "/.kde") );
-   p->setEnv(QLatin1String("KDEROOTHOME"), QString( m_homeDir + "/.kde"));
+   p->setEnv(QLatin1String("KDEHOME"),  QString(m_homeDir + "/" KDE_DEFAULT_HOME) );
+   p->setEnv(QLatin1String("KDEROOTHOME"), QString( m_homeDir + "/" KDE_DEFAULT_HOME));
    p->setEnv(QLatin1String("KDEDIRS"),  m_kdeDirs.join(":"));
    p->setEnv(QLatin1String("XDG_DATA_HOME"),  QString( m_homeDir + "/.local/share"));
    p->setEnv(QLatin1String("XDG_DATA_DIRS"),  m_xdgDataDirs.join(":"));
@@ -258,7 +260,7 @@
    QString newSocketDir = ::KStandardDirs::locateLocal("socket", "kioskdir");
 
    SetEnv home("HOME", m_homeDir);
-   QString kdeHome = m_homeDir+"/.kde";
+   QString kdeHome = m_homeDir+"/" KDE_DEFAULT_HOME;
    SetEnv kdehome("KDEHOME", kdeHome);
    SetEnv kderoothome("KDEROOTHOME", kdeHome);
    SetEnv kdedirs("KDEDIRS", m_kdeDirs.join(":"));
@@ -285,7 +287,7 @@
    ::mkdir(QFile::encodeName(newSocketDir), 0700);
    ::symlink(QFile::encodeName(newSocketDir), QFile::encodeName(socketDir));
 
-   m_configDir = QString("%1/.kde/share/config/").arg(m_homeDir);
+   m_configDir = QString("%1/" KDE_DEFAULT_HOME "/share/config/").arg(m_homeDir);
 
    m_instance = new KComponentData("kioskrun");
    (void) m_instance->dirs(); // Create KStandardDirs obj
@@ -728,7 +730,7 @@
    char hostname[256];
    hostname[0] = 0;
    gethostname(hostname, 255);
-   QString cacheDir = QString("%1/.kde/cache-%2").arg(m_homeDir).arg(hostname);
+   QString cacheDir = QString("%1/" KDE_DEFAULT_HOME "/cache-%2").arg(m_homeDir).arg(hostname);
 
    deleteDir(cacheDir);
    KStandardDirs::makeDir(cacheDir);
[prev in list] [next in list] [prev in thread] [next in thread]