Commit f2aee156 authored by Kathleen Brade's avatar Kathleen Brade
Browse files

fixup! Bug 11199: Improve behavior if tor exits.

Remove leftover strings and code for restarting the browser.
parent 7a971cbb
### 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.
......
### 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.
......
### 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.
......
### 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.
......
### 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.
......
### 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.
......
### 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.
......
### 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
......
### 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
......
### 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
......
### 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.
......
### 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.
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment