Index: xul/content/chatzilla.xul
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/xul/content/chatzilla.xul,v
retrieving revision 1.72
retrieving revision 1.73
diff -d -p -u -6 -r1.72 -r1.73
--- xul/content/chatzilla.xul	21 Dec 2007 15:28:11 -0000	1.72
+++ xul/content/chatzilla.xul	2 Apr 2008 20:23:26 -0000	1.73
@@ -47,19 +47,22 @@
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://chatzilla/content/scripts.xul"?>
 <?xul-overlay href="chrome://chatzilla/content/popups.xul"?>
 <?xul-overlay href="chrome://chatzilla/content/menus.xul"?>
 
 <window id="chatzilla-window"
+  xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:aaa="http://www.w3.org/2005/07/aaa"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   orient="vertical" onload="onLoad();" onunload="onUnload();"
   onclose="return onClose();" onmouseover="onMouseOver(event);"
   persist="width height screenX screenY sizemode" windowtype="irc:chatzilla">
   
+  <html:link rel="icon" href="chrome://chatzilla/skin/images/logo.png"/>
+  
   <overlaytarget id="scripts-overlay-target"/>
   <overlaytarget id="popup-overlay-target"/>
   <overlaytarget id="menu-overlay-target"/>
   <stringbundleset id="chatzilla-stringbundle">
     <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
   </stringbundleset>
Index: xul/content/commands.js
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/xul/content/commands.js,v
retrieving revision 1.149
retrieving revision 1.150
diff -d -p -u -6 -r1.149 -r1.150
--- xul/content/commands.js	2 Mar 2008 12:15:43 -0000	1.149
+++ xul/content/commands.js	2 Apr 2008 20:54:20 -0000	1.150
@@ -2300,13 +2300,13 @@ function cmdGotoURL(e)
             display(getMsg(MSG_ERR_INVALID_URL, e.url), MT_ERROR);
 
         dispatch("focus-input");
         return;
     }
 
-    if ((e.command.name == "goto-url-external") || (client.host == "XULrunner"))
+    if ((e.command.name == "goto-url-external") || (client.host == "XULRunner"))
     {
         const extProtoSvc = getService(EXT_PROTO_SVC,
                                        "nsIExternalProtocolService");
         extProtoSvc.loadUrl(uri);
         dispatch("focus-input");
         return;
Index: xul/content/menus.js
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/xul/content/menus.js,v
retrieving revision 1.27
retrieving revision 1.28
diff -d -p -u -6 -r1.27 -r1.28
--- xul/content/menus.js	17 Mar 2008 17:44:32 -0000	1.27
+++ xul/content/menus.js	2 Apr 2008 20:54:20 -0000	1.28
@@ -110,13 +110,13 @@ function initMenus()
     var NotMac   = "(client.platform != 'Mac')";
 
     // Platform values
     var Mozilla    = "(client.host == 'Mozilla')";
     var NotMozilla = "(client.host != 'Mozilla')";
     var Toolkit    = NotMozilla;
-    var XULRunner  = "(client.host == 'XULrunner')";
+    var XULRunner  = "(client.host == 'XULRunner')";
 
     // Useful combinations
     var ToolkitOnLinux    = "(" + Toolkit + " and " + Linux + ")";
     var ToolkitNotOnLinux = "(" + Toolkit + " and " + NotLinux + ")";
     var ToolkitOnMac      = "(" + Toolkit + " and " + Mac + ")";
     var ToolkitNotOnMac   = "(" + Toolkit + " and " + NotMac + ")";
@@ -468,13 +468,13 @@ function createMenus()
         tasksMenu.parentNode.removeChild(tasksMenu);
         winMenu.parentNode.removeChild(winMenu);
     } else {
         comBar.collapsed = false;
     }
 
