diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-04-17 20:22:59 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-04-17 20:22:59 +0200 |
| commit | 3eb4310cd889e6c8d22c27f0326273acf0a3e8bf (patch) | |
| tree | 508827a64a5ad5c2d465535afea68eee39775a11 /application/basilisk/components/preferences/in-content/preferences.xul | |
| parent | 07381c3edad8ec24b5d820ec0592e0cafa7d73fa (diff) | |
| parent | 1e868fadf94935bcb4a49ea5eec776d84fe2d1e7 (diff) | |
| download | UXP-3eb4310cd889e6c8d22c27f0326273acf0a3e8bf.tar UXP-3eb4310cd889e6c8d22c27f0326273acf0a3e8bf.tar.gz UXP-3eb4310cd889e6c8d22c27f0326273acf0a3e8bf.tar.lz UXP-3eb4310cd889e6c8d22c27f0326273acf0a3e8bf.tar.xz UXP-3eb4310cd889e6c8d22c27f0326273acf0a3e8bf.zip | |
Merge branch 'Sync-weave'
Diffstat (limited to 'application/basilisk/components/preferences/in-content/preferences.xul')
| -rw-r--r-- | application/basilisk/components/preferences/in-content/preferences.xul | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/application/basilisk/components/preferences/in-content/preferences.xul b/application/basilisk/components/preferences/in-content/preferences.xul index 093516140..61639aa19 100644 --- a/application/basilisk/components/preferences/in-content/preferences.xul +++ b/application/basilisk/components/preferences/in-content/preferences.xul @@ -22,8 +22,10 @@ <!ENTITY % privacyDTD SYSTEM "chrome://browser/locale/preferences/privacy.dtd"> <!ENTITY % tabsDTD SYSTEM "chrome://browser/locale/preferences/tabs.dtd"> <!ENTITY % searchDTD SYSTEM "chrome://browser/locale/preferences/search.dtd"> +#ifdef MOZ_SERVICES_SYNC <!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd"> <!ENTITY % syncDTD SYSTEM "chrome://browser/locale/preferences/sync.dtd"> +#endif <!ENTITY % securityDTD SYSTEM "chrome://browser/locale/preferences/security.dtd"> <!ENTITY % sanitizeDTD SYSTEM "chrome://browser/locale/sanitize.dtd"> @@ -40,8 +42,10 @@ %privacyDTD; %tabsDTD; %searchDTD; +#ifdef MOZ_SERVICES_SYNC %syncBrandDTD; %syncDTD; +#endif %securityDTD; %sanitizeDTD; %mainDTD; @@ -140,6 +144,7 @@ <label class="category-name" flex="1">&paneSecurity.title;</label> </richlistitem> +#ifdef MOZ_SERVICES_SYNC <richlistitem id="category-sync" class="category" value="paneSync" @@ -149,6 +154,7 @@ <image class="category-icon"/> <label class="category-name" flex="1">&paneSync.title;</label> </richlistitem> +#endif <richlistitem id="category-advanced" class="category" @@ -177,7 +183,9 @@ #include applications.xul #include content.xul #include security.xul +#ifdef MOZ_SERVICES_SYNC #include sync.xul +#endif </prefpane> </vbox> |