[tor-launcher/master] fixup! Bug 11199: Improve behavior if tor exits. - tor-commits

12 Nov 2015

commit f2aee156c2ca846b0220109051e22cab96ad6404
Author: Kathy Brade brade@pearlcrescent.com
Date:   Thu Nov 12 10:33:55 2015 -0500
fixup! Bug 11199: Improve behavior if tor exits.
Remove leftover strings and code for restarting the browser.
---
 src/chrome/locale/af-ZA/torlauncher.properties        |    3 +--
 src/chrome/locale/bg-BG/torlauncher.properties        |    3 +--
 src/chrome/locale/bn-BD/torlauncher.properties        |    3 +--
 src/chrome/locale/ca-ES/torlauncher.properties        |    3 +--
 src/chrome/locale/cs-CZ/torlauncher.properties        |    3 +--
 src/chrome/locale/el-GR/torlauncher.properties        |    3 +--
 src/chrome/locale/es-NI/torlauncher.properties        |    3 +--
 src/chrome/locale/ms/torlauncher.properties           |    3 +--
 src/chrome/locale/pl-PL/torlauncher.properties        |    3 +--
 src/chrome/locale/sv-SE/torlauncher.properties        |    3 +--
 src/chrome/locale/zh-CN.GB2312/torlauncher.properties |    3 +--
 src/chrome/locale/zh/torlauncher.properties           |    3 +--
 src/components/tl-process.js                          |    6 ------
 13 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/src/chrome/locale/af-ZA/torlauncher.properties b/src/chrome/locale/af-ZA/torlauncher.properties
index a2550db..12a2dc9 100644
--- a/src/chrome/locale/af-ZA/torlauncher.properties
+++ b/src/chrome/locale/af-ZA/torlauncher.properties
@@ -1,10 +1,9 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2015, The Tor Project, Inc.
 ### See LICENSE for licensing information.
torlauncher.error_title=Tor Launcher
torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/bg-BG/torlauncher.properties b/src/chrome/locale/bg-BG/torlauncher.properties
index a2550db..12a2dc9 100644
--- a/src/chrome/locale/bg-BG/torlauncher.properties
+++ b/src/chrome/locale/bg-BG/torlauncher.properties
@@ -1,10 +1,9 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2015, The Tor Project, Inc.
 ### See LICENSE for licensing information.
torlauncher.error_title=Tor Launcher
torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/bn-BD/torlauncher.properties b/src/chrome/locale/bn-BD/torlauncher.properties
index a2550db..12a2dc9 100644
--- a/src/chrome/locale/bn-BD/torlauncher.properties
+++ b/src/chrome/locale/bn-BD/torlauncher.properties
@@ -1,10 +1,9 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2015, The Tor Project, Inc.
 ### See LICENSE for licensing information.
torlauncher.error_title=Tor Launcher
torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ca-ES/torlauncher.properties b/src/chrome/locale/ca-ES/torlauncher.properties
index d82d688..38a81f0 100644
--- a/src/chrome/locale/ca-ES/torlauncher.properties
+++ b/src/chrome/locale/ca-ES/torlauncher.properties
@@ -1,10 +1,9 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2015, The Tor Project, Inc.
 ### See LICENSE for licensing information.
# torlauncher.error_title=Tor Launcher
# torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 # torlauncher.tor_failed_to_start=Tor failed to start.
 # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
diff --git a/src/chrome/locale/cs-CZ/torlauncher.properties b/src/chrome/locale/cs-CZ/torlauncher.properties
index a2550db..12a2dc9 100644
--- a/src/chrome/locale/cs-CZ/torlauncher.properties
+++ b/src/chrome/locale/cs-CZ/torlauncher.properties
@@ -1,10 +1,9 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2015, The Tor Project, Inc.
 ### See LICENSE for licensing information.
torlauncher.error_title=Tor Launcher
torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/el-GR/torlauncher.properties b/src/chrome/locale/el-GR/torlauncher.properties
index a2550db..12a2dc9 100644
--- a/src/chrome/locale/el-GR/torlauncher.properties
+++ b/src/chrome/locale/el-GR/torlauncher.properties
@@ -1,10 +1,9 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2015, The Tor Project, Inc.
 ### See LICENSE for licensing information.
torlauncher.error_title=Tor Launcher
torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/es-NI/torlauncher.properties b/src/chrome/locale/es-NI/torlauncher.properties
index d04cac5..d1baf09 100644
--- a/src/chrome/locale/es-NI/torlauncher.properties
+++ b/src/chrome/locale/es-NI/torlauncher.properties
@@ -1,10 +1,9 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2015, The Tor Project, Inc.
 ### See LICENSE for licensing information.
