Bug 383639 - Show [Cancel] option for connecting and reconnecting messages. ChatZilla only. r=gijs

extensions/irc/xul/content/handlers.js

@@ -1846,8 +1846,11 @@ function my_sconnect (e)
     if ("_firstNick" in this)
         delete this._firstNick;
 
+    client.munger.getRule(".inline-buttons").enabled = true;
     this.display(getMsg(MSG_CONNECTION_ATTEMPT,
-                        [this.getURL(), e.server.getURL()]), "INFO");
+                        [this.getURL(), e.server.getURL(), this.unicodeName,
+                         "cancel"]), "INFO");
+    client.munger.getRule(".inline-buttons").enabled = false;
 
     if (this.prefs["identd.enabled"])
     {
@@ -1991,7 +1994,9 @@ function my_netdisconnect (e)
     if (e.quitting)
     {
         msgType = "DISCONNECT";
-        msg = getMsg(MSG_CONNECTION_QUIT, [this.getURL(), e.server.getURL()]);
+        msg = getMsg(MSG_CONNECTION_QUIT,
+                     [this.getURL(), e.server.getURL(), this.unicodeName,
+                      "reconnect"]);
         msgNetwork = msg;
     }
     // We won't reconnect if the error was really bad.
@@ -2005,19 +2010,23 @@ function my_netdisconnect (e)
         var delayStr = formatDateOffset(this.getReconnectDelayMs() / 1000);
         if (this.MAX_CONNECT_ATTEMPTS == -1)
         {
-            msgNetwork = getMsg(MSG_RECONNECTING_IN, [msg, delayStr]);
+            msgNetwork = getMsg(MSG_RECONNECTING_IN,
+                                [msg, delayStr, this.unicodeName, "cancel"]);
         }
         else if (this.connectAttempt < this.MAX_CONNECT_ATTEMPTS)
         {
             var left = this.MAX_CONNECT_ATTEMPTS - this.connectAttempt;
             if (left == 1)
             {
-                msgNetwork = getMsg(MSG_RECONNECTING_IN_LEFT1, [msg, delayStr]);
+                msgNetwork = getMsg(MSG_RECONNECTING_IN_LEFT1,
+                                    [msg, delayStr, this.unicodeName,
+                                     "cancel"]);
             }
             else
             {
                 msgNetwork = getMsg(MSG_RECONNECTING_IN_LEFT,
-                                    [msg, left, delayStr]);
+                                    [msg, left, delayStr, this.unicodeName,
+                                     "cancel"]);
             }
         }
         else

extensions/irc/xul/locale/en-US/chatzilla.properties

@@ -1181,7 +1181,7 @@ msg.list.end       = Displayed %S of %S channels.
 msg.who.end        = End of WHO results for ``%S'', %S user(s) found.
 msg.who.match      = User %S, (%S@%S) ``%S'' (%S), member of %S, is connected to <irc://%S/>, %S hop(s).
 
-msg.connection.attempt = Connecting to %S (%S)...
+msg.connection.attempt = Connecting to %S (%S)... [[Cancel][Cancel connecting to %S][%S]]
 msg.connection.refused = Connection to %S (%S) refused. [[Help][Get more information about this error online][faq connection.refused]]
 msg.connection.abort.offline = The connection to %S (%S) was aborted because you went into offline mode.
 msg.connection.abort.unknown = The connection to %S (%S) was aborted with error %S.
@@ -1189,17 +1189,17 @@ msg.connection.timeout = Connection to %S (%S) timed out. [[Help][Get more infor
 msg.unknown.host       = Unknown host ``%S'' connecting to %S (%S). [[Help][Get more information about this error online][faq connection.unknown.host]]
 msg.connection.closed  = Connection to %S (%S) closed. [[Help][Get more information about this error online][faq connection.closed]]
 msg.connection.reset   = Connection to %S (%S) reset. [[Help][Get more information about this error online][faq connection.reset]]
-msg.connection.quit    = Disconnected from %S (%S).
+msg.connection.quit    = Disconnected from %S (%S). [[Reconnect][Reconnect to %S][%S]]
 msg.close.status       = Connection to %S (%S) closed with status %S.
 
 msg.proxy.connection.refused = The proxy server you configured is refusing the connection.
 msg.unknown.proxy.host       = Unknown proxy host connecting to %S (%S).
 
-# In these messages, %1$S is a connection error from above.
-msg.connection.exhausted   = "%1$S Connection attempts exhausted, giving up.
-msg.reconnecting.in        = "%1$S Reconnecting in %2$S.
-msg.reconnecting.in.left   = "%1$S %2$S attempts left, reconnecting in %3$S.
-msg.reconnecting.in.left1  = "%1$S 1 attempt left, reconnecting in %2$S.
+# In these messages, the first replacement string is a connection error from above.
+msg.connection.exhausted   = "%S Connection attempts exhausted, giving up.
+msg.reconnecting.in        = "%S Reconnecting in %S. [[Cancel][Cancel reconnecting to %S][%S]]
+msg.reconnecting.in.left   = "%S %S attempts left, reconnecting in %S. [[Cancel][Cancel reconnecting to %S][%S]]
+msg.reconnecting.in.left1  = "%S 1 attempt left, reconnecting in %S. [[Cancel][Cancel reconnecting to %S][%S]]
 
 msg.reconnecting           = Reconnecting...
 msg.confirm.disconnect.all = Are you sure you want to disconnect from ALL networks?