Bug 299458 - Add window ID to preferences window, call updateUsers instead of faking with removeUsers+addUsers and sort nicknames with prefixes we have no image for properly.

ChatZilla only.
r=samuel

extensions/irc/xul/content/config.xul

@@ -43,6 +43,7 @@
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:html="http://www.w3.org/1999/xhtml"
     windowtype="irc:chatzilla:config"
+    id="chatzilla-window"
     buttons="accept,cancel,extra1"
     extra1Label="&dialog.apply;"
     ondialogaccept="gPrefWindow.onOK();"

extensions/irc/xul/content/handlers.js

@@ -2391,13 +2391,7 @@ function my_cnick (e)
     }
 
     e.user.updateGraphResource();
-    //this.updateUsers([e.user]);
-    /* updateUsers isn't clever enough (currently) to handle a nick change, so
-     * we fake the user leaving (with the old nick) and coming back (with the
-     * new nick).
-     */
-    this.removeUsers([e.server.addUser(e.oldNick)]);
-    this.addUsers([e.user]);
+    this.updateUsers([e.user]);
     if (client.currentObject == this)
         updateUserList();
 }

extensions/irc/xul/content/static.js

@@ -2859,7 +2859,7 @@ function reSortUserlist(node)
     if (client.prefs["sortUsersByMode"])
         sortResource = RES_PFX + "sortname";
     else
-        sortResource = RES_PFX + "nick";
+        sortResource = RES_PFX + "unicodeName";
 
     try
     {