From fe81171ed7b04d898cdfda09f7fe298a305af2eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 14 Mar 2016 18:24:23 -0300 Subject: Minor fix --- patches/iceape-branding/Branding.patch | 40 +++++++++++++++------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/patches/iceape-branding/Branding.patch b/patches/iceape-branding/Branding.patch index 97d2258..f6b9617 100644 --- a/patches/iceape-branding/Branding.patch +++ b/patches/iceape-branding/Branding.patch @@ -1,5 +1,5 @@ diff --git a/suite/browser/browser-prefs.js b/suite/browser/browser-prefs.js -index ee2803b..acc19a1 100644 +index ee2803b..f87dff8 100644 --- a/suite/browser/browser-prefs.js +++ b/suite/browser/browser-prefs.js @@ -92,7 +92,7 @@ pref("browser.findbar.enabled", true); @@ -7,35 +7,24 @@ index ee2803b..acc19a1 100644 // search engines URL -pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search/?atype=4"); -+pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search/?atype=4"); ++pref("browser.search.searchEnginesURL", "https://directory.fsf.org/wiki/GNU_IceCat"); // pointer to the default engine name pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties"); -@@ -615,7 +615,7 @@ pref("extensions.blocklist.interval", 86400); - pref("extensions.blocklist.level", 2); - pref("extensions.blocklist.url", "https://blocklist.addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/"); - pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/"); --pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%"); -+pref("extensions.blocklist.itemURL", "https://blocklist.addons.mozilla.org/%LOCALE%/seamonkey/blocked/%blockID%"); - - // Update preferences for installed Extensions and Themes. - // Symmetric (can be overridden by individual extensions), @@ -639,13 +639,13 @@ pref("extensions.autoDisableScopes", 15); // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations pref("extensions.getAddons.maxResults", 15); -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%"); --pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); ++pref("extensions.getAddons.get.url", "https://directory.fsf.org/wiki/GNU_IceCat"); + pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/%APP%/"); --pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=seamonkey"); ++pref("extensions.getAddons.link.url", "https://directory.fsf.org/wiki/GNU_IceCat"); + pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=seamonkey"); -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey"); -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); -+pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%"); -+pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -+pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/seamonkey/"); -+pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/seamonkey/api/%API_VERSION%/list/recommended/all/%MAX_RESULTS%/%OS%/%VERSION%?src=seamonkey"); -+pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search?q=%TERMS%"); ++pref("extensions.getAddons.search.browseURL", "https://directory.fsf.org/wiki/GNU_IceCat"); +pref("extensions.getAddons.search.url", "https://directory.fsf.org/wiki/GNU_IceCat"); +pref("extensions.webservice.discoverURL", "https://directory.fsf.org/wiki/GNU_IceCat"); @@ -57,10 +46,10 @@ index f9cd0b1..061e3f4 100644 + diff --git a/suite/locales/en-US/chrome/branding/brand.properties b/suite/locales/en-US/chrome/branding/brand.properties -index 3263135..1db1e12 100644 +index 3263135..71904cc 100644 --- a/suite/locales/en-US/chrome/branding/brand.properties +++ b/suite/locales/en-US/chrome/branding/brand.properties -@@ -2,9 +2,9 @@ +@@ -2,12 +2,11 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -71,8 +60,15 @@ index 3263135..1db1e12 100644 +brandShortName=Iceape +vendorShortName=SeaMonkey Council sidebarName=Sidebar - extensions.getMoreThemesURL=https://addons.mozilla.org/%LOCALE%/%APP%/complete-themes/ - extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/themes/?sort=up-and-coming +-extensions.getMoreThemesURL=https://addons.mozilla.org/%LOCALE%/%APP%/complete-themes/ +-extensions.getPersonasURL=https://addons.mozilla.org/%LOCALE%/%APP%/themes/?sort=up-and-coming +-spellchecker.dictionaries.download.url=https://addons.mozilla.org/%LOCALE%/%APP%/dictionaries +-app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/ +-app.vendorURL=http://www.seamonkey-project.org/ ++extensions.getMoreThemesURL=https://directory.fsf.org/wiki/GNU_IceCat ++extensions.getPersonasURL= ++app.releaseNotesURL= ++app.vendorURL= diff --git a/suite/moz.build b/suite/moz.build index 6d69b00..93ed038 100644 --- a/suite/moz.build -- cgit v1.2.3