86.0: Update according to upstream changes86.0-1

3 files changed, 21 insertions, 25 deletions

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
index 07050b9..2f40aff 100644
--- 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
@@ -21,15 +21,15 @@ index 52c35c7..af2c0cf 100644
  
  var ResetProfile = {
 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index fe63faa..66ca008 100644
+index 9c7cb46079..a6299593a1 100644
 --- a/toolkit/xre/nsAppRunner.cpp
 +++ b/toolkit/xre/nsAppRunner.cpp
-@@ -4349,7 +4349,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);
+@@ -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/iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch b/src/patches/iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch
index 5937ee4..8386737 100644
--- a/src/patches/iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch
+++ b/src/patches/iceweasel-branding/rebrand-about-dialog-and-licenses-page.patch
@@ -1,15 +1,15 @@
 diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
-index 5323aed9b1..1392ef9fd3 100644
+index fc6c382171..059bc7b65d 100644
 --- a/browser/base/content/aboutDialog.xhtml
 +++ b/browser/base/content/aboutDialog.xhtml
-@@ -137,8 +137,8 @@
-             <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"></label>
+@@ -151,8 +151,8 @@
+             <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"/>
            </description>
            <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">
--            <label is="text-link" href="https://donate.mozilla.org/?utm_source=firefox&#38;utm_medium=referral&#38;utm_campaign=firefox_about&#38;utm_content=firefox_about" data-l10n-name="helpus-donateLink"></label>
--            <label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"></label>
-+            <label is="text-link" href="https://wiki.parabola.nu/Donations" data-l10n-name="helpus-donateLink"></label>
-+            <label is="text-link" href="https://wiki.parabola.nu/How_to_help" data-l10n-name="helpus-getInvolvedLink"></label>
+-            <label is="text-link" href="https://donate.mozilla.org/?utm_source=firefox&#38;utm_medium=referral&#38;utm_campaign=firefox_about&#38;utm_content=firefox_about" data-l10n-name="helpus-donateLink"/>
+-            <label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/>
++            <label is="text-link" href="https://wiki.parabola.nu/Donations" data-l10n-name="helpus-donateLink"/>
++            <label is="text-link" href="https://wiki.parabola.nu/How_to_help" data-l10n-name="helpus-getInvolvedLink"/>
            </description>
          </vbox>
        </vbox>
diff --git a/src/tippytop/top_sites.json b/src/tippytop/top_sites.json
index 6dd309f..035ea46 100644
--- a/src/tippytop/top_sites.json
+++ b/src/tippytop/top_sites.json
@@ -1,25 +1,21 @@
 [
   {
-    "title": "wiki.parabola",
-    "url": "https://wiki.parabola.nu/",
+    "domains": ["wiki.parabola.nu"],
     "image_url": "images/parabola@2x.png",
     "favicon_url": "favicons/parabola.ico"
   },
   {
-    "title": "labs.parabola",
-    "url": "https://labs.parabola.nu/",
+    "domains": ["labs.parabola.nu"],
     "image_url": "images/parabola@2x.png",
     "favicon_url": "favicons/parabola.ico"
   },
   {
-    "title": "gnu",
-    "url": "https://www.gnu.org/",
+    "domains": ["gnu.org"],
     "image_url": "images/gnu@2x.png",
     "favicon_url": "favicons/gnu.ico"
   },
   {
-    "title": "libreplanet",
-    "url": "https://libreplanet.org/",
+    "domains": ["libreplanet.org"],
     "image_url": "images/libreplanet@2x.png",
     "favicon_url": "favicons/libreplanet.ico"
   }