зеркало из https://github.com/mozilla/gecko-dev.git
Bug 319219 - Add warning and error messages to be shown to the user when we detect that bug 291386 has attacked us.
ChatZilla only. r=samuel
This commit is contained in:
Родитель
b5e2e01de8
Коммит
49da4874e5
|
@ -642,12 +642,37 @@ function onInputCompleteLine(e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function onNotifyTimeout ()
|
function onNotifyTimeout()
|
||||||
{
|
{
|
||||||
|
/* Workaround: bug 291386 - timers sometimes fire way too quickly.
|
||||||
|
* This catches us out, as it causes the notify code (this) and the who
|
||||||
|
* code (below) to fire continuously, which completely floods the
|
||||||
|
* sendQueue. We work around this for now by reporting the probable
|
||||||
|
* error condition here, but don't attempt to stop it.
|
||||||
|
*/
|
||||||
|
|
||||||
for (var n in client.networks)
|
for (var n in client.networks)
|
||||||
{
|
{
|
||||||
var net = client.networks[n];
|
var net = client.networks[n];
|
||||||
if (net.isConnected()) {
|
if (net.isConnected()) {
|
||||||
|
// WORKAROUND BEGIN //
|
||||||
|
if (!("bug291386" in client) &&
|
||||||
|
(net.primServ.sendQueue.length >= 1000))
|
||||||
|
{
|
||||||
|
client.bug291386 = 10;
|
||||||
|
display(MSG_BUG291386_WARNING, MT_WARN);
|
||||||
|
window.getAttention();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (("bug291386" in client) && (client.bug291386 > 0) &&
|
||||||
|
(net.primServ.sendQueue.length >= (1000 * client.bug291386)))
|
||||||
|
{
|
||||||
|
client.bug291386++;
|
||||||
|
display(MSG_BUG291386_ERROR, MT_ERROR);
|
||||||
|
window.getAttention();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// WORKAROUND END //
|
||||||
if (net.prefs["notifyList"].length > 0) {
|
if (net.prefs["notifyList"].length > 0) {
|
||||||
var isonList = client.networks[n].prefs["notifyList"];
|
var isonList = client.networks[n].prefs["notifyList"];
|
||||||
net.primServ.sendData ("ISON " + isonList.join(" ") + "\n");
|
net.primServ.sendData ("ISON " + isonList.join(" ") + "\n");
|
||||||
|
|
|
@ -43,7 +43,7 @@ const __cz_version = "0.9.67+";
|
||||||
const __cz_condition = "green";
|
const __cz_condition = "green";
|
||||||
const __cz_suffix = "";
|
const __cz_suffix = "";
|
||||||
const __cz_guid = "59c81df5-4b7a-477b-912d-4e0fdf64e5f2";
|
const __cz_guid = "59c81df5-4b7a-477b-912d-4e0fdf64e5f2";
|
||||||
const __cz_locale = "0.9.67.4";
|
const __cz_locale = "0.9.67.5";
|
||||||
|
|
||||||
var warn;
|
var warn;
|
||||||
var ASSERT;
|
var ASSERT;
|
||||||
|
|
|
@ -69,7 +69,7 @@
|
||||||
#
|
#
|
||||||
### End of notes ###
|
### End of notes ###
|
||||||
|
|
||||||
locale.version = 0.9.67.4
|
locale.version = 0.9.67.5
|
||||||
locale.error = You are using ChatZilla %1$S, which requires the locale version %2$S. The currently selected locale, %3$S, is version %4$S, and therefore there may be problems running ChatZilla.\n\nIt is strongly advised that you update or remove the ChatZilla locale in question.
|
locale.error = You are using ChatZilla %1$S, which requires the locale version %2$S. The currently selected locale, %3$S, is version %4$S, and therefore there may be problems running ChatZilla.\n\nIt is strongly advised that you update or remove the ChatZilla locale in question.
|
||||||
|
|
||||||
# Misc
|
# Misc
|
||||||
|
@ -719,6 +719,10 @@ msg.err.unsupported.command = The server does not support the ``%S'' command.
|
||||||
msg.err.invalid.mode = The mode string you entered (``%S'') is invalid. A valid mode string consists of one or more sequences of a + or - followed by one or more alphabetical characters.
|
msg.err.invalid.mode = The mode string you entered (``%S'') is invalid. A valid mode string consists of one or more sequences of a + or - followed by one or more alphabetical characters.
|
||||||
msg.err.away.save = Saving the list of away messages failed (%S).
|
msg.err.away.save = Saving the list of away messages failed (%S).
|
||||||
|
|
||||||
|
# Specific bug messages.
|
||||||
|
msg.bug291386.warning = ChatZilla has detected a potential abnormality in its internal data. You will not be able to send any form of communication at this time, although it might appear you can. The most likely cause is Mozilla Bug 291386 <https://bugzilla.mozilla.org/show_bug.cgi?id=291386>. You are strongly advised to restart the host application (&brandShortName;) to prevent further problems.
|
||||||
|
msg.bug291386.error = ChatZilla has detected a serious abnormality in its internal data. You will not be able to send any form of communication at this time, although it might appear you can. The most likely cause is Mozilla Bug 291386 <https://bugzilla.mozilla.org/show_bug.cgi?id=291386>. You MUST restart the host application (&brandShortName;) to fix this.
|
||||||
|
|
||||||
# Ask for oper pass if not explicitly given in the command:
|
# Ask for oper pass if not explicitly given in the command:
|
||||||
msg.need.oper.password = Please enter a password for obtaining IRC Operator privileges.
|
msg.need.oper.password = Please enter a password for obtaining IRC Operator privileges.
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче