Bug 1247562 - Hardcode the yahoo-fr preference value into Yahoo searchplugins, pt. 2
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Wed, 17 Feb 2016 14:31:42 +0100
changeset 2034 4fa0c95d172b5ae46fac8f8c477682613a25978b
parent 2033 f0a466c1aa1c509553d4d45f7610cacd23fbb04a
child 2035 80d9d9de718ae6a922431c46521d3124b639c903
push id1104
push useraxel@mozilla.com
push dateMon, 07 Mar 2016 14:30:53 +0000
bugs1247562
Bug 1247562 - Hardcode the yahoo-fr preference value into Yahoo searchplugins, pt. 2
browser/searchplugins/yahoo-jp-auctions.xml
browser/searchplugins/yahoo-jp.xml
--- a/browser/searchplugins/yahoo-jp-auctions.xml
+++ b/browser/searchplugins/yahoo-jp-auctions.xml
@@ -5,13 +5,13 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>ヤフオク!</ShortName>
 <Description>ヤフオク! 検索</Description>
 <InputEncoding>EUC-JP</InputEncoding>
 <Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAEJGlDQ1BJQ0MgUHJvZmlsZQAAOBGFVd9v21QUPolvUqQWPyBYR4eKxa9VU1u5GxqtxgZJk6XtShal6dgqJOQ6N4mpGwfb6baqT3uBNwb8AUDZAw9IPCENBmJ72fbAtElThyqqSUh76MQPISbtBVXhu3ZiJ1PEXPX6yznfOec7517bRD1fabWaGVWIlquunc8klZOnFpSeTYrSs9RLA9Sr6U4tkcvNEi7BFffO6+EdigjL7ZHu/k72I796i9zRiSJPwG4VHX0Z+AxRzNRrtksUvwf7+Gm3BtzzHPDTNgQCqwKXfZwSeNHHJz1OIT8JjtAq6xWtCLwGPLzYZi+3YV8DGMiT4VVuG7oiZpGzrZJhcs/hL49xtzH/Dy6bdfTsXYNY+5yluWO4D4neK/ZUvok/17X0HPBLsF+vuUlhfwX4j/rSfAJ4H1H0qZJ9dN7nR19frRTeBt4Fe9FwpwtN+2p1MXscGLHR9SXrmMgjONd1ZxKzpBeA71b4tNhj6JGoyFNp4GHgwUp9qplfmnFW5oTdy7NamcwCI49kv6fN5IAHgD+0rbyoBc3SOjczohbyS1drbq6pQdqumllRC/0ymTtej8gpbbuVwpQfyw66dqEZyxZKxtHpJn+tZnpnEdrYBbueF9qQn93S7HQGGHnYP7w6L+YGHNtd1FJitqPAR+hERCNOFi1i1alKO6RQnjKUxL1GNjwlMsiEhcPLYTEiT9ISbN15OY/jx4SMshe9LaJRpTvHr3C/ybFYP1PZAfwfYrPsMBtnE6SwN9ib7AhLwTrBDgUKcm06FSrTfSj187xPdVQWOk5Q8vxAfSiIUc7Z7xr6zY/+hpqwSyv0I0/QMTRb7RMgBxNodTfSPqdraz/sDjzKBrv4zu2+a2t0/HHzjd2Lbcc2sG7GtsL42K+xLfxtUgI7YHqKlqHK8HbCCXgjHT1cAdMlDetv4FnQ2lLasaOl6vmB0CMmwT/IPszSueHQqv6i/qluqF+oF9TfO2qEGTumJH0qfSv9KH0nfS/9TIp0Wboi/SRdlb6RLgU5u++9nyXYe69fYRPdil1o1WufNSdTTsp75BfllPy8/LI8G7AUuV8ek6fkvfDsCfbNDP0dvRh0CrNqTbV7LfEEGDQPJQadBtfGVMWEq3QWWdufk6ZSNsjG2PQjp3ZcnOWWing6noonSInvi0/Ex+IzAreevPhe+CawpgP1/pMTMDo64G0sTCXIM+KdOnFWRfQKdJvQzV1+Bt8OokmrdtY2yhVX2a+qrykJfMq4Ml3VR4cVzTQVz+UoNne4vcKLoyS+gyKO6EHe+75Fdt0Mbe5bRIf/wjvrVmhbqBN97RD1vxrahvBOfOYzoosH9bq94uejSOQGkVM6sN/7HelL4t10t9F4gPdVzydEOx83Gv+uNxo7XyL/FtFl8z9ZAHF4bBsrEwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAKNJREFUOBHFkVELgzAMhHND2f7/r50oRK/jymEVC31YX5ImuS9pisyMkfMaEVP7fwDWeN8uYcovnp4ILhFAHqBaO8dS/COHDZ/bBiwqO2ChdyOMMRZ4nGC/VwAdHk+qsyzFgv6qIxhrfuEK4mIBBWkA50lcLBGt4pMHe3xOyKXrOeUXXHgeUTkKlfNnNgDSJXJbO1p35huAi3r8yyX2CFUzDNgBKmdd7X70FZwAAAAASUVORK5CYII=</Image>
 <Url type="text/html" method="GET" template="http://auctions.search.yahoo.co.jp/search" resultdomain="yahoo.co.jp">
   <Param name="p" value="{searchTerms}"/>
   <Param name="ei" value="EUC-JP"/>
