A better approach to make Contribute button Australis-compatible

chrome/content/ui/overlay.xul

 <?xml version="1.0"?>
 
 <!--
   - This file is part of Adblock Plus <http://adblockplus.org/>,
   - Copyright (C) 2006-2013 Eyeo GmbH
   -
   - Adblock Plus is free software: you can redistribute it and/or modify
   - it under the terms of the GNU General Public License version 3 as
   - published by the Free Software Foundation.
   -
@@ skipping 52 matching lines @@
         <menuitem id="abp-status-savestats" label="&counthits.label;" type="checkbox" command="abp-command-togglesavestats"/>
         <menuitem id="abp-status-sync" label="&sync.label;" type="checkbox" command="abp-command-togglesync"/>
         <menuseparator id="abp-status-iconSettingsSeparator"/>
         <menuitem id="abp-status-showinaddonbar" label="&showinaddonbar.label;" type="checkbox" command="abp-command-toggleshowintoolbar"/>
         <menuitem id="abp-status-showintoolbar" label="&showintoolbar.label;" type="checkbox" command="abp-command-toggleshowintoolbar"/>
         <menuitem id="abp-status-showinstatusbar" label="&showinstatusbar.label;" type="checkbox" command="abp-command-toggleshowinstatusbar"/>
       </menupopup>
     </menu>
 
     <hbox class="abp-contributebutton" id="abp-status-contributebutton" pack="center" align="center">
-      <button class="abp-contributebutton-btn" label="&contribute.label;" command="abp-command-contribute" flex="1"/>
-      <toolbarbutton class="abp-contributebutton-close" command="abp-command-contribute-hide"/>
+      <!-- noautoclose attribute tells Australis menu that it shouldn't close when
+           these are clicked, see https://bugzilla.mozilla.org/show_bug.cgi?id=940693 -->
+      <button class="abp-contributebutton-btn" label="&contribute.label;" command="abp-command-contribute" flex="1" noautoclose="true"/>
+      <toolbarbutton class="abp-contributebutton-close" command="abp-command-contribute-hide" noautoclose="true"/>
     </hbox>
   </menupopup>
 
   <keyset id="abp-keyset"/>
 
   <!-- Dummy oncommand attributes are work-arounds for bug 371900 -->
   <commandset id="abp-commandset">
     <command id="abp-command-sendReport" oncommand="//"/>
     <command id="abp-command-filters" oncommand="//"/>
     <command id="abp-command-settings" oncommand="//"/>
@@ skipping 34 matching lines @@
     </vbox>
   </hbox>
 
   <!-- Notification panel -->
   <panel id="abp-notification" type="arrow" orient="vertical"
     xmlns:html="http://www.w3.org/1999/xhtml">
     <label id="abp-notification-title" class="header"/>
     <html:p id="abp-notification-message" maxwidth="300"></html:p>
   </panel>
 </overlay>