From ff89b8a44dcef7692d57e71a48d4eae876d19041 Mon Sep 17 00:00:00 2001 From: "alqahira%ardisson.org" Date: Mon, 1 Feb 2010 00:00:12 +0000 Subject: [PATCH] Back out changes not associated with bug 537993 that accidentally landed with bug 537993 git-svn-id: svn://10.0.0.236/trunk@259532 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/camino/Makefile.in | 1 - mozilla/camino/makefiles.sh | 1 - mozilla/camino/resources/application/all-camino.js.in | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/mozilla/camino/Makefile.in b/mozilla/camino/Makefile.in index ecde6e1c77b..2e4922fcd3b 100644 --- a/mozilla/camino/Makefile.in +++ b/mozilla/camino/Makefile.in @@ -49,7 +49,6 @@ DIRS = \ flashblock \ idl \ pinstripe \ - places \ striptease \ safebrowsing \ $(NULL) diff --git a/mozilla/camino/makefiles.sh b/mozilla/camino/makefiles.sh index 94fbe85a047..8db5bb88366 100644 --- a/mozilla/camino/makefiles.sh +++ b/mozilla/camino/makefiles.sh @@ -44,7 +44,6 @@ camino/flashblock/Makefile camino/idl/Makefile camino/installer/Makefile camino/pinstripe/Makefile -camino/places/Makefile camino/striptease/Makefile camino/safebrowsing/Makefile " diff --git a/mozilla/camino/resources/application/all-camino.js.in b/mozilla/camino/resources/application/all-camino.js.in index a1119dbe55c..dfb4f3f60ba 100644 --- a/mozilla/camino/resources/application/all-camino.js.in +++ b/mozilla/camino/resources/application/all-camino.js.in @@ -238,7 +238,7 @@ pref("browser.safebrowsing.provider.0.reportMalwareURL", "http://www.google.com/ pref("browser.safebrowsing.provider.0.reportMalwareErrorURL", "http://google.com/safebrowsing/diagnostic?tpl={moz:client}&site=%REPORTED_URL%&hl=%LANGUAGE%"); // URL the user is forwarded to after submitting an error report -pref("browser.safebrowsing.sendToURLAfterReporting", "http://caminobrowser.org/documentation/security/report-submitted/"); +pref("browser.safebrowsing.sendToURLAfterReporting", "http://caminobrowser.org/security/report-submitted.php"); // Location of more information about the safe browsing feature pref("browser.safebrowsing.warning.infoURL", "http://caminobrowser.org/documentation/security/#safebrowsing");