From 7eddec80978b82dcfd25b1c3ab9a23ea9509cc7e Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk"
 <neil%parkwaycc.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 7 Jun 2005 23:27:08 +0000
Subject: [PATCH] Fixes for minor regressions b=273507 r=silver a=asa

git-svn-id: svn://10.0.0.236/trunk@174258 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/extensions/irc/xul/content/menus.js   | 2 +-
 mozilla/extensions/irc/xul/skin/chatzilla.css | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mozilla/extensions/irc/xul/content/menus.js b/mozilla/extensions/irc/xul/content/menus.js
index dafb1dd32f7..78b6c0227e5 100644
--- a/mozilla/extensions/irc/xul/content/menus.js
+++ b/mozilla/extensions/irc/xul/content/menus.js
@@ -391,7 +391,7 @@ function initMenus()
                        "') and " + netAway;
 
     client.menuSpecs["mainmenu:nickname"] = {
-        label: "",
+        label: client.prefs["nickname"],
         domID: "server-nick",
         getContext: getDefaultContext,
         items:
diff --git a/mozilla/extensions/irc/xul/skin/chatzilla.css b/mozilla/extensions/irc/xul/skin/chatzilla.css
index da10d68eb2c..8f69775f281 100644
--- a/mozilla/extensions/irc/xul/skin/chatzilla.css
+++ b/mozilla/extensions/irc/xul/skin/chatzilla.css
@@ -58,6 +58,10 @@ window {
     margin: 5px;
 }
 
+.toolbarbutton-menu-dropmarker {
+    margin-left: 0.5em;
+}
+
 #input-widgets {
     border: none;
     -moz-binding: none;