From 89f957706bbda77e5f34e64e117e7ce121bb5d83 Mon Sep 17 00:00:00 2001
From: Ascrod <32915892+Ascrod@users.noreply.github.com>
Date: Sun, 7 Oct 2018 14:05:14 -0400
Subject: [PATCH] Bug 1712501 - Remove unneeded workaround for bug 318419 in
 chatZilla. r=frg

---
 .../locales/en-US/chrome/chatzilla.properties |  4 ---
 suite/chatzilla/xul/content/handlers.js       | 25 -------------------
 2 files changed, 29 deletions(-)

diff --git a/suite/chatzilla/locales/en-US/chrome/chatzilla.properties b/suite/chatzilla/locales/en-US/chrome/chatzilla.properties
index 1601ec8e24..78e6c8a1e7 100644
--- a/suite/chatzilla/locales/en-US/chrome/chatzilla.properties
+++ b/suite/chatzilla/locales/en-US/chrome/chatzilla.properties
@@ -782,10 +782,6 @@ msg.err.no.idleservice = ChatZilla can't determine when you're away in your vers
 
 msg.warn.pac.loading = The automatic proxy configuration file has not loaded yet; ChatZilla will retry shortly.
 
-# Specific bug messages.
-msg.bug318419.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 318419 <https://bugzilla.mozilla.org/show_bug.cgi?id=318419>. You are strongly advised to restart the host application (&brandShortName;) to prevent further problems.
-msg.bug318419.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 318419 <https://bugzilla.mozilla.org/show_bug.cgi?id=318419>. You MUST restart the host application (&brandShortName;) to fix this.
-
 # Ask for oper pass if not explicitly given in the command:
 msg.need.oper.password = Please enter a password for obtaining IRC Operator privileges.
 
diff --git a/suite/chatzilla/xul/content/handlers.js b/suite/chatzilla/xul/content/handlers.js
index 4187541e2c..e9f8d2fe67 100644
--- a/suite/chatzilla/xul/content/handlers.js
+++ b/suite/chatzilla/xul/content/handlers.js
@@ -734,35 +734,10 @@ function onInputCompleteLine(e)
 
 function onNotifyTimeout()
 {
-    /* Workaround: bug 318419 - 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)
     {
         var net = client.networks[n];
         if (net.isConnected()) {
-            // WORKAROUND BEGIN //
-            if (!("bug318419" in client) &&
-                (net.primServ.sendQueue.length >= 1000))
-            {
-                client.bug318419 = 10;
-                display(MSG_BUG318419_WARNING, MT_WARN);
-                window.getAttention();
-                return;
-            }
-            else if (("bug318419" in client) && (client.bug318419 > 0) &&
-                     (net.primServ.sendQueue.length >= (1000 * client.bug318419)))
-            {
-                client.bug318419++;
-                display(MSG_BUG318419_ERROR, MT_ERROR);
-                window.getAttention();
-                return;
-            }
-            // WORKAROUND END //
             if (net.prefs["notifyList"].length > 0) {
                 var isonList = client.networks[n].prefs["notifyList"];
                 net.primServ.sendData ("ISON " + isonList.join(" ") + "\n");