From 0014114cd273fb4485196bd02a58aac5adad3d67 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 18 Sep 2010 21:49:14 +0000
Subject: Bugfixes

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1176854 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 startkde | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'startkde')

diff --git a/startkde b/startkde
index dd7cff485..a05084c92 100644
--- a/startkde
+++ b/startkde
@@ -163,8 +163,8 @@ fi
 test -n "$KDEHOME" && kdehome=`echo "$KDEHOME" | sed "s,^~/,$HOME/,"`
 echo "[startkde] kdehome: $kdehome" 1>&2
 
-# Is this a GNOME/GDM variable? Probably does not cause any harm in
-# any system not looking for the variable.
+# Allow interested applications, such as the Plasma control wrapper,
+# to know that this is a Trinity desktop and not a KDE one.
 export DESKTOP_SESSION=kde3
 
 # Please see kstartupconfig source for usage.
@@ -381,8 +381,13 @@ if test -r "$kde_fontpaths" ; then
     IFS=$savifs
 fi
 
+if [ -n "$KDEDIR" ]; then
+  export KDEDIR=`echo "$KDEDIRS" | sed -e 's/:.*//'`
+fi
+
 echo "[startkde] KDEDIR: $KDEDIR" 1>&2
 echo "[startkde] KDEDIRS: $KDEDIRS" 1>&2
+
 if test -n "$KDEDIRS"; then
   kdedirs_first=`echo "$KDEDIRS" | sed -e 's/:.*//'`
   sys_odir=$kdedirs_first/share/fonts/override
-- 
cgit v1.2.3