Bug 842183 - Land in comm-central Instantbird's changes to chat/ - 5 - Bio 1846 - follow-up to fix reconnection timers, r=fqueze.

chat/components/src/imAccounts.js

@@ -249,6 +249,7 @@ imAccount.prototype = {
     else if (aTopic == "account-disconnected") {
       this.connectionState = Ci.imIAccount.STATE_DISCONNECTED;
       if (this._statusObserver &&
+          this.prplAccount.connectionErrorReason == Ci.prplIAccount.NO_ERROR &&
           this.statusInfo.statusType > Ci.imIStatusInfo.STATUS_OFFLINE) {
         // If the status changed back to online while an account was still
         // disconnecting, it was not reconnected automatically at that point,
@@ -628,7 +629,8 @@ imAccount.prototype = {
             this._cancelReconnection();
           }
           else if (statusType > Ci.imIStatusInfo.STATUS_OFFLINE &&
-                   this.disconnected)
+                   this.disconnected &&
+                   this.connectionErrorReason == Ci.prplIAccount.NO_ERROR)
             this.prplAccount.connect();
           else if (this.connected)
             this.prplAccount.observe(aSubject, aTopic, aData);