fix subscribe ui to select the server of the selected folder, patch originally by jcranmer, tweaked by me, r=me, jcranmer 455947
fix subscribe ui to select the server of the selected folder, patch originally by jcranmer, tweaked by me, r=me, jcranmer 455947
--- a/mail/base/content/subscribe.js
+++ b/mail/base/content/subscribe.js
@@ -244,22 +244,18 @@ function SubscribeOnLoad()
// look in arguments[0] for parameters
if (window.arguments && window.arguments[0]) {
if ( window.arguments[0].okCallback ) {
top.okCallback = window.arguments[0].okCallback;
}
}
gServerURI = null;
- if (window.arguments[0].preselectedURI) {
- var uri = window.arguments[0].preselectedURI;
- //dump("subscribe: got a uri," + uri + "\n");
- var folder = GetMsgFolderFromUri(uri, true);
- //dump("folder="+folder+"\n");
- //dump("folder.server="+folder.server+"\n");
+ let folder = window.arguments[0].folder;
+ if (folder && folder.server instanceof Components.interfaces.nsISubscribableServer) {
var serverMenu = document.getElementById("serverMenu");
serverMenu.menupopup.selectFolder(folder.server.rootMsgFolder);
try {
CleanUpSearchView();
gSubscribableServer = folder.server.QueryInterface(Components.interfaces.nsISubscribableServer);
// enable (or disable) the search related UI
EnableSearchUI();
gServerURI = folder.server.serverURI;