torlauncher.error_title=Tor Launcher
torlauncher.tor_exited=Tor unexpectedly exited.
-torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor failed to start.
 torlauncher.tor_control_failed=Failed to take control of Tor.
diff --git a/src/chrome/locale/ms/torlauncher.properties b/src/chrome/locale/ms/torlauncher.properties
index fcd4d83..b12a0e3 100644
--- a/src/chrome/locale/ms/torlauncher.properties
+++ b/src/chrome/locale/ms/torlauncher.properties
@@ -1,10 +1,9 @@
-### Copyright (c) 2013, The Tor Project, Inc.
+### Copyright (c) 2015, The Tor Project, Inc.
 ### See LICENSE for licensing information.
# torlauncher.error_title=Tor Launcher
# torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 # torlauncher.tor_failed_to_start=Tor failed to start.
 # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S
diff --git a/src/chrome/locale/pl-PL/torlauncher.properties b/src/chrome/locale/pl-PL/torlauncher.properties
index 54c1f90..032bb5f 100644
--- a/src/chrome/locale/pl-PL/torlauncher.properties
+++ b/src/chrome/locale/pl-PL/torlauncher.properties
@@ -1,10 +1,9 @@
-### Copyright (c) 2013, The Tor Project, Inc.
+### Copyright (c) 2015, The Tor Project, Inc.
 ### See LICENSE for licensing information.
# torlauncher.error_title=Tor Launcher
# torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 # torlauncher.tor_failed_to_start=Tor failed to start.
 # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S
diff --git a/src/chrome/locale/sv-SE/torlauncher.properties b/src/chrome/locale/sv-SE/torlauncher.properties
index fcd4d83..b12a0e3 100644
--- a/src/chrome/locale/sv-SE/torlauncher.properties
+++ b/src/chrome/locale/sv-SE/torlauncher.properties
@@ -1,10 +1,9 @@
-### Copyright (c) 2013, The Tor Project, Inc.
+### Copyright (c) 2015, The Tor Project, Inc.
 ### See LICENSE for licensing information.
# torlauncher.error_title=Tor Launcher
# torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 # torlauncher.tor_failed_to_start=Tor failed to start.
 # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S
diff --git a/src/chrome/locale/zh-CN.GB2312/torlauncher.properties b/src/chrome/locale/zh-CN.GB2312/torlauncher.properties
index d82d688..38a81f0 100644
--- a/src/chrome/locale/zh-CN.GB2312/torlauncher.properties
+++ b/src/chrome/locale/zh-CN.GB2312/torlauncher.properties
@@ -1,10 +1,9 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2015, The Tor Project, Inc.
 ### See LICENSE for licensing information.
# torlauncher.error_title=Tor Launcher
# torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 # torlauncher.tor_failed_to_start=Tor failed to start.
 # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
diff --git a/src/chrome/locale/zh/torlauncher.properties b/src/chrome/locale/zh/torlauncher.properties
index d82d688..38a81f0 100644
--- a/src/chrome/locale/zh/torlauncher.properties
+++ b/src/chrome/locale/zh/torlauncher.properties
@@ -1,10 +1,9 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2015, The Tor Project, Inc.
 ### See LICENSE for licensing information.
# torlauncher.error_title=Tor Launcher
# torlauncher.tor_exited=Tor unexpectedly exited.
-# torlauncher.please_restart_app=Please restart this application.
 # torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 # torlauncher.tor_failed_to_start=Tor failed to start.
 # torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index 5113203..bb327dc 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -217,10 +217,7 @@ TorProcessService.prototype =
     else if (kOpenNetworkSettingsTopic == aTopic)
       this._openNetworkSettings(false);
     else if (kUserQuitTopic == aTopic)
-    {
       this.mQuitSoon = true;
-      this.mRestartWithQuit = ("restart" == aParam);
-    }
   },
canUnload: function(aCompMgr) { return true; },
@@ -294,7 +291,6 @@ TorProcessService.prototype =
   mControlConnTimer: null,
   mControlConnDelayMS: 0,
   mQuitSoon: false,     // Quit was requested by the user; do so soon.
-  mRestartWithQuit: false,
   mLastTorWarningPhase: null,
   mLastTorWarningReason: null,
@@ -489,8 +485,6 @@ TorProcessService.prototype =
       var asSvc = Cc["@mozilla.org/toolkit/app-startup;1"]
                     .getService(Ci.nsIAppStartup);
       var flags = asSvc.eAttemptQuit;
-      if (this.mRestartWithQuit)
-        flags |= asSvc.eRestart;
       asSvc.quit(flags);
     }
     catch (e)

    