[or-cvs] r19482: {torbrowser} Change configuration file to use alternate launcher for both (in torbrowser/branches/altlauncher/build-scripts: . config)

[sjm217@xxxxxxxx]

Author: sjm217
Date: 2009-05-08 12:15:11 -0400 (Fri, 08 May 2009)
New Revision: 19482

Removed:
   torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.altlauncher
Modified:
   torbrowser/branches/altlauncher/build-scripts/Makefile
   torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.ff
   torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.ff+pidgin
Log:
Change configuration file to use alternate launcher for both variants of TBB

Modified: torbrowser/branches/altlauncher/build-scripts/Makefile
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/Makefile	2009-05-08 14:43:25 UTC (rev 19481)
+++ torbrowser/branches/altlauncher/build-scripts/Makefile	2009-05-08 16:15:11 UTC (rev 19482)
@@ -212,7 +212,7 @@
 ifeq ($(USE_PIDGIN),1)
 	cp $(CONFIG_SRC)/vidalia.conf.ff+pidgin $(DEST)/Data/Vidalia/vidalia.conf
 else
-	cp $(CONFIG_SRC)/vidalia.conf.altlauncher $(DEST)/Data/Vidalia/vidalia.conf
+	cp $(CONFIG_SRC)/vidalia.conf.ff $(DEST)/Data/Vidalia/vidalia.conf
 endif
 	## Configure Polipo
 	cp $(CONFIG_SRC)/polipo.conf $(DEST)/Data/Polipo

Deleted: torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.altlauncher
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.altlauncher	2009-05-08 14:43:25 UTC (rev 19481)
+++ torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.altlauncher	2009-05-08 16:15:11 UTC (rev 19482)
@@ -1,12 +0,0 @@
-[General]
-BrowserDirectory=FirefoxPortable
-BrowserExecutable=tbb-firefox.exe
-LanguageCode=en
-ProxyExecutable=App\\polipo.exe
-ProxyExecutableArguments=-c, Data\\Polipo\\polipo.conf
-RunProxyAtStart=true
-
-[Tor]
-ControlPort=9051
-TorExecutable=.\\App\\tor.exe
-Torrc=.\\Data\\Tor\\torrc

Modified: torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.ff
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.ff	2009-05-08 14:43:25 UTC (rev 19481)
+++ torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.ff	2009-05-08 16:15:11 UTC (rev 19482)
@@ -1,5 +1,6 @@
 [General]
-BrowserExecutable=FirefoxPortable\\FirefoxPortable.exe
+BrowserDirectory=FirefoxPortable
+BrowserExecutable=tbb-firefox.exe
 LanguageCode=en
 ProxyExecutable=App\\polipo.exe
 ProxyExecutableArguments=-c, Data\\Polipo\\polipo.conf

Modified: torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.ff+pidgin
===================================================================
--- torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.ff+pidgin	2009-05-08 14:43:25 UTC (rev 19481)
+++ torbrowser/branches/altlauncher/build-scripts/config/vidalia.conf.ff+pidgin	2009-05-08 16:15:11 UTC (rev 19482)
@@ -1,5 +1,6 @@
 [General]
-BrowserExecutable=FirefoxPortable\\FirefoxPortable.exe
+BrowserDirectory=FirefoxPortable
+BrowserExecutable=tbb-firefox.exe
 IMExecutable=PidginPortable\\PidginPortable.exe
 LanguageCode=en
 ProxyExecutable=App\\polipo.exe