[tor-commits] [torbrowser/master] Linux: Update vidalia.confs to work with the new Vidalia.

[erinn at torproject.org]

commit 0490fa4c0189105b3b4fb1d431a7d321b9ecc817
Author: Shondoit Walker <shondoit at gmail.com>
Date:   Thu Jul 26 15:18:30 2012 +0200

    Linux: Update vidalia.confs to work with the new Vidalia.
---
 .../config/alpha/vidalia.conf.ff-obfsproxy-linux   |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux
index bd09a17..cb97dc2 100644
--- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux
+++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux
@@ -1,18 +1,19 @@
 [General]
+BrowserDirectory=./Firefox
+BrowserExecutable=firefox
 InterfaceStyle=Cleanlooks
 LanguageCode=en
-PluginPath=./Data/Vidalia/plugins
+ProfileDirectory=../../Data/profile
+DefaultProfileDirectory=./defaults/profile
+PluginsDirectory=../../Data/profile/extensions
+DefaultPluginsDirectory=./extensions
 
 [Tor]
 ControlPort=9051
-TorExecutable=./App/tor
-Torrc=./Data/Tor/torrc
+TorExecutable=./tor
+Torrc=../Data/Tor/torrc
 AutoControl=true
-DataDirectory=./Data/Tor
-
-[TBB]
-BrowserDirectory=.
-BrowserExecutable=firefox
+DataDirectory=../Data/Tor
 
 [Network]
 ProxyType=none