Merge ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 9 insertions, 9 deletions

diff --git a/~emulatorman/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/~emulatorman/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index 69fe5c072..f59454192 100644
--- a/~emulatorman/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/~emulatorman/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -67,7 +67,7 @@ index d7fec75..d531b83 100644
  component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js

  contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}

 diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js

-index a6598fe..8f83da8 100644

+index 52722e9..0448444 100644

 --- a/browser/components/migration/src/FirefoxProfileMigrator.js

 +++ b/browser/components/migration/src/FirefoxProfileMigrator.js

 @@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {

@@ -78,12 +78,12 @@ index a6598fe..8f83da8 100644
 +FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";

  FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");

  

- const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);

+ this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);

 diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm

-index 0669aa8..19552e3 100644

+index 1f60879..fc83a99 100644

 --- a/browser/components/migration/src/MigrationUtils.jsm

 +++ b/browser/components/migration/src/MigrationUtils.jsm

-@@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({

+@@ -403,11 +403,6 @@ this.MigrationUtils = Object.freeze({

     * @see nsIStringBundle

     */

    getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {

@@ -95,7 +95,7 @@ index 0669aa8..19552e3 100644
      if (aReplacements === undefined)

        return getMigrationBundle().GetStringFromName(aKey);

      return getMigrationBundle().formatStringFromName(

-@@ -622,6 +617,17 @@ let MigrationUtils = Object.freeze({

+@@ -622,6 +617,17 @@ this.MigrationUtils = Object.freeze({

    },

  

    /**

@@ -114,7 +114,7 @@ index 0669aa8..19552e3 100644
     */

    finishMigration: function MU_finishMigration() {

 diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js

-index 744f117..59e5a4c 100644

+index f67823b..36016b8 100644

 --- a/browser/components/migration/src/ProfileMigrator.js

 +++ b/browser/components/migration/src/ProfileMigrator.js

 @@ -12,6 +12,7 @@ function ProfileMigrator() {

@@ -184,10 +184,10 @@ index 260bc29..52b32cc 100644
 -64_firefox=Bookmarks Backups

 +64_self=Bookmarks Backups

 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn

-index 339ffda..6999b26 100644

+index 687c8d8..203d8cf 100644

 --- a/toolkit/content/jar.mn

 +++ b/toolkit/content/jar.mn

-@@ -38,7 +38,7 @@ toolkit.jar:

+@@ -39,7 +39,7 @@ toolkit.jar:

  +  content/global/mozilla.xhtml               (mozilla.xhtml)

     content/global/nsDragAndDrop.js            (nsDragAndDrop.js)

     content/global/resetProfile.css            (resetProfile.css)

@@ -267,7 +267,7 @@ index f35c227..7062886 100644
  

  %{C++

 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp

-index 68a52e6..02bb30e 100644

+index e3dd0df..ef7bb74 100644

 --- a/toolkit/xre/nsAppRunner.cpp

 +++ b/toolkit/xre/nsAppRunner.cpp

 @@ -3669,7 +3669,7 @@ XREMain::XRE_mainRun()