[PALEMOON] Complete making Sync optional at build time

pull/1/head
NTD 4 years ago committed by Roy Tam
parent 528de62070
commit 38e84217a3
  1. 4
      application/palemoon/components/abouthome/aboutHome.css
  2. 2
      application/palemoon/components/abouthome/aboutHome.xhtml
  3. 2
      application/palemoon/components/abouthome/jar.mn
  4. 13
      application/palemoon/configure.in
  5. 4
      application/palemoon/locales/en-US/chrome/browser/aboutHome.dtd
  6. 2
      application/palemoon/locales/en-US/chrome/browser/browser.dtd
  7. 2
      application/palemoon/locales/jar.mn
  8. 4
      build/moz.configure/old.configure

@ -262,9 +262,11 @@ body[narrow] #restorePreviousSession {
content: url("chrome://browser/content/abouthome/addons.png");
}
%ifdef MOZ_SERVICES_SYNC
#sync::before {
content: url("chrome://browser/content/abouthome/sync.png");
}
%endif
#settings::before {
content: url("chrome://browser/content/abouthome/settings.png");
@ -320,9 +322,11 @@ body[narrow] #restorePreviousSession::before {
content: url("chrome://browser/content/abouthome/addons@2x.png");
}
%ifdef MOZ_SERVICES_SYNC
#sync::before {
content: url("chrome://browser/content/abouthome/sync@2x.png");
}
%endif
#settings::before {
content: url("chrome://browser/content/abouthome/settings@2x.png");

@ -51,7 +51,9 @@
<button class="launchButton" id="bookmarks">&abouthome.bookmarksButton.label;</button>
<button class="launchButton" id="history">&abouthome.historyButton.label;</button>
<button class="launchButton" id="addons">&abouthome.addonsButton.label;</button>
#ifdef MOZ_SERVICES_SYNC
<button class="launchButton" id="sync">&abouthome.syncButton.label;</button>
#endif
<button class="launchButton" id="settings">&abouthome.settingsButton.label;</button>
<div id="restorePreviousSessionSeparator"/>
<button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button>

@ -3,7 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
browser.jar:
content/browser/abouthome/aboutHome.xhtml
* content/browser/abouthome/aboutHome.xhtml
content/browser/abouthome/aboutHome.js
* content/browser/abouthome/aboutHome.css
content/browser/abouthome/noise.png

@ -27,3 +27,16 @@ if test -n "$MOZ_BROWSER_STATUSBAR"; then
fi
AC_SUBST(MOZ_BROWSER_STATUSBAR)
dnl ========================================================
dnl = Disable Sync
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(sync,
[ --disable-sync Disable Sync],
MOZ_SERVICES_SYNC=,
MOZ_SERVICES_SYNC=1)
if test -z "$MOZ_SERVICES_SYNC"; then
MOZ_SERVICES_CLOUDSYNC=
fi

@ -4,8 +4,10 @@
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
%brandDTD;
#ifdef MOZ_SERVICES_SYNC
<!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
%syncBrandDTD;
#endif
<!-- These strings are used in the about:home page -->
@ -19,4 +21,6 @@
<!ENTITY abouthome.addonsButton.label "Add-ons">
<!ENTITY abouthome.appsButton.label "Marketplace">
<!ENTITY abouthome.downloadsButton.label "Downloads">
#ifdef MOZ_SERVICES_SYNC
<!ENTITY abouthome.syncButton.label "&syncBrand.shortName.label;">
#endif

@ -567,6 +567,7 @@ just addresses the organization to follow, e.g. "This site is run by " -->
The word "toolbar" is appended automatically and should not be contained below! -->
<!ENTITY tabsToolbar.label "Browser tabs">
#ifdef MOZ_SERVICES_SYNC
<!-- LOCALIZATION NOTE (syncTabsMenu2.label): This appears in the history menu -->
<!ENTITY syncTabsMenu2.label "Tabs From Other Devices">
@ -577,6 +578,7 @@ just addresses the organization to follow, e.g. "This site is run by " -->
<!ENTITY syncSyncNowItem.label "Sync Now">
<!ENTITY syncSyncNowItem.accesskey "S">
<!ENTITY syncToolbarButton.label "Sync">
#endif
<!ENTITY addonBarCloseButton.tooltip "Close Add-on Bar">
<!ENTITY toggleAddonBarCmd.key "/">

@ -10,7 +10,7 @@
locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd)
locale/browser/aboutPrivateBrowsing.dtd (%chrome/browser/aboutPrivateBrowsing.dtd)
locale/browser/aboutRobots.dtd (%chrome/browser/aboutRobots.dtd)
locale/browser/aboutHome.dtd (%chrome/browser/aboutHome.dtd)
* locale/browser/aboutHome.dtd (%chrome/browser/aboutHome.dtd)
locale/browser/aboutSessionRestore.dtd (%chrome/browser/aboutSessionRestore.dtd)
#ifdef MOZ_SERVICES_SYNC
locale/browser/syncProgress.dtd (%chrome/browser/syncProgress.dtd)

@ -310,6 +310,10 @@ def old_configure_options(*options):
'--enable-calendar',
'--enable-incomplete-external-linkage',
# Below are configure flags used by Pale Moon
'--disable-browser-statusbar',
'--disable-sync',
# Below are configure flags used by Basilisk
'--disable-webextensions',
)

Loading…
Cancel
Save