Bug 842183 - Land in comm-central Instantbird's changes to chat/ - 5 - Bio 1863 - whois replies displayed in conversations should have the noLog flag, r=aleth.
authorPatrick Cloke <clokep@gmail.com>
Tue, 15 Jan 2013 20:46:29 -0500
changeset 12001 98e3aaec39b76511f28f43eb0f1a285192da8e1a
parent 12000 447550434aa8296a5849817aab9bf2d1583c0327
child 12002 64239df00f64df955f38291234434ee9385bc3b4
push id8909
push userflorian@queze.net
push dateMon, 18 Feb 2013 14:55:18 +0000
treeherdercomm-central@dad38b5c0099 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaleth
bugs842183
Bug 842183 - Land in comm-central Instantbird's changes to chat/ - 5 - Bio 1863 - whois replies displayed in conversations should have the noLog flag, r=aleth.
chat/protocols/irc/irc.js
--- a/chat/protocols/irc/irc.js
+++ b/chat/protocols/irc/irc.js
@@ -942,19 +942,20 @@ ircAccount.prototype = {
         this.whoisInformation[nick][field] = aFields[field];
     }
 
     return true;
   },
   // Write WHOIS information to a conversation.
   writeWhois: function(aConv, aNick, aTooltipInfo) {
     let nick = this.normalize(aNick);
+    let type = {system: true, noLog: true};
     // RFC 2812 errors 401 and 406 result in there being no entry for the nick.
     if (!hasOwnProperty(this.whoisInformation, nick)) {
-      aConv.writeMessage(null, _("message.unknownNick", nick), {system: true});
+      aConv.writeMessage(null, _("message.unknownNick", nick), type);
       return;
     }
     // If the nick is offline, tell the user. In that case, it's WHOWAS info.
     let msgType = "message.whois";
     if ("offline" in this.whoisInformation[nick])
       msgType = "message.whowas";
     let msg = _(msgType, this.whoisInformation[nick]["nick"]);
     while (aTooltipInfo.hasMoreElements()) {
@@ -963,17 +964,17 @@ ircAccount.prototype = {
         case Ci.prplITooltipInfo.pair:
         case Ci.prplITooltipInfo.sectionHeader:
           msg += "\n" + _("message.whoisEntry", elt.label, elt.value);
           break;
         case Ci.prplITooltipInfo.sectionBreak:
           break;
       }
     }
-    aConv.writeMessage(null, msg, {system: true});
+    aConv.writeMessage(null, msg, type);
   },
 
   trackBuddy: function(aNick) {
     // Put the username as the first to be checked on the next ISON call.
     this.trackQueue.unshift(aNick);
   },
   addBuddy: function(aTag, aName) {
     let buddy = new ircAccountBuddy(this, null, aTag, aName);