Index: js/lib/command-manager.js
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/js/lib/command-manager.js,v
retrieving revision 1.15
retrieving revision 1.16
diff -d -p -u -6 -r1.15 -r1.16
--- js/lib/command-manager.js	18 Jul 2006 17:00:29 -0000	1.15
+++ js/lib/command-manager.js	26 Jan 2008 23:03:31 -0000	1.16
@@ -290,13 +290,13 @@ function cmgr_instkey (parentElem, comma
         return;
     }
 
     var key = document.createElement ("key");
     key.setAttribute ("id", "key:" + command.name);
     key.setAttribute ("oncommand", "dispatch('" + command.name +
-                      "', {isInteractive: true});");
+                      "', {isInteractive: true, source: 'keyboard'});");
 
     if (ary[1])
         key.setAttribute ("modifiers", ary[1]);
 
     if (ary[2].indexOf("VK_") == 0)
         key.setAttribute ("keycode", ary[2]);
Index: js/lib/irc.js
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/js/lib/irc.js,v
retrieving revision 1.117
retrieving revision 1.118
diff -d -p -u -6 -r1.117 -r1.118
--- js/lib/irc.js	26 Jan 2008 00:08:59 -0000	1.117
+++ js/lib/irc.js	26 Jan 2008 23:08:50 -0000	1.118
@@ -3236,18 +3236,13 @@ function usr_hostmask (pfx)
 CIRCUser.prototype.getBanMask =
 function usr_banmask()
 {
     if (!this.host)
         return this.unicodeName + "!*@*";
 
-    var hostmask = this.host;
-    if (!/^\d+\.\d+\.\d+\.\d+$/.test(hostmask))
-        hostmask = hostmask.replace(/^[^.]+/, "*");
-    else
-        hostmask = hostmask.replace(/[^.]+$/, "*");
-    return "*!" + this.name + "@" + hostmask;
+    return "*!*@" + this.host;
 }
 
 CIRCUser.prototype.say =
 function usr_say (msg)
 {
     this.parent.sayTo(this.encodedName, fromUnicode(msg, this));