-  <MozParam name="fr" condition="pref" pref="yahoo-fr-ja" />
+  <Param name="fr" value="mozff" />
   <Param name="rls" value="{moz:distributionID}:ja-JP:{moz:official}"/>
 </Url>
 <SearchForm>http://auctions.yahoo.co.jp/</SearchForm>
 </SearchPlugin>
--- a/browser/searchplugins/yahoo-jp.xml
+++ b/browser/searchplugins/yahoo-jp.xml
@@ -5,12 +5,12 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Yahoo! JAPAN</ShortName>
 <Description>Yahoo Search</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUFBf8FBQX/BQUF/wUFBf8FBQX/BQUF/wAAAAAAAAAABQUF/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8AAAAACQD7/wkA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAPv/CQD7/wUFBf8AAAAAAAAAAAAAAAAAAAAABQUF/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQD7/wkA+/8FBQX/AAAAAAAAAAAAAAAACQD7/wkA+/8FBQX/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/CQD7/wUFBf8AAAAAAAAAAAkA+/8JAPv/CQD7/wUFBf8AAAAAAAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/AAAAAAkA+/8JAPv/BQUF/wAAAAAAAAAACQD7/wkA+/8FBQX/AAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/AAAAAAAAAAAAAAAACQD7/wkA+/8FBQX/AAAAAAkA+/8JAPv/CQD7/wAAAAAFBQX/CQD7/wkA+/8JAPv/BQUF/wUFBf8AAAAACQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//AAD//wAA//8AAPA3AADwJwAA/HsAAPxxAAD4MAAA8RgAAOOIAACBAAAAAf8AAP//AAD//wAA//8AAP//AAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAATCwAAEwsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQUF/wUFBf8FBQX/BQUF/wUFBf8FBQX/BQUF/wUFBf8FBQX/BQUF/wUFBf8FBQX/AAAAAAAAAAAAAAAABQUF/wUFBf8FBQX/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wUFBf8AAAAAAAAAAAkA+/8JAPv/CQD7/wUFBf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/AAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/BQUF/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/CQD7/wkA+/8FBQX/AAAAAAAAAAAAAAAAAAAAAAAAAAAJAPv/CQD7/wkA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAPv/CQD7/wkA+/8JAPv/CQD7/wUFBf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUFBf8FBQX/BQUF/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkA+/8JAPv/CQD7/wkA+/8JAPv/BQUF/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAPv/CQD7/wkA+/8FBQX/BQUF/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/CQD7/wkA+/8FBQX/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkA+/8JAPv/CQD7/wkA+/8FBQX/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wUFBf8FBQX/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/CQD7/wUFBf8FBQX/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wUFBf8FBQX/AAAAAAAAAAAAAAAAAAAAAAAAAAAJAPv/CQD7/wkA+/8JAPv/CQD7/wUFBf8FBQX/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wUFBf8FBQX/AAAAAAAAAAAAAAAAAAAAAAAAAAAJAPv/CQD7/wkA+/8JAPv/CQD7/wUFBf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8AAAAACQD7/wkA+/8JAPv/CQD7/wUFBf8FBQX/AAAAAAAAAAAAAAAAAAAAAAkA+/8JAPv/CQD7/wkA+/8JAPv/BQUF/wUFBf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/AAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/CQD7/wUFBf8FBQX/AAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/BQUF/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wAAAAAAAAAAAAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/CQD7/wUFBf8FBQX/BQUF/wAAAAAAAAAACQD7/wkA+/8JAPv/CQD7/wkA+/8FBQX/AAAAAAAAAAAAAAAAAAAAAAAAAAAJAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAUFBf8FBQX/CQD7/wkA+/8JAPv/CQD7/wkA+/8FBQX/BQUF/wUFBf8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8AAAAAAAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/AAAAAAAAAAAAAAAAAAAAAAAAAAAJAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/BQUF/wkA+/8JAPv/CQD7/wkA+/8JAPv/AAAAAAAAAAAFBQX/BQUF/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wUFBf8FBQX/BQUF/wUFBf8FBQX/AAAAAAkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8AAAAAAAAAAAkA+/8JAPv/AAAAAAAAAAAAAAAACQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wUFBf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/CQD7/wkA+/8JAPv/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////////////////////////////////////wAOP/4ADD/+ABw//+B8f//gf4//4H8H/+B/B//APwP/wB8B/4APgf8CB4D+BwOA/A+AwPgfAADwPgABgAIAZwAD//8AB///////////////////////////////////</Image>
 <Url type="text/html" method="GET" template="http://search.yahoo.co.jp/search" resultdomain="yahoo.co.jp">
   <Param name="p" value="{searchTerms}"/>
   <Param name="ei" value="UTF-8"/>
-  <MozParam name="fr" condition="pref" pref="yahoo-fr-ja" />
+  <Param name="fr" value="mozff" />
 </Url>
 <SearchForm>http://search.yahoo.co.jp/</SearchForm>
 </SearchPlugin>