bug 450205 - Hide feed discovery UI for SeaMonkey 2.0a1 (release only)

suite/browser/linkToolbarOverlay.xul

@@ -198,7 +198,7 @@
       <toolbarbutton id="link-feed" class="bookmark-item"
           type="menu"
           container="true"
-          label="&feedButton.label;" disabled="true">
+          label="&feedButton.labelTemp;" disabled="true">
         <menupopup id="link-feed-popup"/>
       </toolbarbutton>
     </toolbar>

suite/browser/navigator.xul

@@ -203,7 +203,7 @@
                    tooltiptext="&proxyIcon.tooltip;"/>
           </deck>
           <hbox id="urlbar-icons">
-            <image id="feedsButton" hidden="true" popup="feedsPopup"/>
+            <image id="feedsButton" hidden="true" popup="feedsPopup" style="display: none !important"/>
           </hbox>
           <menupopup id="ubhist-popup" class="autocomplete-history-popup"
                      popupalign="topleft" popupanchor="bottomleft"

suite/browser/navigatorOverlay.xul

@@ -492,11 +492,12 @@
         <menuitem key="manBookmarkKb"   command="Browser:ManageBookmark"/>
         <menuseparator/>
         <menu id="feedsMenu" class="menu-iconic" disabled="true"
-              label="&feedsMenu.label;" accesskey="&feedsMenu.accesskey;">
+              label="&feedsMenu.label;" accesskey="&feedsMenu.accesskey;"
+              style="display: none !important">
           <menupopup onpopupshowing="window.XULBrowserWindow.populateFeeds(this);"
                      oncommand="loadURI(event.target.statusText, gBrowser.currentURI);"/>
         </menu>
-        <menuseparator/>
+        <menuseparator style="display: none !important"/>
       </menupopup>
     </menu>
       

suite/browser/pageinfo/feeds.xml

@@ -56,7 +56,7 @@
           <xul:label xbl:inherits="value=type"/>
         </xul:hbox>
         <xul:textbox xbl:inherits="value=feedURL" readonly="true"/>
-        <xul:hbox flex="1" class="feed-subscribe">
+        <xul:hbox flex="1" class="feed-subscribe" style="display: none !important">
           <xul:spacer flex="1"/>
           <xul:button label="&feedSubscribe;" accesskey="&feedSubscribe.accesskey;"
                       oncommand="onSubscribeFeed()"/>

suite/locales/en-US/chrome/browser/linkToolbar.dtd

@@ -78,4 +78,6 @@
 
 <!ENTITY alternateButton.label "Other Versions">
 
-<!ENTITY feedButton.label "Subscribe">
+<!-- XXXCallek Disabling for alpha release only -->
+<!--<!ENTITY feedButton.label "Subscribe">-->
+<!ENTITY feedButton.labelTemp "Feeds">