diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2022-03-13 03:06:08 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-03-14 12:01:00 -0400 |
| commit | c6a6a8234d0bdfb9a5692db0f64dfa51db6023c7 (patch) | |
| tree | 3a32eeebcd28152b37d364471b6b606c14837b77 /src | |
| parent | 819499bc1fdb4c6dc861e00e1938f1e447702bbf (diff) | |
rename user profile dir
this corresponds to (requires) the change in abslibre.git
with commit message: [iceweasel]: rename user profile dir
Diffstat (limited to 'src')
| -rwxr-xr-x | src/branding/configure.sh | 3 | ||||
| -rw-r--r-- | src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile.patch | 35 | ||||
| -rw-r--r-- | src/patches/series | 1 |
3 files changed, 1 insertions, 38 deletions
diff --git a/src/branding/configure.sh b/src/branding/configure.sh index 2b6e246..4d25dfd 100755 --- a/src/branding/configure.sh +++ b/src/branding/configure.sh @@ -31,5 +31,4 @@ MOZ_APP_DISPLAYNAME=Iceweasel MOZ_APP_NAME=iceweasel MOZ_APP_BASENAME=Iceweasel -MOZ_APP_PROFILE=mozilla/firefox - +MOZ_APP_PROFILE=mozilla/iceweasel diff --git a/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile.patch b/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile.patch deleted file mode 100644 index 2f40aff..0000000 --- a/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Mike Hommey <mh@glandium.org> -Date: Sun, 11 May 2014 15:08:37 +0900 -Subject: Use "firefox" instead of MOZ_APP_NAME for profile reset - ---- - toolkit/modules/ResetProfile.jsm | 2 +- - toolkit/xre/nsAppRunner.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/toolkit/modules/ResetProfile.jsm b/toolkit/modules/ResetProfile.jsm -index 52c35c7..af2c0cf 100644 ---- a/toolkit/modules/ResetProfile.jsm -+++ b/toolkit/modules/ResetProfile.jsm -@@ -11,7 +11,7 @@ var EXPORTED_SYMBOLS = ["ResetProfile"]; - "resource://gre/modules/AppConstants.jsm" - ); - --const MOZ_APP_NAME = AppConstants.MOZ_APP_NAME; -+const MOZ_APP_NAME = "firefox"; - const MOZ_BUILD_APP = AppConstants.MOZ_BUILD_APP; - - var ResetProfile = { -diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index 9c7cb46079..a6299593a1 100644 ---- a/toolkit/xre/nsAppRunner.cpp -+++ b/toolkit/xre/nsAppRunner.cpp -@@ -4879,7 +4879,7 @@ nsresult XREMain::XRE_mainRun() { - if (gDoProfileReset) { - // Automatically migrate from the current application if we just - // reset the profile. -- aKey = MOZ_APP_NAME; -+ aKey = "firefox"; - gResetOldProfile->GetName(aName); - } - pm->Migrate(&mDirProvider, aKey, aName); diff --git a/src/patches/series b/src/patches/series index df44a3a..834ae52 100644 --- a/src/patches/series +++ b/src/patches/series @@ -1,7 +1,6 @@ iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.patch iceweasel-branding/MOZ_APP_VENDOR.patch iceweasel-branding/Determine-which-phishing-shavar-to-use.patch -iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile.patch iceweasel-branding/Allowed-dupes_for_Iceweasel.patch iceweasel-branding/enable-object-directory-paths.patch iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch |