GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

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

Make error alerts children of network settings dialog (if it is open).

parent 0247c38d
......@@ -14,6 +14,7 @@
<dialog id="TorNetworkSettings"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&torsettings.dialog.title;"
windowtype="TorLauncher:NetworkSettings"
persist="screenX screenY"
buttons="accept,cancel,extra1"
buttonlabelextra1="&torsettings.copyLog;"
......
......@@ -36,7 +36,9 @@ let TorLauncherUtil = // Public
{
var wm = Cc["@mozilla.org/appshell/window-mediator;1"]
.getService(Ci.nsIWindowMediator);
aParentWindow = wm.getMostRecentWindow("navigator:browser");
aParentWindow = wm.getMostRecentWindow("TorLauncher:NetworkSettings");
if (!aParentWindow)
aParentWindow = wm.getMostRecentWindow("navigator:browser");
}
var ps = Cc["@mozilla.org/embedcomp/prompt-service;1"]
......
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