Bug 603952, Removal of Bloglines, General productization review, r=sethb FIREFOX_4_0b12_BUILD1 FIREFOX_4_0b12_RELEASE
authorSøren Munk Skrøder <sskroeder@skroeder.dk>
Fri, 18 Feb 2011 18:49:03 +0100
changeset 152 513288e9103e758fe52959851a503e70771eb2db
parent 151 9153d597f8a339c16546a5a464667954060f5528
child 153 db20ac30a647b561ae60f684da98942265cc6730
child 154 84f6f90368c29f2d30d3fdad580ac9cabb1ba3c6
push id1
push userroot
push dateWed, 13 Apr 2011 19:41:50 +0000
reviewerssethb
bugs603952
Bug 603952, Removal of Bloglines, General productization review, r=sethb
browser/chrome/browser-region/region.properties
browser/searchplugins/list.txt
browser/searchplugins/yahoo-dk.xml
--- a/browser/chrome/browser-region/region.properties
+++ b/browser/chrome/browser-region/region.properties
@@ -3,51 +3,51 @@
 # the l10n-drivers team (this includes en-US). In order to get one,
 # please file a bug, add the "productization" keyword and CC l10n@mozilla.com.
 
 # Default search engine
 browser.search.defaultenginename=Google
 
 # Search engine order (order displayed in the search bar dropdown)s
 browser.search.order.1=Google
-browser.search.order.2=Yahoo
+browser.search.order.2=Bing
 
 # This is the default set of web based feed handlers shown in the reader
 # selection UI
-browser.contentHandlers.types.0.title=Bloglines
-browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s
+browser.contentHandlers.types.0.title=Google
+browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
 browser.contentHandlers.types.1.title=My Yahoo
 browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
-browser.contentHandlers.types.2.title=Google
-browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
 
 # URL for site-specific search engines
 # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
 # to be searched and the user's search query. Place them in the appropriate location
 # for your locale's URL but do not translate them.
 browser.search.siteSearchURL = http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
 
 # increment this number when anything gets changed in the list below.  This will
 # cause Firefox to re-read these prefs and inject any new handlers into the 
 # profile database.  Note that "new" is defined as "has a different URL"; this
 # means that it's not possible to update the name of existing handler, so 
 # don't make any spelling errors here.
-gecko.handlerService.defaultHandlersVersion=3
+gecko.handlerService.defaultHandlersVersion=4
 
 # The default set of protocol handlers for webcal
 gecko.handlerService.schemes.webcal.0.name=30 Boxes
 gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
 
 # The default set of protocol handlers for mailto:
 gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
 gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s 
 
 gecko.handlerService.schemes.mailto.1.name=Gmail
 gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-
+ 
++gecko.handlerService.schemes.mailto.2.name=Hotmail
++gecko.handlerService.schemes.mailto.2.uriTemplate=http://hotmail.msn.com/secure/start?action=compose&to=
 
 # The default set of protocol handlers for irc:
 gecko.handlerService.schemes.irc.0.name = Mibbit
 gecko.handlerService.schemes.irc.0.uriTemplate = https://www.mibbit.com/?url=%s
 
 # The default set of protocol handlers for ircs:
 gecko.handlerService.schemes.ircs.0.name = Mibbit
 gecko.handlerService.schemes.ircs.0.uriTemplate = https://www.mibbit.com/?url=%s
--- a/browser/searchplugins/list.txt
+++ b/browser/searchplugins/list.txt
@@ -1,7 +1,5 @@
 amazon-co-uk
-answers
-creativecommons
+bing
 eBay
 google
 wikipedia-da
-yahoo-dk
deleted file mode 100644
--- a/browser/searchplugins/yahoo-dk.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgJqAIoCdgCaAnoAnhKCAKYijgCuLpIAskKeALpSpgC+Yq4AzHy8ANqezgDmvt4A7tLqAPz5+wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKlRFIoABWAKERERE6ADcKMzzu2hOgAAhERK8REWCWBERE36ERMHMEREvo6iEgY6hEn6Pu0mAzqkz/xjMzoDNwpERERDoAMzAKlERIoAAzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAA//8AAP//AADAOQAAgBkAAAAPAAAACQAAAAkAAAAIAAAACAAAAAgAAIAYAADAOAAA//8AAP//AAD//wAA</Image>
-<Url type="application/x-suggestions+json" method="GET"
-     template="http://ff.search.yahoo.com/gossip?output=fxjson&amp;command={searchTerms}" />
-<Url type="text/html" method="GET" template="http://dk.search.yahoo.com/search">
-  <Param name="p" value="{searchTerms}"/>
-  <Param name="ei" value="UTF-8"/>
-  <MozParam name="fr" condition="pref" pref="yahoo-fr" />
-</Url>
-<SearchForm>http://dk.search.yahoo.com/</SearchForm>
-</SearchPlugin>