Fix variables passed to kde4 applications

This resolves Bug 1366
v3.5.13-sru
Alexander Golubev 12 years ago committed by Slávek Banko
parent 5359dcf36f
commit df1b666cc5

@ -82,6 +82,8 @@ OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
OPTION( WITH_ASPELL "Enable aspell support" OFF ) OPTION( WITH_ASPELL "Enable aspell support" OFF )
OPTION( WITH_HSPELL "Enable hspell support" OFF ) OPTION( WITH_HSPELL "Enable hspell support" OFF )
set( KDE4_DEFAULT_HOME ".kde" CACHE PATH "KDE4 home directory passed as KDEHOME to kde4 applications" )
##### set PKG_CONFIG_PATH ####################### ##### set PKG_CONFIG_PATH #######################

@ -707,6 +707,9 @@
/* The compiled in system configuration prefix */ /* The compiled in system configuration prefix */
#define KDESYSCONFDIR "@CONFIG_INSTALL_DIR@" #define KDESYSCONFDIR "@CONFIG_INSTALL_DIR@"
/* The default KDE4 home directory */
#define KDE4_DEFAULT_HOME "@KDE4_DEFAULT_HOME@"
/* what C++ compiler was used for compilation */ /* what C++ compiler was used for compilation */
#define KDE_COMPILER_VERSION "@KDE_COMPILER_VERSION@" #define KDE_COMPILER_VERSION "@KDE_COMPILER_VERSION@"

@ -198,7 +198,7 @@ KService::init( KDesktopFile *config )
m_strExec = config->readPathEntry( "Exec" ); m_strExec = config->readPathEntry( "Exec" );
if (kde4application && !m_strExec.startsWith("/")) { if (kde4application && !m_strExec.startsWith("/")) {
m_strExec = "KDEHOME=$HOME/.trinity XDG_DATA_DIRS=/usr/share KDEDIRS=/usr/ XDG_CONFIG_DIRS=/etc/xdg/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:$PATH "+m_strExec; m_strExec = "KDEHOME=$HOME/" KDE4_DEFAULT_HOME " XDG_DATA_DIRS=/usr/share KDEDIRS=/usr/ XDG_CONFIG_DIRS=/etc/xdg/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:$PATH "+m_strExec;
} else if (config->readBoolEntry("X-KDE-SubstituteUID")) { } else if (config->readBoolEntry("X-KDE-SubstituteUID")) {
int space = m_strExec.find(" "); int space = m_strExec.find(" ");
if (space==-1) if (space==-1)

Loading…
Cancel
Save