completed Bug 479478 elsewhere.

content/collections.js

@@ -395,7 +395,8 @@ this._log.info("unsubscribe: source - " + query.queryName + " : " + selectedSour
   },
 
   searchCollections: function(aSearchString) {
-    // XXX: applyFilter searches in uri, which is not meaningful, fix this..
+    // XXX: Bug 479903, place queries have no way of excluding search in uri,
+    // which is not meaningful for our usage.
     if (!aSearchString)
       this._tree.place = this._tree.place;
     else

content/collections.xul

@@ -54,13 +54,13 @@
           src="chrome://snowl/content/collections.js"/>
 
   <!-- Places oncommandupdater events = null for now, override list and river
-       overlays of placesOverlay.xul -->
+       overlays of placesOverlay.xul
   <commandset id="placesCommands" events=""/>
   <commandset id="editMenuCommands">
     <commandset id="editMenuCommandSetAll" events=""/>
     <commandset id="editMenuCommandSetUndo" events=""/>
     <commandset id="editMenuCommandSetPaste" events=""/>
-  </commandset>
+  </commandset> -->
 
   <vbox id="collectionsViewBox"
         flex="1">
@@ -92,6 +92,7 @@
       <textbox id="search-box"
                flex="1"
                type="search"
+               emptytext="&colSearchEmptytext.label;"
                cocoa-size="small"
                aria-controls="sourcesView"
                oncommand="CollectionsView.searchCollections(this.value);"/>

content/river.xul

@@ -106,16 +106,20 @@
 
       <toolbar id="snowlToolbar">
         <toolbarbutton id="snowlSubscribeButton"
+                       class="tabbable"
                        oncommand="CollectionsView.onSubscribe()"
                        tooltiptext="&subscribeButton.tooltip;"/>
         <toolbarbutton id="snowlRefreshButton"
+                       class="tabbable"
                        oncommand="CollectionsView.onRefresh()"
                        tooltiptext="&refreshButton.tooltip;"/>
         <toolbarspring/>
         <toolbarbutton id="searchBoxButton" type="checkbox"
+                       class="tabbable"
                        oncommand="CollectionsView.onToggleSearchbox()"
                        tooltiptext="&searchboxButton.tooltip;"/>
         <toolbarbutton id="writeButton" type="checkbox"
+                       class="tabbable"
                        oncommand="SnowlMessageView.onToggleWrite(event)"
                        tooltiptext="&writeButton.tooltip;"/>
       </toolbar>
@@ -127,16 +131,18 @@
       <toolbar id="toolbar">
         <!-- <toolbarbutton oncommand="dump(new XMLSerializer().serializeToString(document))"/> -->
 
-        <toolbarbutton id="bodyButton" type="checkbox"
+        <toolbarbutton id="bodyButton"
+                       type="checkbox"
                        persist="checked"
+                       class="tabbable"
                        oncommand="SnowlMessageView.onCommandBodyButton(event)"
                        tooltiptext="&bodyButton.tooltip;"/>
-
-        <toolbarbutton id="columnsButton" type="checkbox"
+        <toolbarbutton id="columnsButton"
+                       type="checkbox"
                        persist="checked"
+                       class="tabbable"
                        oncommand="SnowlMessageView.onCommandColumnsButton(event)"
                        tooltiptext="&columnsButton.tooltip;"/>
-
         <menulist id="periodMenu"
                   selectedindex=""
                   persist="selectedindex"

content/stream.xul

@@ -62,10 +62,13 @@
 
   <toolbar id="snowlToolbar">
     <toolbarbutton id="snowlRefreshButton"
+                   class="tabbable"
                    oncommand="SnowlMessageView.onRefresh()"
                    tooltiptext="&refreshButton.tooltip;"/>
     <toolbarspring/>
-    <toolbarbutton id="writeButton" type="checkbox"
+    <toolbarbutton id="writeButton"
+                   type="checkbox"
+                   class="tabbable"
                    oncommand="SnowlMessageView.onToggleWrite(event)"
                    tooltiptext="&writeButton.tooltip;"/>
   </toolbar>

locale/en-US/collections.dtd

@@ -7,3 +7,5 @@
 <!ENTITY refreshAll.accesskey         "A">
 <!ENTITY unsubscribe.label            "Unsubscribe">
 <!ENTITY unsubscribe.accesskey        "U">
+
+<!ENTITY colSearchEmptytext.label     "Search Collections">