Tweaks.

src/net/java/sip/communicator/impl/protocol/irc/ChatRoomIrcImpl.java

@@ -1281,13 +1281,13 @@ public void updateSubject(String subject)
         }
     }
     
-    public void updateChatRoomMemberName(String oldName, String newName)
+    public void updateChatRoomMemberName(String oldName)
     {
         synchronized(this.chatRoomMembers)
         {
             ChatRoomMember member = this.chatRoomMembers.remove(oldName);
             if (member != null)
-                this.chatRoomMembers.put(newName, member);
+                this.chatRoomMembers.put(member.getContactAddress(), member);
         }
     }
 }

src/net/java/sip/communicator/impl/protocol/irc/listener/ServerListener.java

@@ -19,10 +19,6 @@ public ServerListener(List<ChatRoomIrcImpl> joinedChannels)
         this.channels = joinedChannels;
     }
     
-    // TODO Maybe implement this as a IRC server listener and connect a system
-    // chatroom to each listener in order to inform the user of server
-    // (chatroom-independent) messages, notices, etc.
-    
     @Override
     public void onServerNotice(ServerNotice msg)
     {
@@ -69,7 +65,7 @@ public void onNickChange(NickMessage msg)
             ChatRoomIrcImpl channel = record.getKey();
             ChatRoomMemberIrcImpl member = record.getValue();
             member.setName(newNick);
-            channel.updateChatRoomMemberName(oldNick, newNick);
+            channel.updateChatRoomMemberName(oldNick);
             ChatRoomMemberPropertyChangeEvent evt =
                 new ChatRoomMemberPropertyChangeEvent(member, channel,
                     ChatRoomMemberPropertyChangeEvent.MEMBER_NICKNAME, oldNick,