summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/basilisk/app/Makefile.in2
-rw-r--r--application/basilisk/app/moz.build2
-rw-r--r--application/basilisk/app/profile/basilisk.js (renamed from application/basilisk/app/profile/firefox.js)4
-rw-r--r--application/basilisk/branding/official/pref/basilisk-branding.js (renamed from application/basilisk/branding/official/pref/firefox-branding.js)0
-rw-r--r--application/basilisk/branding/shared/branding.mozbuild2
-rw-r--r--application/basilisk/branding/unofficial/pref/basilisk-branding.js (renamed from application/basilisk/branding/unofficial/pref/firefox-branding.js)0
-rw-r--r--application/basilisk/installer/package-manifest.in4
7 files changed, 7 insertions, 7 deletions
diff --git a/application/basilisk/app/Makefile.in b/application/basilisk/app/Makefile.in
index d807b4337..4a3b9758e 100644
--- a/application/basilisk/app/Makefile.in
+++ b/application/basilisk/app/Makefile.in
@@ -42,7 +42,7 @@ libs::
cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
endif
-GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, firefox.js)
+GARBAGE += $(addprefix $(FINAL_TARGET)/defaults/pref/, basilisk.js)
endif
diff --git a/application/basilisk/app/moz.build b/application/basilisk/app/moz.build
index 1004e280c..72f34d575 100644
--- a/application/basilisk/app/moz.build
+++ b/application/basilisk/app/moz.build
@@ -9,7 +9,7 @@ DIRS += ['profile/extensions']
GeckoProgram(CONFIG['MOZ_APP_NAME'])
JS_PREFERENCE_PP_FILES += [
- 'profile/firefox.js',
+ 'profile/basilisk.js',
]
SOURCES += [
diff --git a/application/basilisk/app/profile/firefox.js b/application/basilisk/app/profile/basilisk.js
index 196f505fa..2df95a97f 100644
--- a/application/basilisk/app/profile/firefox.js
+++ b/application/basilisk/app/profile/basilisk.js
@@ -77,7 +77,7 @@ pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/f
pref("app.update.checkInstallTime", true);
// The number of days a binary is permitted to be old without checking is defined in
-// firefox-branding.js (app.update.checkInstallTime.days)
+// basilisk-branding.js (app.update.checkInstallTime.days)
// The minimum delay in seconds for the timer to fire between the notification
// of each consumer of the timer manager.
@@ -92,7 +92,7 @@ pref("app.update.timerFirstInterval", 30000);
// App-specific update preferences
// The interval to check for updates (app.update.interval) is defined in
-// firefox-branding.js
+// basilisk-branding.js
// Alternative windowtype for an application update user interface window. When
// a window with this windowtype is open the application update service won't
diff --git a/application/basilisk/branding/official/pref/firefox-branding.js b/application/basilisk/branding/official/pref/basilisk-branding.js
index 190b84e78..190b84e78 100644
--- a/application/basilisk/branding/official/pref/firefox-branding.js
+++ b/application/basilisk/branding/official/pref/basilisk-branding.js
diff --git a/application/basilisk/branding/shared/branding.mozbuild b/application/basilisk/branding/shared/branding.mozbuild
index e6fee3f4e..823439c3f 100644
--- a/application/basilisk/branding/shared/branding.mozbuild
+++ b/application/basilisk/branding/shared/branding.mozbuild
@@ -7,7 +7,7 @@
@template
def ApplicationBranding():
JS_PREFERENCE_PP_FILES += [
- 'pref/firefox-branding.js',
+ 'pref/basilisk-branding.js',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
diff --git a/application/basilisk/branding/unofficial/pref/firefox-branding.js b/application/basilisk/branding/unofficial/pref/basilisk-branding.js
index a5b617a53..a5b617a53 100644
--- a/application/basilisk/branding/unofficial/pref/firefox-branding.js
+++ b/application/basilisk/branding/unofficial/pref/basilisk-branding.js
diff --git a/application/basilisk/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in
index 6f80a7882..c446d3687 100644
--- a/application/basilisk/installer/package-manifest.in
+++ b/application/basilisk/installer/package-manifest.in
@@ -636,8 +636,8 @@
; [Default Preferences]
; All the pref files must be part of base to prevent migration bugs
-@RESPATH@/browser/@PREF_DIR@/firefox.js
-@RESPATH@/browser/@PREF_DIR@/firefox-branding.js
+@RESPATH@/browser/@PREF_DIR@/basilisk.js
+@RESPATH@/browser/@PREF_DIR@/basilisk-branding.js
@RESPATH@/greprefs.js
@RESPATH@/defaults/autoconfig/prefcalls.js
@RESPATH@/browser/defaults/permissions