summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-09 03:38:49 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-09 03:38:49 +0000
commit579cae43096d461bfcd5709aa2d5f37963096952 (patch)
tree3d6e91c691d99d2e782bc21e98004a65daa177b0
parent052bf23d0cd83b36e227b760f9202c27e863ab26 (diff)
downloadtdebase-579cae43.tar.gz
tdebase-579cae43.zip
* Removed irritating text from O2 Enterprise theme
* Laid framework for session wide KDE file dialogs in GTK apps git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1173253 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kdm/kfrontend/themes/o2_enterprise/Dialog.pngbin8502 -> 6474 bytes
-rw-r--r--startkde21
2 files changed, 20 insertions, 1 deletions
diff --git a/kdm/kfrontend/themes/o2_enterprise/Dialog.png b/kdm/kfrontend/themes/o2_enterprise/Dialog.png
index f0d2bdd35..2c7cc2db1 100644
--- a/kdm/kfrontend/themes/o2_enterprise/Dialog.png
+++ b/kdm/kfrontend/themes/o2_enterprise/Dialog.png
Binary files differ
diff --git a/startkde b/startkde
index 37aa5cf18..5e65e87ac 100644
--- a/startkde
+++ b/startkde
@@ -60,7 +60,12 @@ fi
# The user's personal KDE directory is usually ~/.kde3, but this setting
# may be overridden by setting KDEHOME.
-export KDEHOME=$HOME/.kde3 && export PATH=/opt/kde3/bin:/opt/kde3/games:$PATH && export KDEDIRS=$KDEDIRS:/opt/kde3/:/usr/ && export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde3/share/:/usr/share/ && export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/kde3/etc/xdg/:/etc/xdg/ && export MANPATH=/opt/kde3/share/man:$MANPATH && export DESKTOP_SESSION=kde3
+export KDEHOME=$HOME/.kde3 && export PATH=/opt/kde3/bin:/opt/kde3/games:$PATH && export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde3/share/:/usr/share/ && export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/opt/kde3/etc/xdg/:/etc/xdg/ && export MANPATH=/opt/kde3/share/man:$MANPATH && export DESKTOP_SESSION=kde3
+if [ -n "$KDEDIRS" ]; then
+ export KDEDIRS=$KDEDIRS:/opt/kde3/:/usr/
+else
+ export KDEDIRS=/opt/kde3/:/usr/
+fi
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
# see kstartupconfig source for usage
@@ -246,6 +251,7 @@ if test -r "$kde_fontpaths" ; then
IFS=$savifs
fi
+echo "KDEDIRS: $KDEDIRS"
if test -n "$KDEDIRS"; then
kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
sys_odir=$kdedirs_first/share/fonts/override
@@ -255,6 +261,19 @@ else
sys_fdir=$KDEDIR/share/fonts
fi
+if test -n "$KDEDIRS"; then
+ kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
+ echo "kdedirs_first: $kdedirs_first"
+ echo "Reading from $kdedirs_first/share/kgtk/preload"
+ read -r KGTK_PRELOAD < $kdedirs_first/share/kgtk/preload
+else
+ read -r KGTK_PRELOAD < $KDEDIR/share/kgtk/preload
+fi
+
+if [ -n $KGTK_PRELOAD ]; then
+ export LD_PRELOAD=$KGTK_PRELOAD:$LD_PRELOAD
+fi
+
# We run mkfontdir on the user's font dirs (if we have permission) to pick
# up any new fonts they may have installed. If mkfontdir fails, we still
# add the user's dirs to the font path, as they might simply have been made