From 6b87f8519dc037f4fd4c19d8f36b7d7565559bd3 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 19 Jul 2012 00:01:52 +0000 Subject: Thu Jul 19 00:01:52 UTC 2012 --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 204 +++++---- libre/iceweasel-libre/PKGBUILD | 15 +- libre/iceweasel-libre/libre.patch | 501 ++++++++++++++++++--- libre/iceweasel-libre/shared-libs.patch | 12 + 4 files changed, 571 insertions(+), 161 deletions(-) create mode 100644 libre/iceweasel-libre/shared-libs.patch (limited to 'libre/iceweasel-libre') diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index 3e7149308..4a0507271 100644 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -1,17 +1,21 @@ +From: Mike Hommey +Date: Tue, 5 Jun 2012 08:57:06 +0200 +Subject: Bug 756390 - Make the "Reset Firefox" feature more generic + diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js -index ffb0c34..442a5ff 100644 +index 0e8ccf5..fa46c08 100644 --- a/browser/components/migration/content/migration.js +++ b/browser/components/migration/content/migration.js -@@ -314,7 +314,7 @@ var MigrationWizard = { +@@ -249,7 +249,7 @@ var MigrationWizard = { } - var bundle = document.getElementById("brandBundle"); + var brandBundle = document.getElementById("brandBundle"); - // These strings don't exist when not using official branding. If that's + // These strings may not exist when not using official branding. If that's // the case, just skip this page. try { - var pageTitle = bundle.getString("homePageMigrationPageTitle"); -@@ -346,8 +346,8 @@ var MigrationWizard = { + var pageTitle = brandBundle.getString("homePageMigrationPageTitle"); +@@ -281,8 +281,8 @@ var MigrationWizard = { case "chrome": source = "sourceNameChrome"; break; @@ -22,75 +26,107 @@ index ffb0c34..442a5ff 100644 break; } -@@ -357,8 +357,13 @@ var MigrationWizard = { +@@ -292,7 +292,12 @@ var MigrationWizard = { var oldHomePageURL = this._migrator.sourceHomePageURL; if (oldHomePageURL && source) { -- var bundle2 = document.getElementById("bundle"); -- var appName = bundle2.getString(source); +- var appName = MigrationUtils.getLocalizedString(source); + var appName; + if (source == "brand") { -+ appName = bundle.GetStringFromName("brandFullName"); ++ appName = brandBundle.GetStringFromName("brandFullName"); + } else { -+ var bundle2 = document.getElementById("bundle"); -+ appName = bundle2.getString(source); ++ appName = MigrationUtils.getLocalizedString(source); + } - var oldHomePageLabel = bundle.getFormattedString("homePageImport", - [appName]); + var oldHomePageLabel = + brandBundle.getFormattedString("homePageImport", [appName]); var oldHomePage = document.getElementById("oldHomePage"); diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul -index f8653b1..f3ac62a 100644 +index 4bcc1d9..c4db956 100644 --- a/browser/components/migration/content/migration.xul +++ b/browser/components/migration/content/migration.xul -@@ -76,7 +76,7 @@ - #endif - #endif +@@ -74,7 +74,7 @@ + #elifdef XP_UNIX + #endif - +