Index: locales/generic/install.rdf
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/locales/generic/install.rdf,v
retrieving revision 1.3
retrieving revision 1.4
diff -d -p -u -6 -r1.3 -r1.4
--- locales/generic/install.rdf	2 Mar 2008 12:15:43 -0000	1.3
+++ locales/generic/install.rdf	12 Mar 2008 20:51:04 -0000	1.4
@@ -70,13 +70,13 @@
 
     <!-- target: Songbird, version 0.5pre to 0.5.* -->
     <em:targetApplication>
       <Description>
         <em:id>songbird@songbirdnest.com</em:id>
         <em:minVersion>0.5pre</em:minVersion>
-        <em:maxVersion>0.5.*</em:maxVersion>
+        <em:maxVersion>0.6pre</em:maxVersion>
       </Description>
     </em:targetApplication>
 
     <!-- package files -->
     <em:file>
       <Description about="urn:mozilla:extension:file:chatzilla.jar">
Index: xpi/resources/install.rdf
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/xpi/resources/install.rdf,v
retrieving revision 1.15
retrieving revision 1.16
diff -d -p -u -6 -r1.15 -r1.16
--- xpi/resources/install.rdf	2 Mar 2008 12:15:43 -0000	1.15
+++ xpi/resources/install.rdf	12 Mar 2008 20:51:04 -0000	1.16
@@ -53,13 +53,13 @@
 		
 		<!-- target: Songbird, version 0.5pre to 0.5.* -->
 		<em:targetApplication>
 			<Description>
 				<em:id>songbird@songbirdnest.com</em:id>
 				<em:minVersion>0.5pre</em:minVersion>
-				<em:maxVersion>0.5.*</em:maxVersion>
+				<em:maxVersion>0.6pre</em:maxVersion>
 			</Description>
 		</em:targetApplication>
 		
 		<!-- front-end metadata -->
 		<em:name>ChatZilla</em:name>
 		<em:description>A clean, easy to use and highly extensible Internet Relay Chat (IRC) client.</em:description>
Index: xul/content/config.js
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/xul/content/config.js,v
retrieving revision 1.13
retrieving revision 1.14
diff -d -p -u -6 -r1.13 -r1.14
--- xul/content/config.js	1 Feb 2008 21:33:25 -0000	1.13
+++ xul/content/config.js	12 Mar 2008 20:57:43 -0000	1.14
@@ -901,12 +901,13 @@ function PrefWindow()
      * HideDelay: ms delay before the tooltips hide themselves.
      */
     this.tooltipTimer = 0;
     this.tooltipShowing = false;
     this.tooltipShowDelay = 1000;
     this.tooltipHideDelay = 20000;
+    this.tooltipBug418798 = false;
 }
 PrefWindow.prototype.TYPE = "PrefWindow";
 
 /* Updates the tooltip state, either showing or hiding it. */
 PrefWindow.prototype.setTooltipState =
 function pwin_setTooltipState(visible)
@@ -1306,15 +1307,28 @@ function pwin_onTooltipPopupShowing(popu
     
     // Setup the labels...
     var ttt = document.getElementById("czPrefTipTitle");
     ttt.firstChild.nodeValue = this.tooltipTitle;
     var ttl = document.getElementById("czPrefTipLabel");
     ttl.firstChild.nodeValue = this.tooltipText;
-    
-    popup.sizeTo(popup.boxObject.width, fChild.boxObject.height + diff);
-    
+
+    /* In Gecko 1.9, the popup has done no layout at this point, unlike in
+     * earlier versions. As a result, the box object of all the elements
+     * within it are 0x0. It also means the height of the labels isn't
+     * updated. To deal with this, we avoid calling sizeTo with the box
+     * object (as it's 0) and instead just force the popup height to 0 -
+     * otherwise it will only ever get bigger each time, never smaller.
+     */
+    if (popup.boxObject.width == 0)
+        this.tooltipBug418798 = true;
+
+    if (this.tooltipBug418798)
+        popup.height = 0;
+    else
+        popup.sizeTo(popup.boxObject.width, fChild.boxObject.height + diff);
+
     return true;
 }
 
 /** Components' event handlers **/
 
 // Selected an item in the tree.