summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-28 00:09:26 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-28 00:09:26 +0000
commitba1d97533cad981404f93568f0815b7a3dec2e70 (patch)
treec66afaf9c87dd512d6f978ebfa4ac37c518ac824
parent644a960605d4a23b766076bde2bc05e731c447ae (diff)
downloadtdebase-ba1d97533cad981404f93568f0815b7a3dec2e70.tar.gz
tdebase-ba1d97533cad981404f93568f0815b7a3dec2e70.zip
Fix pidgin crash when Trinity filepicker is active on Ubuntu
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1243492 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--startkde5
1 files changed, 4 insertions, 1 deletions
diff --git a/startkde b/startkde
index 72a100b1b..8caf6168e 100644
--- a/startkde
+++ b/startkde
@@ -408,7 +408,10 @@ else
fi
if [ -n $KGTK_PRELOAD ]; then
- export LD_PRELOAD=$KGTK_PRELOAD:$LD_PRELOAD
+ if [ -e /usr/lib/libnspr4.so ]; then
+ KGTK_NSPR_PRELOAD="/usr/lib/libnspr4.so:"
+ fi
+ export LD_PRELOAD=$KGTK_PRELOAD:$KGTK_NSPR_PRELOAD$LD_PRELOAD
fi
# We run mkfontdir on the user's font dirs (if we have permission) to pick