diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-09 19:47:51 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-09 19:47:51 +0000 |
| commit | 69ab0067fafb44e1f498d32f77d584987ceff8e4 (patch) | |
| tree | 56a04a4c8c09f00d0a1bdbd26c1027e58d34132b | |
| parent | 7eebe01bbb58ef83485e9fdc928fa53be59197c5 (diff) | |
| download | tdebase-69ab0067fafb44e1f498d32f77d584987ceff8e4.tar.gz tdebase-69ab0067fafb44e1f498d32f77d584987ceff8e4.zip | |
* KGTK fixups
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1173594 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | startkde | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -188,10 +188,12 @@ fi if test -n "$KDEDIRS"; then kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` KGTK_RC_ENGINE=$kdedirs_first/share/kgtk/gtk-qt-engine.rc.sh - KGTK_RC_KDE=$kdedirs_first/share/kgtk/.gtkrc-2.0-kde + KGTK_RC_KDE1=$kdedirs_first/share/kgtk/.gtkrc-2.0-kde4 + KGTK_RC_KDE2=$kdedirs_first/share/kgtk/.gtkrc-2.0-kde-kde4 else KGTK_RC_ENGINE=$KDEDIR/share/kgtk/gtk-qt-engine.rc.sh - KGTK_RC_KDE=$KDEDIR/share/kgtk/.gtkrc-2.0-kde + KGTK_RC_KDE1=$KDEDIR/share/kgtk/.gtkrc-2.0-kde4 + KGTK_RC_KDE2=$KDEDIR/share/kgtk/.gtkrc-2.0-kde-kde4 fi if [ ! -e $kdehome/env/gtk-qt-engine.rc.sh ] && [ -e $KGTK_RC_ENGINE ] @@ -201,9 +203,14 @@ then chmod 755 $kdehome/env/gtk-qt-engine.rc.sh fi -if [ ! -e $HOME/.gtkrc-2.0-kde ] && [ -e $KGTK_RC_KDE ] +if [ ! -e $HOME/.gtkrc-2.0-kde4 ] && [ -e $KGTK_RC_KDE1 ] then - cp -f $KGTK_RC_KDE $HOME + cp -f $KGTK_RC_KDE1 $HOME +fi + +if [ ! -e $HOME/.gtkrc-2.0-kde-kde4 ] && [ -e $KGTK_RC_KDE2 ] +then + cp -f $KGTK_RC_KDE2 $HOME fi # Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh |