mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 06:11:37 +00:00
Fix bug 212221 XUL error pages do not play nicely with IM button in Addressbook (Thunderbird sync patch) r/sr=bienvenu
This commit is contained in:
parent
39ccfb29e9
commit
f8bb9fc1b3
@ -230,6 +230,12 @@ function delayedOnLoadAddressBook()
|
||||
|
||||
var toolbarset = document.getElementById('customToolbars');
|
||||
toolbox.toolbarset = toolbarset;
|
||||
|
||||
// Ensure we don't load xul error pages into the main window
|
||||
window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
|
||||
.getInterface(Components.interfaces.nsIWebNavigation)
|
||||
.QueryInterface(Components.interfaces.nsIDocShell)
|
||||
.useErrorPages = false;
|
||||
}
|
||||
|
||||
function OnLoadDirTree() {
|
||||
@ -876,9 +882,11 @@ function IsCardViewAndAbResultsPaneSplitterCollapsed()
|
||||
|
||||
function LaunchUrl(url)
|
||||
{
|
||||
var messenger = Components.classes["@mozilla.org/messenger;1"].createInstance(Components.interfaces.nsIMessenger);
|
||||
messenger.SetWindow(window,null);
|
||||
messenger.OpenURL(url);
|
||||
// Doesn't matter if this bit fails, window.location contains its own prompts
|
||||
try {
|
||||
window.location = url;
|
||||
}
|
||||
catch (ex) {}
|
||||
}
|
||||
|
||||
function AbIMSelected()
|
||||
|
Loading…
Reference in New Issue
Block a user