--- a/client.py
+++ b/client.py
@@ -1,30 +1,30 @@
#!/usr/bin/python
-EXTENSION_CO_TAG = 'SEAMONKEY_2_0a1_RELEASE'
+EXTENSION_CO_TAG = 'HEAD'
LDAPCSDK_CO_TAG = 'LDAPCSDK_6_0_6_RTM'
-CHATZILLA_CO_TAG = 'SEAMONKEY_2_0a1_RELEASE'
-VENKMAN_CO_TAG = 'SEAMONKEY_2_0a1_RELEASE'
+CHATZILLA_CO_TAG = 'HEAD'
+VENKMAN_CO_TAG = 'HEAD'
EXTENSION_DIRS = ('extensions/typeaheadfind',
'extensions/wallet',)
LDAPCSDK_DIRS = ('directory/c-sdk',)
CHATZILLA_DIRS = ('extensions/irc',)
VENKMAN_DIRS = ('extensions/venkman',)
-DEFAULT_COMM_REV = "SEAMONKEY_2_0a1_RELEASE"
+DEFAULT_COMM_REV = "tip"
# URL of the default hg repository to clone for Mozilla.
DEFAULT_MOZILLA_REPO = 'http://hg.mozilla.org/mozilla-central/'
-DEFAULT_MOZILLA_REV = "SEAMONKEY_2_0a1_RELEASE"
+DEFAULT_MOZILLA_REV = "tip"
# URL of the default hg repository to clone for inspector.
DEFAULT_INSPECTOR_REPO = 'http://hg.mozilla.org/dom-inspector/'
-DEFAULT_INSPECTOR_REV = "SEAMONKEY_2_0a1_RELEASE"
+DEFAULT_INSPECTOR_REV = "tip"
import os
import sys
import datetime
from optparse import OptionParser
topsrcdir = os.path.dirname(__file__)
if topsrcdir == '':
--- a/suite/browser/linkToolbarOverlay.xul
+++ b/suite/browser/linkToolbarOverlay.xul
@@ -193,14 +193,14 @@
<menuseparator collapsed="true" id="misc-separator" />
</menupopup>
</toolbarbutton>
<toolbarbutton id="link-feed" class="bookmark-item"
type="menu"
container="true"
- label="&feedButton.labelTemp;" disabled="true">
+ label="&feedButton.label;" disabled="true">
<menupopup id="link-feed-popup"/>
</toolbarbutton>
</toolbar>
</toolbox>
</overlay>
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -198,17 +198,17 @@
ondraggesture="PageProxyDragGesture(event);"
onload="this.parentNode.selectedIndex = 1;
event.stopPropagation();
HandleBookmarkIcon(this.src, true);"
onerror="gBrowser.addToMissedIconCache(this.src); HandleBookmarkIcon(this.src, false);"
tooltiptext="&proxyIcon.tooltip;"/>
</deck>
<hbox id="urlbar-icons">
- <image id="feedsButton" hidden="true" popup="feedsPopup" style="display: none !important"/>
+ <image id="feedsButton" hidden="true" popup="feedsPopup"/>
</hbox>
<menupopup id="ubhist-popup" class="autocomplete-history-popup"
popupalign="topleft" popupanchor="bottomleft"
onpopupshowing="createUBHistoryMenu(event.target);"
oncommand="executeUrlBarHistoryCommand(event.target);"/>
</textbox>
<button id="go-button" class="button-toolbar chromeclass-location"
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -487,22 +487,21 @@
context="bookmarks-context-menu"
onpopupshowing="updateGroupmarkCommand();">
<menuitem key="addBookmarkKb" command="Browser:AddBookmark"/>
<menuitem key="addBookmarkAsKb" command="Browser:AddBookmarkAs"/>
<menuitem command="Browser:AddGroupmarkAs"/>
<menuitem key="manBookmarkKb" command="Browser:ManageBookmark"/>
<menuseparator/>
<menu id="feedsMenu" class="menu-iconic" disabled="true"
- label="&feedsMenu.label;" accesskey="&feedsMenu.accesskey;"
- style="display: none !important">
+ label="&feedsMenu.label;" accesskey="&feedsMenu.accesskey;">
<menupopup onpopupshowing="window.XULBrowserWindow.populateFeeds(this);"
oncommand="loadURI(event.target.statusText, gBrowser.currentURI);"/>
</menu>
- <menuseparator style="display: none !important"/>
+ <menuseparator/>
</menupopup>
</menu>
<menu id="tasksMenu">
<menupopup id="taskPopup">
<menuitem id="menu_searchWeb" label="&searchInternetCmd.label;" key="searchInternetKb" accesskey="&searchInternetCmd.accesskey;" command="Browser:SearchInternet"/>
<menuitem id="menu_translate" label="&translateMenu.label;" accesskey="&translateMenu.accesskey;" oncommand="Translate();"/>
<menuseparator id="navBeginGlobalItems"/>
--- a/suite/browser/pageinfo/feeds.xml
+++ b/suite/browser/pageinfo/feeds.xml
@@ -51,17 +51,17 @@
<content>
<xul:vbox flex="1">
<xul:hbox flex="1">
<xul:textbox flex="1" readonly="true" xbl:inherits="value=name"
class="feedTitle"/>
<xul:label xbl:inherits="value=type"/>
</xul:hbox>
<xul:textbox xbl:inherits="value=feedURL" readonly="true"/>
- <xul:hbox flex="1" class="feed-subscribe" style="display: none !important">
+ <xul:hbox flex="1" class="feed-subscribe">
<xul:spacer flex="1"/>
<xul:button label="&feedSubscribe;" accesskey="&feedSubscribe.accesskey;"
oncommand="onSubscribeFeed()"/>
</xul:hbox>
</xul:vbox>
</content>
</binding>
</bindings>
--- a/suite/config/version.txt
+++ b/suite/config/version.txt
@@ -1,1 +1,1 @@
-2.0a1pre
\ No newline at end of file
+2.0a2pre
\ No newline at end of file
--- a/suite/locales/en-US/chrome/browser/linkToolbar.dtd
+++ b/suite/locales/en-US/chrome/browser/linkToolbar.dtd
@@ -73,11 +73,9 @@
<!ENTITY authorButton.label "Author(s)">
<!ENTITY copyrightButton.label "Copyright">
<!ENTITY bookmarkButton.label "Bookmarks">
<!ENTITY alternateButton.label "Other Versions">
-<!-- XXXCallek Disabling for alpha release only -->
-<!--<!ENTITY feedButton.label "Subscribe">-->
-<!ENTITY feedButton.labelTemp "Feeds">
+<!ENTITY feedButton.label "Subscribe">