Bug 676220 - Clear the popup blocker's list of popup items every time the menu is hidden. r=Neil

suite/browser/navigator.xul

@@ -162,7 +162,8 @@
 
     <menupopup id="popupBlockerMenu"
                oncommand="popupBlockerMenuCommand(event.target);"
-               onpopupshowing="return popupBlockerMenuShowing(event)"/>
+               onpopupshowing="return popupBlockerMenuShowing(event);"
+               onpopuphiding="RemovePopupsItems(this);"/>
     <!-- Items are generated, see popupBlockerMenuShowing() -->
     <menupopup id="popupNotificationMenu"/>
     <menupopup id="networkProperties"/>

suite/browser/navigatorOverlay.xul

@@ -601,7 +601,8 @@
               label="&cookiePopupManager.label;"
               accesskey="&cookiePopupManager.accesskey;"
               oncommand="popupBlockerMenuCommand(event.target);">
-          <menupopup onpopupshowing="CheckForVisibility(event);">
+          <menupopup onpopupshowing="CheckForVisibility(event);"
+                     onpopuphiding="RemovePopupsItems(this);">
             <menuitem id="AllowPopups"
                       label="&cookieAllowPopupsCmd.label;"
                       accesskey="&cookieAllowPopupsCmd.accesskey;"

suite/common/utilityOverlay.js

@@ -1161,11 +1161,14 @@ function popupNotificationMenuShowing(event)
   separator.hidden = !createShowPopupsMenu(event.target, notificationbox.activeBrowser);
 }
 
-function createShowPopupsMenu(parent, browser)
+function RemovePopupsItems(parent)
 {
   while (parent.lastChild && ("popup" in parent.lastChild))
     parent.removeChild(parent.lastChild);
+}
 
+function createShowPopupsMenu(parent, browser)
+{
   if (!browser)
     return false;
 

suite/common/utilityOverlay.xul

@@ -465,7 +465,8 @@
 
   <menupopup id="popupNotificationMenu"
          oncommand="popupBlockerMenuCommand(event.target);"
-         onpopupshowing="return popupNotificationMenuShowing(event)">
+         onpopupshowing="return popupNotificationMenuShowing(event);"
+         onpopuphiding="RemovePopupsItems(this);">
     <menuitem id="allowPopupsForSite" hidden="true" accesskey="&allowPopups.accesskey;"
               oncommand="this.notificationbox.allowPopupsForSite(event);"/>
     <menuitem id="showPopupManager" label="&showPopupManager.label;"