-    if (client.host == "XULrunner")
+    if (client.host == "XULRunner")
     {
         // This is a hack to work around Gecko bug 98997, which means that
         // :empty causes menus to be hidden until we force a reflow.
         var menuBar = document.getElementById("mainmenu");
         menuBar.hidden = true;
         menuBar.hidden = false;
Index: xul/content/prefs.js
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/xul/content/prefs.js,v
retrieving revision 1.51
retrieving revision 1.52
diff -d -p -u -6 -r1.51 -r1.52
--- xul/content/prefs.js	21 Mar 2008 16:42:55 -0000	1.51
+++ xul/content/prefs.js	2 Apr 2008 20:54:20 -0000	1.52
@@ -84,13 +84,13 @@ function initPrefs()
 
     var logDefault = client.prefManager.logPath.clone();
     logDefault.append(escapeFileName("client.log"));
 
     var gotos = ["goto-url",        "goto-url-newwin",
                  "goto-url-newtab", "goto-url-newtab"];
-    if (client.host == "XULrunner")
+    if (client.host == "XULRunner")
     {
         gotos = ["goto-url-external", "goto-url-external",
                  "goto-url-external", "goto-url-external"];
     }
     else if (client.host == "Songbird")
     {
Index: xul/content/static.js
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/xul/content/static.js,v
retrieving revision 1.269
retrieving revision 1.270
diff -d -p -u -6 -r1.269 -r1.270
--- xul/content/static.js	17 Mar 2008 17:44:32 -0000	1.269
+++ xul/content/static.js	2 Apr 2008 20:54:20 -0000	1.270
@@ -307,13 +307,13 @@ function initStatic()
     var app = getService("@mozilla.org/xre/app-info;1", "nsIXULAppInfo");
     if (app)
     {
         // Use the XUL host app info, and Gecko build ID.
         if (app.ID == "{" + __cz_guid + "}")
         {
-            // We ARE the app, in other words, we're running in XULrunner.
+            // We ARE the app, in other words, we're running in XULRunner.
             // Because of this, we must disregard app.(name|vendor|version).
             // "XULRunner 1.7+/2005071506"
             ua = "XULRunner " + app.platformVersion + "/" + app.platformBuildID;
 
             // "XULRunner 1.7+/2005071506, Windows"
             CIRCServer.prototype.HOST_RPLY = ua + ", " + client.platform;
@@ -425,14 +425,14 @@ function initApplicationCompatibility()
         switch (app.ID)
         {
             case "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}":
                 client.host = "Firefox";
                 break;
             case "{" + __cz_guid + "}":
-                // We ARE the app, in other words, we're running in XULrunner.
-                client.host = "XULrunner";
+                // We ARE the app, in other words, we're running in XULRunner.
+                client.host = "XULRunner";
                 break;
             case "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}": // SeaMonkey
                 client.host = "Mozilla";
                 break;
             case "{a463f10c-3994-11da-9945-000d60ca027b}": // Flock
                 client.host = "Flock";
@@ -2055,13 +2055,13 @@ function initOfflineIcon()
 
             var isOffline = false;
             var prefSvc = getService("@mozilla.org/preferences-service;1",
                                      "nsIPrefBranch");
             // Let the app-specific hacks begin:
             try {
-                if (client.host == "XULrunner")
+                if (client.host == "XULRunner")
                     isOffline = !prefSvc.getBoolPref("network.online");
                 else // Toolkit based, but not standalone
                     isOffline = prefSvc.getBoolPref("browser.offline");
             }
             catch (ex) { /* Whatever. */ }
 
@@ -2076,13 +2076,13 @@ function initOfflineIcon()
 
             var isOffline = client.iosvc.offline;
             var prefSvc = getService("@mozilla.org/preferences-service;1",
                                      "nsIPrefBranch");
             // Let the app-specific hacks begin:
             try {
-                if (client.host == "XULrunner")
+                if (client.host == "XULRunner")
                     prefSvc.setBoolPref("network.online", !isOffline);
                 else // Toolkit based, but not standalone
                     prefSvc.setBoolPref("browser.offline", isOffline);
             }
             catch (ex)
             {