[tor-commits] [torbrowser/master] Make TBB work on KDE 4

[erinn at torproject.org]

commit ff3308f592e6656658dbb6b52f7be7bac2a6db94
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Thu Feb 23 05:44:33 2012 +0100

    Make TBB work on KDE 4
    
    On KDE 4 desktops, Qt apps try to load the KDE 4 style called Oxygen.
    This causes a few other Qt shared libs to be loaded, and we don't ship
    them all, which causes a crash. Tomásfound this cool solution, which
    means we don't have to ship more libraries than we do now. Basically we
    tell Vidalia to bypass auto-detecting a style and just pre-pick a sane
    one. If the user manually overrides this, Vidalia will still crash, but
    this should work for the vast majority of users for now.
    
    Works around bug 5214.
---
 src/RelativeLink/RelativeLink.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh
index 14f6423..692885c 100755
--- a/src/RelativeLink/RelativeLink.sh
+++ b/src/RelativeLink/RelativeLink.sh
@@ -193,7 +193,7 @@ if [ "${debug}" ]; then
 	# XXX Someday we should pass whatever command-line arguments we got
 	# (probably filenames or URLs) to Firefox.
 	./App/vidalia --loglevel debug --logfile vidalia-debug-log \
-	--datadir Data/Vidalia/
+	--datadir Data/Vidalia/ -style Cleanlooks
 	printf "\nVidalia exited with the following return code: $?\n"
 fi
 
@@ -202,7 +202,7 @@ printf "\nLaunching Tor Browser Bundle for Linux in ${HOME}\n"
 cd "${HOME}"
 # XXX Someday we should pass whatever command-line arguments we got
 # (probably filenames or URLs) to Firefox.
-./App/vidalia --datadir Data/Vidalia/
+./App/vidalia --datadir Data/Vidalia/ -style Cleanlooks
 exitcode="$?"
 if [ "$exitcode" -ne 0 ]; then
 	complain "Vidalia exited abnormally.  Exit code: $exitcode"