зеркало из https://github.com/mozilla/gecko-dev.git
wrap prefs with try and catch. turn back on ComposeLoad() call.
This commit is contained in:
Родитель
56eefb0d35
Коммит
5297ce6223
|
@ -29,9 +29,19 @@ var prefs = Components.classes["component://netscape/preferences"].getService();
|
||||||
if (prefs) {
|
if (prefs) {
|
||||||
prefs = prefs.QueryInterface(Components.interfaces.nsIPref);
|
prefs = prefs.QueryInterface(Components.interfaces.nsIPref);
|
||||||
if (prefs) {
|
if (prefs) {
|
||||||
|
try {
|
||||||
update_compose_title_as_you_type = prefs.GetBoolPref("mail.update_compose_title_as_you_type");
|
update_compose_title_as_you_type = prefs.GetBoolPref("mail.update_compose_title_as_you_type");
|
||||||
|
}
|
||||||
|
catch (ex) {
|
||||||
|
dump("failed to get the mail.update_compose_title_as_you_type pref\n");
|
||||||
|
}
|
||||||
|
try {
|
||||||
other_header = prefs.CopyCharPref("mail.compose.other.header");
|
other_header = prefs.CopyCharPref("mail.compose.other.header");
|
||||||
}
|
}
|
||||||
|
catch (ex) {
|
||||||
|
dump("failed to get the mail.compose.other.header pref\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function GetArgs()
|
function GetArgs()
|
||||||
|
|
|
@ -30,12 +30,10 @@ Rights Reserved.
|
||||||
|
|
||||||
<!DOCTYPE window SYSTEM "chrome://messengercompose/locale/messengercompose.dtd">
|
<!DOCTYPE window SYSTEM "chrome://messengercompose/locale/messengercompose.dtd">
|
||||||
|
|
||||||
<!-- removed, function must exist to use here
|
|
||||||
onload="ComposeLoad()"
|
|
||||||
-->
|
|
||||||
<window xmlns:html="http://www.w3.org/TR/REC-html40"
|
<window xmlns:html="http://www.w3.org/TR/REC-html40"
|
||||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||||
onunload="ComposeUnload()"
|
onunload="ComposeUnload()"
|
||||||
|
onload="ComposeLoad()"
|
||||||
width="640" height="480"
|
width="640" height="480"
|
||||||
title="&msgComposeWindow.title;"
|
title="&msgComposeWindow.title;"
|
||||||
align="vertical">
|
align="vertical">
|
||||||
|
|
Загрузка…
Ссылка в новой задаче