[tor-commits] [vidalia-plugins/master] Make tbb.js respect the new path criteria

[chiiph at torproject.org]

commit 543e96e4af7e8c77f10790232bf5d5913ec8254f
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Thu May 17 23:06:04 2012 -0300

    Make tbb.js respect the new path criteria
---
 tbb/tbb.js |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/tbb/tbb.js b/tbb/tbb.js
index 8955d9d..c034fdb 100644
--- a/tbb/tbb.js
+++ b/tbb/tbb.js
@@ -42,7 +42,11 @@ var tbb = {
         // Load the GUI file
         this.tab = new VidaliaTab("Browser Bundle Settings", "TBB");
 
-        var file = new QFile(pluginPath+"/tbb/tbb.ui");
+        var uiPath = pluginPath+"/tbb/tbb.ui";
+        if((new QDir(uiPath)).isRelative())
+            uiPath = QCoreApplication.applicationDirPath()+"/"+uiPath;
+
+        var file = new QFile(uiPath);
         var loader = new QUiLoader(this.tab);
         file.open(QIODevice.ReadOnly);
         this.widget = loader.load(file);
@@ -205,7 +209,7 @@ var tbb = {
         vdebug("TBB at launchBrowserFromDirectory");
         /** Directory for the browser */
         var browserDirectory = this.tab.getSetting(this.BrowserDirectory, "");
-        if(QDir(browserDirectory).isRelative())
+        if(new QDir(browserDirectory).isRelative())
             browserDirectory = QDir.toNativeSeparators(QCoreApplication.applicationDirPath()
                                                        + "/" + browserDirectory);
 
@@ -223,7 +227,7 @@ var tbb = {
         /** Relative path to the default plugins directory from the browserDirectory */
         var defaultPluginsDirectory = QDir.toNativeSeparators(this.tab.getSetting(this.DefaultPluginsDirectory, ""));
 
-        var profileDir = browserDirectory + "/" + profileDirectory;
+        var profileDir = (new QDir(browserDirectory + "/" + profileDirectory)).canonicalPath();
 
         this.browserProcess.setEnvironment(this.updateBrowserEnv());
 
@@ -232,22 +236,22 @@ var tbb = {
         /* Copy the profile directory if it's not already there */
         if (!browserDirObj.exists(profileDirectory)) {
             browserDirObj.mkdir(profileDirectory);
-            this.copy_dir(browserDirectory + "/" + defaultProfileDirectory,
-                     browserDirectory + "/" + profileDirectory);
+            this.copy_dir((new QDir(browserDirectory + "/" + defaultProfileDirectory)).canonicalPath(),
+                          (new QDir(browserDirectory + "/" + profileDirectory)).canonicalPath());
         }
 
         /* Copy the plugins directory if it's not already there */
         if (!browserDirObj.exists(pluginsDirectory)) {
             browserDirObj.mkdir(pluginsDirectory);
-            this.copy_dir(browserDirectory + "/" + defaultPluginsDirectory,
-                          browserDirectory + "/" + pluginsDirectory);
+            this.copy_dir((new QDir(browserDirectory + "/" + defaultPluginsDirectory)).canonicalPath(),
+                          (new QDir(browserDirectory + "/" + pluginsDirectory)).canonicalPath());
         }
 
         /* Build the command line arguments */
         /* Is this better or worse than MOZ_NO_REMOTE? */
         var commandLine = "-no-remote ";
-        commandLine += "-profile ";
-        commandLine += profileDir;
+        commandLine += "-profile";
+        commandLine += "\"" + profileDir + "\"";
 
         /* Launch the browser */
         this.browserProcess.start(browserExecutable, commandLine);
@@ -268,10 +272,6 @@ var tbb = {
             QCoreApplication.processEvents();
         }
 
-        if(!torControl.isRunning() ||
-           !torControl.isConnected())
-            return;
-
         var proxyExecutable = this.tab.getSetting(this.ProxyExecutable, "");
         var runAtStart = this.tab.getSetting(this.RunProxyAtStart, "");
         var proxyExecutableArguments = this.tab.getSetting(this.ProxyExecutableArguments, "");
@@ -362,7 +362,11 @@ var tbb = {
     },
 
     showCloseDialog: function() {
-        var file = new QFile(pluginPath+"/tbb/reopen.ui");
+        var uiPath = pluginPath+"/tbb/reopen.ui";
+        if((new QDir(uiPath)).isRelative())
+            uiPath = QCoreApplication.applicationDirPath()+"/"+uiPath;
+
+        var file = new QFile(uiPath);
         var loader = new QUiLoader();
         file.open(QIODevice.ReadOnly);
         var dialog = loader.load(file);