From 1407452985729d1e3eea31a2589187446fc2c7f2 Mon Sep 17 00:00:00 2001 From: Anthony Lieuallen Date: Sun, 6 Sep 2009 19:08:02 +0000 Subject: [PATCH] Fixes #282 * Replace "MSN" with "Bing" engine. --- content/netError.xhtml | 4 ++-- content/resurrect-select-mirror.xul | 4 ++-- content/resurrect.js | 20 +++++++++++--------- locale/ca-AD/overlay.dtd | 2 +- locale/da-DK/overlay.dtd | 2 +- locale/de-DE/overlay.dtd | 2 +- locale/el-GR/overlay.dtd | 2 +- locale/en-US/overlay.dtd | 2 +- locale/es-AR/overlay.dtd | 2 +- locale/es-CL/overlay.dtd | 2 +- locale/es-ES/overlay.dtd | 2 +- locale/fi-FI/overlay.dtd | 2 +- locale/fr-FR/overlay.dtd | 2 +- locale/hr-HR/overlay.dtd | 2 +- locale/it-IT/overlay.dtd | 2 +- locale/ja-JP/overlay.dtd | 2 +- locale/ko-KR/overlay.dtd | 2 +- locale/nl-NL/overlay.dtd | 2 +- locale/pl-PL/overlay.dtd | 2 +- locale/pt-BR/overlay.dtd | 2 +- locale/pt-PT/overlay.dtd | 2 +- locale/ru-RU/overlay.dtd | 2 +- locale/sl-SI/overlay.dtd | 2 +- locale/uk-UA/overlay.dtd | 2 +- locale/zh-TW/overlay.dtd | 2 +- skin/cacheicons/bing.png | Bin 0 -> 506 bytes skin/cacheicons/msn.png | Bin 835 -> 0 bytes 27 files changed, 37 insertions(+), 35 deletions(-) create mode 100755 skin/cacheicons/bing.png delete mode 100644 skin/cacheicons/msn.png diff --git a/content/netError.xhtml b/content/netError.xhtml index d691d3b..8e97996 100644 --- a/content/netError.xhtml +++ b/content/netError.xhtml @@ -395,8 +395,8 @@ image='chrome://resurrect/skin/cacheicons/archive.png' /> en-USOffWeb01All'; - + case 'bing': var xhr=new XMLHttpRequest(); - xhr.open('POST', 'http://soap.search.msn.com/webservices.asmx', false); - xhr.setRequestHeader('Content-Type', 'text/xml; charset=ISO-8859-1'); - xhr.setRequestHeader('SOAPAction', '""'); - xhr.send(soapBody); + xhr.open('GET', + 'http://api.search.live.net/xml.aspx'+ + '?AppId=FD382E93B5ABC456C5E34C238A906CAB1E6F9875'+ + '&Query=url:'+encUrl+ + '&Sources=web&Web.Count=1', + false + ); + xhr.send(null); try { - var c=xhr.responseXML.getElementsByTagName('CacheUrl'); + var c=xhr.responseXML.getElementsByTagName('web:CacheUrl'); gotoUrl=c[0].textContent; } catch (e) { - gotoUrl='http://search.msn.com/results.aspx?q=url:'+encUrl; + gotoUrl='http://www.bing.com/search?q=url:'+encUrl; } break; diff --git a/locale/ca-AD/overlay.dtd b/locale/ca-AD/overlay.dtd index 9849bce..0ffd5f5 100644 --- a/locale/ca-AD/overlay.dtd +++ b/locale/ca-AD/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/da-DK/overlay.dtd b/locale/da-DK/overlay.dtd index 1021b76..14d8674 100644 --- a/locale/da-DK/overlay.dtd +++ b/locale/da-DK/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/de-DE/overlay.dtd b/locale/de-DE/overlay.dtd index 46ed1eb..5894ccc 100644 --- a/locale/de-DE/overlay.dtd +++ b/locale/de-DE/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/el-GR/overlay.dtd b/locale/el-GR/overlay.dtd index 2aa1008..0a54f68 100644 --- a/locale/el-GR/overlay.dtd +++ b/locale/el-GR/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/en-US/overlay.dtd b/locale/en-US/overlay.dtd index d5f44a2..ace6d2e 100644 --- a/locale/en-US/overlay.dtd +++ b/locale/en-US/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/es-AR/overlay.dtd b/locale/es-AR/overlay.dtd index 100bd4f..1b10f37 100644 --- a/locale/es-AR/overlay.dtd +++ b/locale/es-AR/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/es-CL/overlay.dtd b/locale/es-CL/overlay.dtd index 100bd4f..1b10f37 100644 --- a/locale/es-CL/overlay.dtd +++ b/locale/es-CL/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/es-ES/overlay.dtd b/locale/es-ES/overlay.dtd index 231b731..d911db0 100644 --- a/locale/es-ES/overlay.dtd +++ b/locale/es-ES/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/fi-FI/overlay.dtd b/locale/fi-FI/overlay.dtd index a560194..c7fe7d0 100644 --- a/locale/fi-FI/overlay.dtd +++ b/locale/fi-FI/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/fr-FR/overlay.dtd b/locale/fr-FR/overlay.dtd index 9c9236e..4aa7afb 100644 --- a/locale/fr-FR/overlay.dtd +++ b/locale/fr-FR/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/hr-HR/overlay.dtd b/locale/hr-HR/overlay.dtd index 08f82bf..75ab45e 100644 --- a/locale/hr-HR/overlay.dtd +++ b/locale/hr-HR/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/it-IT/overlay.dtd b/locale/it-IT/overlay.dtd index d277907..cbaf535 100644 --- a/locale/it-IT/overlay.dtd +++ b/locale/it-IT/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/ja-JP/overlay.dtd b/locale/ja-JP/overlay.dtd index 636daac..8cac58f 100644 --- a/locale/ja-JP/overlay.dtd +++ b/locale/ja-JP/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/ko-KR/overlay.dtd b/locale/ko-KR/overlay.dtd index c45c4f2..48ab512 100644 --- a/locale/ko-KR/overlay.dtd +++ b/locale/ko-KR/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/nl-NL/overlay.dtd b/locale/nl-NL/overlay.dtd index d32dbc1..f914bec 100644 --- a/locale/nl-NL/overlay.dtd +++ b/locale/nl-NL/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/pl-PL/overlay.dtd b/locale/pl-PL/overlay.dtd index e0fe104..460cef1 100644 --- a/locale/pl-PL/overlay.dtd +++ b/locale/pl-PL/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/pt-BR/overlay.dtd b/locale/pt-BR/overlay.dtd index ca94557..9c08894 100644 --- a/locale/pt-BR/overlay.dtd +++ b/locale/pt-BR/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/pt-PT/overlay.dtd b/locale/pt-PT/overlay.dtd index ff3c97c..5e9bed1 100644 --- a/locale/pt-PT/overlay.dtd +++ b/locale/pt-PT/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/ru-RU/overlay.dtd b/locale/ru-RU/overlay.dtd index 30b0db9..ee8cdcc 100644 --- a/locale/ru-RU/overlay.dtd +++ b/locale/ru-RU/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/sl-SI/overlay.dtd b/locale/sl-SI/overlay.dtd index b0717f6..02bb1fa 100644 --- a/locale/sl-SI/overlay.dtd +++ b/locale/sl-SI/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/uk-UA/overlay.dtd b/locale/uk-UA/overlay.dtd index d0da8a7..d0e609e 100644 --- a/locale/uk-UA/overlay.dtd +++ b/locale/uk-UA/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/locale/zh-TW/overlay.dtd b/locale/zh-TW/overlay.dtd index c0d1317..b1ddffb 100644 --- a/locale/zh-TW/overlay.dtd +++ b/locale/zh-TW/overlay.dtd @@ -9,7 +9,7 @@ - + diff --git a/skin/cacheicons/bing.png b/skin/cacheicons/bing.png new file mode 100755 index 0000000000000000000000000000000000000000..67ef4dbdb4c4279b9b2573c4142ba980c7f51ceb GIT binary patch literal 506 zcmVT{1P4`ah68zujHDXC#6TgS*Z>xEfeTN*|KD)wGsA_a-x)r9{|6Qm z;ACPjkmdw>lM9G>7_o+df)FcM;K94!cx?o!Yw!|dNH7;Kc&i>{YnH><{1nGBCjc59U`e5VOWKKtKng3Fv}@cfKKFp<&yr z{|(z;VTQrWqYMnMjzLrjY6HW;3(O3d{fJ@X<xRppP+|d=^x=tO!u~h^K?*?rLXXyu&;$hwIFQZ2v;a*9Xkf#oPyY|x w{t8TqKTyOCfZj8Z;eaO~coh^ojca7!s(%RnuZ~5oa(#4mHxe+k;CeVfz6fdThKg;UL zw^(ql;CF^es|6bEklVj6p@yLD0-S~Ki`Ia^8dK3FBw-2cmWg`&EP>HL7elB0>x=aAx)>?@Z`srGD4-BEh3tO{(+R@*-NHVBDHw;?P892XOWN)~PS6 zI^%hb0aLI?R{zHQCNn8_tx)=aONDo-Wee1MEgH=RUdyI1J%?c$y<`wZ>Z>2$16R-v zbee8Nx);c{MjW)dd+?u-t=uFVCm7SRc*zu6@EhgiE8Xqn$#T=V^yA|eSSAfAZ`BU5 z9iKOfgBXo(KsR9jix94p=sm!Ss%*NG9sv+yzX@-UdKig5Tx>4i8{xYYJyui>vlKb^4*UCBiX+pFDsT6EI zkw%f^jt{nqGjjAFE4!XAYoUA3%tX64)&AqoPopbuqG-}