3 files changed, 28 insertions, 49 deletions
diff --git a/application/palemoon/branding/shared/pref/preferences.inc b/application/palemoon/branding/shared/pref/preferences.inc
index a3cfcd138..721c2c90e 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
@@ -110,10 +73,21 @@ pref("image.mem.decode_bytes_at_a_time", 65536); //larger chunks
 
 // ============================================================================
 
-// ===| Misc. |================================================================
+// ===| Sync |=================================================================
+
+// Pale Moon Sync server URLs
+pref("services.sync.serverURL","https://pmsync.palemoon.org/sync/index.php/");
+pref("services.sync.jpake.serverURL","https://keyserver.palemoon.org/");
+pref("services.sync.termsURL", "http://www.palemoon.org/sync/terms.shtml");
+pref("services.sync.privacyURL", "http://www.palemoon.org/sync/privacy.shtml");
+pref("services.sync.statusURL", "https://pmsync.palemoon.org/status/");
+pref("services.sync.syncKeyHelpURL", "http://www.palemoon.org/sync/help/recoverykey.shtml");
+
+pref("services.sync.APILevel", 1); // FSyncMS doesn't support 'info/configuration' requests
 
-// 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
+// ============================================================================
+
+// ===| Misc. |================================================================
 
 // Make sure we shortcut out of a11y to save walking unnecessary code
 pref("accessibility.force_disabled", 1);
diff --git a/application/palemoon/branding/shared/pref/uaoverrides.inc b/application/palemoon/branding/shared/pref/uaoverrides.inc
index db9ccaffa..e5e727ee5 100644
--- a/application/palemoon/branding/shared/pref/uaoverrides.inc
+++ b/application/palemoon/branding/shared/pref/uaoverrides.inc
@@ -43,11 +43,6 @@ pref("@GUAO_PREF@.players.brightcove.net","Mozilla/5.0 (Windows NT 6.1; Trident/
 pref("@GUAO_PREF@.facebook.com","Mozilla/5.0 (@OS_SLICE@ rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)");
 pref("@GUAO_PREF@.fbcdn.net","Mozilla/5.0 (@OS_SLICE@ rv:99.9) @GK_SLICE@ Firefox/99.9 (Pale Moon)");
 
-#ifdef XP_UNIX
-// Google Fonts forces unicode ranges unless it is being told the browser is Firefox 43 or below.
-// They do NOT test for unicode-ranges CSS support.
-pref("@GUAO_PREF@.fonts.googleapis.com","Mozilla/5.0 (@OS_SLICE@ rv:43.0) @GK_SLICE@ Firefox/43.0");
-#endif
 
 // UA-Sniffing domains below are pending responses from their operators - temp workaround
 pref("@GUAO_PREF@.chase.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");
@@ -61,6 +56,8 @@ pref("@GUAO_PREF@.dailymotion.com","Mozilla/5.0 (@OS_SLICE@ rv:52.0) @GK_SLICE@
 // The following requires native mode. Or it blocks.. "too old firefox", breakage, etc.
 pref("@GUAO_PREF@.deviantart.com","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
 pref("@GUAO_PREF@.deviantart.net","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+pref("@GUAO_PREF@.altibox.dk","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
+pref("@GUAO_PREF@.altibox.no","Mozilla/5.0 (@OS_SLICE@ rv:@GRE_VERSION@) @GRE_DATE_SLICE@ @PM_SLICE@");
 
 // UA-Sniffing domains below have indicated no interest in supporting Pale Moon (BOO!)
 pref("@GUAO_PREF@.humblebundle.com","Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
diff --git a/application/palemoon/branding/unstable/pref/palemoon-branding.js b/application/palemoon/branding/unstable/pref/palemoon-branding.js
index dda6f86a5..2cd64fadb 100644
--- a/application/palemoon/branding/unstable/pref/palemoon-branding.js
+++ b/application/palemoon/branding/unstable/pref/palemoon-branding.js
@@ -12,7 +12,7 @@ pref("general.useragent.compatMode.gecko", true);
 pref("general.useragent.compatMode.firefox", true);
 
 // ========================= updates ========================
-#if defined(XP_WIN)
+#if defined(XP_WIN) || defined(XP_LINUX)
 // Enable auto-updates for this channel
 pref("app.update.auto", true);
 
@@ -26,13 +26,21 @@ pref("app.update.promptWaitTime", 86400);
 
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.
+#ifndef XP_LINUX
 pref("app.update.url.manual", "http://www.palemoon.org/unstable/");
-
+#else
+pref("app.update.url.manual", "http://linux.palemoon.org/download/unstable/");
+#endif
 // A default value for the "More information about this update" link
 // supplied in the "An update is available" page of the update wizard. 
+#ifndef XP_LINUX
 pref("app.update.url.details", "http://www.palemoon.org/unstable/");
 #else
-// Updates disabled (Linux, etc.)
+pref("app.update.url.details", "http://linux.palemoon.org/download/unstable/");
+#endif
+
+#else
+// Updates disabled (Mac, etc.)
 pref("app.update.enabled", false);
 pref("app.update.url", "");
 #endif