Fix overlay madness in reporter (not enabled in build). bug #288969 r=neil@parkwaycc.co.uk.

extensions/reporter/resources/content/reporter/contents.rdf

@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-
 <RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
   <RDF:Seq about="urn:mozilla:package:root">
@@ -16,14 +15,14 @@
   </RDF:Description>
   <!-- overlay information -->
   <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://help/content/helpMenuOverlay.xul" />
-    <RDF:li resource="chrome://communicator/content/utilityOverlay.xul" />
+    <RDF:li resource="chrome://browser/content/browser.xul"/>
+    <RDF:li resource="chrome://navigator/content/navigator.xul"/>
     <RDF:li resource="chrome://global/content/customizeToolbar.xul"/>
   </RDF:Seq>
-  <RDF:Seq about="chrome://help/content/helpMenuOverlay.xul">
+  <RDF:Seq about="chrome://browser/content/browser.xul">
     <RDF:li>chrome://reporter/content/reporterOverlay.xul</RDF:li>
   </RDF:Seq>
-  <RDF:Seq about="chrome://communicator/content/utilityOverlay.xul">
+  <RDF:Seq about="chrome://navigator/content/navigator.xul">
     <RDF:li>chrome://reporter/content/reporterOverlay.xul</RDF:li>
   </RDF:Seq>
   <RDF:Seq about="chrome://global/content/customizeToolbar.xul">

extensions/reporter/resources/content/reporter/reporterOverlay.xul

@@ -47,19 +47,18 @@
 
   <!-- Firefox -->
   <menupopup id="menu_HelpPopup">
-    <menuitem id="reportertoolmenu" label="&reporterMenu.title;" accesskey="&reporterMenu.accesskey;" insertbefore="aboutName"
+    <menuitem id="menu_HelpPopup_reportertoolmenu" label="&reporterMenu.title;" accesskey="&reporterMenu.accesskey;" insertbefore="aboutName"
               oncommand="loadReporterWizard()"/>
     <menuseparator insertbefore="aboutName"/>
   </menupopup>
-
   <toolbarpalette id="BrowserToolbarPalette">
     <toolbarbutton id="reporterMenuButton" oncommand="loadReporterWizard();" class="toolbarbutton-1" label="&reporterMenu.title;" tooltiptext="&reporterMenu.tooltip;"/>
   </toolbarpalette>
 
   <!-- SeaMonkey -->
   <menupopup id="helpPopup">
-    <menuitem id="reportertoolmenu" label="&reporterMenu.title;" accesskey="&reporterMenu.accesskey;" insertafter="menu_HelpAboutSeparator"
+    <menuseparator insertbefore="menu_HelpAboutSeparator"/>
+    <menuitem id="helpPopup_reportertoolmenu" label="&reporterMenu.title;" accesskey="&reporterMenu.accesskey;" insertbefore="menu_HelpAboutSeparator"
               oncommand="loadReporterWizard()"/>
-    <menuseparator insertafter="reportertoolmenu"/>
   </menupopup>
 </overlay>