Index: xul/content/handlers.js
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/xul/content/handlers.js,v
retrieving revision 1.167
retrieving revision 1.168
diff -d -p -u -6 -r1.167 -r1.168
--- xul/content/handlers.js	20 Jan 2008 16:34:11 -0000	1.167
+++ xul/content/handlers.js	26 Jan 2008 22:31:17 -0000	1.168
@@ -2258,12 +2258,22 @@ function my_cprivmsg (e)
 }
 
 /* end of names */
 CIRCChannel.prototype.on366 =
 function my_366 (e)
 {
+    // First clear up old users:
+    var removals = new Array();
+    while (this.userList.childData.childData.length > 0)
+    {
+        var userToRemove = this.userList.childData.childData[0]._userObj;
+        this.removeFromList(userToRemove);
+        removals.push(userToRemove);
+    }
+    this.removeUsers(removals);
+
     var entries = new Array(), updates = new Array();
     for (var u in this.users)
     {
         entries.push(new UserEntry(this.users[u], this.userListShare));
         updates.push(this.users[u]);
     }