From ba1d97533cad981404f93568f0815b7a3dec2e70 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 28 Jul 2011 00:09:26 +0000
Subject: 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
---
 startkde | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'startkde')

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
-- 
cgit v1.2.1