Reconfigure Pale Moon

Also fold a number of prefs back into the app prefs from shared branding prefs.
This resolves #555.

1 files changed, 1 insertions, 41 deletions

diff --git a/application/palemoon/branding/shared/pref/preferences.inc b/application/palemoon/branding/shared/pref/preferences.inc
index 7c47a9fef9..721c2c90ea 100644
--- a/application/palemoon/branding/shared/pref/preferences.inc
+++ b/application/palemoon/branding/shared/pref/preferences.inc
@@ -6,33 +6,15 @@
 pref("startup.homepage_welcome_url","http://www.palemoon.org/firstrun.shtml");
 
 pref("app.vendorURL", "http://www.palemoon.org/");
-pref("app.support.baseURL", "http://www.palemoon.org/support/");
-pref("browser.getdevtools.url","https://@APO_AM_URL@/external/devtools");
+
 
 // User Interface
-pref("browser.tabs.insertRelatedAfterCurrent", false); //use old method of tabbed browsing instead of "Chrome" style
-pref("browser.download.useDownloadDir", false); //don not use default download location as standard. ASK.
-pref("browser.search.context.loadInBackground", true); //don not swap focus to the context search tab.
-pref("browser.ctrlTab.previews", true);
-pref("browser.allTabs.previews", true);
-pref("browser.urlbar.trimURLs", false); //stop being a derp, Mozilla!
 pref("browser.identity.ssl_domain_display", 1); //show domain verified SSL (blue)
-pref("browser.urlbar.autoFill", true);
-pref("browser.urlbar.autoFill.typed", true);
-
-//Set tabs NOT on top
-pref("browser.tabs.onTop",false);
-
-// Download manager
-pref("browser.download.manager.flashCount", 10);
-pref("browser.download.manager.scanWhenDone", false); //NIB, make sure to disable to prevent hangups
-pref("browser.altClickSave", true); //SBaD,M! (#2)
 
 // ============================================================================
 
 // ===| Application Update Service |===========================================
 
-pref("app.update.auto", false);
 pref("app.update.url", "https://aus.palemoon.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%");
 
 // The time interval between the downloading of mar file chunks in the
@@ -42,35 +24,17 @@ pref("app.update.download.backgroundInterval", 600);
 // Give the user x seconds to react before showing the big UI. default=48 hours
 pref("app.update.promptWaitTime", 172800);
 
-// Additional Update fixes
-pref("app.update.cert.requireBuiltIn", false);
-
 // ============================================================================
 
 // ===| Add-ons Manager |======================================================
 
 // Add-on window fixes
-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/firefox");
-pref("extensions.getAddons.recommended.browseURL", "https://@APO_AM_URL@/external/recommended");
-pref("extensions.getAddons.recommended.url", "https://@APO_AM_URL@/internal/recommended?locale=%LOCALE%&os=%OS%");
-pref("extensions.getAddons.search.browseURL", "https://@APO_AM_URL@/external/search?q=%TERMS%");
-pref("extensions.getAddons.search.url", "https://@APO_AM_URL@/internal/search?q=%TERMS%&locale=%LOCALE%&os=%OS%&version=%VERSION%");
 pref("extensions.getMoreThemesURL", "https://@APO_AM_URL@/external/themes");
-pref("extensions.webservice.discoverURL","http://@APO_AM_URL@/internal/discover/");
-pref("extensions.getAddons.get.url","https://@APO_AM_URL@/internal/get?addonguid=%IDS%&os=%OS%&version=%VERSION%");
-pref("extensions.getAddons.getWithPerformance.url","https://@APO_AM_URL@/internal/get?addonguid=%IDS%&os=%OS%&version=%VERSION%");
-
-// Add-on updates: hard-code base Firefox version number.
-pref("extensions.update.background.url","https://@APO_AM_URL@/internal/update?@APO_AUS_ARGS@");
-pref("extensions.update.url","https://@APO_AM_URL@/internal/update?@APO_AUS_ARGS@");
 
 // Extensions Blocklist
 pref("extensions.blocklist.url","http://blocklist.palemoon.org/%VERSION%/blocklist.xml");
 pref("extensions.blocklist.itemURL", "http://blocklist.palemoon.org/info/?id=%blockID%");
 
-// Search engine fixes
-pref("browser.search.searchEnginesURL", "https://@APO_AM_URL@/external/searchplugins");
-
 // Dictionary URL
 pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
 
@@ -82,7 +46,6 @@ pref("extensions.getAddons.cache.enabled", false);
 
 // ===| DOM |==================================================================
 
-pref("dom.disable_window_status_change", false); //Allow status feedback by default
 // Set max script runtimes to sane values
 pref("dom.max_chrome_script_run_time", 90); //Some addons need ample time!
 pref("dom.max_script_run_time", 20); //Should be plenty for a page script to do what it needs
@@ -126,9 +89,6 @@ pref("services.sync.APILevel", 1); // FSyncMS doesn't support 'info/configuratio
 
 // ===| Misc. |================================================================
 
-// store sessions less frequently to prevent redundant mem usage by storing too much
-pref("browser.sessionstore.interval",60000); //every minute instead of every 10 seconds
-
 // Make sure we shortcut out of a11y to save walking unnecessary code
 pref("accessibility.force_disabled", 1);