packages: iceweasel/iceweasel-branding.patch - updated for 4.0

mmazur mmazur at pld-linux.org
Tue Mar 22 22:37:55 CET 2011 

Author: mmazur                       Date: Tue Mar 22 21:37:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 4.0

---- Files affected:
packages/iceweasel:
   iceweasel-branding.patch (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel-branding.patch
diff -u packages/iceweasel/iceweasel-branding.patch:1.16 packages/iceweasel/iceweasel-branding.patch:1.17
--- packages/iceweasel/iceweasel-branding.patch:1.16	Wed Mar  2 21:23:52 2011
+++ packages/iceweasel/iceweasel-branding.patch	Tue Mar 22 22:37:49 2011
@@ -15,24 +15,6 @@
 diff -urN mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile/firefox.js
 --- mozilla.orig/browser/app/profile/firefox.js	2010-02-04 15:47:13.000000000 +0100
 +++ mozilla/browser/app/profile/firefox.js	2010-02-04 15:50:15.000000000 +0100
-@@ -70,12 +70,12 @@
- 
- // Preferences for the Get Add-ons pane
- pref("extensions.getAddons.showPane", true);
--pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/%APP%");
-+pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/firefox");
- pref("extensions.getAddons.maxResults", 5);
--pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/recommended");
--pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
-+pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/recommended");
-+pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
-+pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%");
-+pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
- 
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
 @@ -87,7 +87,7 @@
  pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/");
  
@@ -91,154 +73,6 @@
  
  // Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
  pref("security.alternate_certificate_error_page", "certerror");
-diff -urN mozilla.orig/browser/base/content/aboutDialog.xul mozilla/browser/base/content/aboutDialog.xul
---- mozilla.orig/browser/base/content/aboutDialog.xul	2010-02-04 15:47:13.000000000 +0100
-+++ mozilla/browser/base/content/aboutDialog.xul	2010-02-04 15:48:50.000000000 +0100
-@@ -87,7 +87,6 @@
-         &copyrightInfo1;<label 
-         class="text-link" href="&licenseLink;"
-         >&licenseLinkText;</label>&copyrightInfo2;
--        &logoCopyright;
-       </description>
-       <textbox id="userAgent" multiline="true" readonly="true" flex="1"/>
-     </vbox>
-diff -urN mozilla.orig/browser/base/content/baseMenuOverlay.xul mozilla/browser/base/content/baseMenuOverlay.xul
---- mozilla.orig/browser/base/content/baseMenuOverlay.xul	2010-02-04 15:47:13.000000000 +0100
-+++ mozilla/browser/base/content/baseMenuOverlay.xul	2010-02-04 15:51:31.000000000 +0100
-@@ -96,11 +96,6 @@
-                   label="&helpTroubleshooting.label;"
-                   oncommand="openTroubleshootingPage()"
-                   onclick="checkForMiddleClick(this, event);"/>
--        <menuitem id="releaseNotes"
--                  accesskey="&helpReleaseNotes.accesskey;"
--                  label="&helpReleaseNotes.label;"
--                  oncommand="openReleaseNotes()"
--                  onclick="checkForMiddleClick(this, event);"/>
-         <menuseparator id="updateSeparator"/>
- #ifdef MOZ_UPDATER
-         <menuitem id="checkForUpdates"
-diff -urN mozilla.orig/browser/base/content/credits.xhtml mozilla/browser/base/content/credits.xhtml
---- mozilla.orig/browser/base/content/credits.xhtml	2010-02-04 15:47:13.000000000 +0100
-+++ mozilla/browser/base/content/credits.xhtml	2010-02-04 15:53:53.000000000 +0100
-@@ -209,7 +209,7 @@
-     </div>
- 
-     <div id="creditsBox">
--        <h2 class="title" dir="&locale.dir;">&brandFullName;™
-+        <h2 class="title" dir="&locale.dir;">&brandFullName;
-           <div class="motto">&brandMotto;</div>
-         </h2>
-         <div class="links" dir="&locale.dir;">
-@@ -622,20 +622,13 @@
-         <p id="gecko" class="center" dir="&locale.dir;">&credit.poweredByGeckoReg;</p>
- 
-         <p class="footnote" dir="&locale.dir;">
--          &brandFullName;™ &license.part0; ©1998-2011 &license.part1;
-+          &brandFullName; &license.part0; ©1998-2011 &license.part1;
-           <a href="" link="about:credits" onclick="visitLink(event);">&license.contrib;</a>,
-           &license.part2;
-           <a href="" link="about:license" onclick="visitLink(event);">about:license</a>
-           &license.part3;</p>
- 
-         <p class="footnote">
--          Mozilla Firefox® and the Firefox logo are registered trademarks of the
--          Mozilla Foundation. You are not granted rights or licenses to the trademarks
--          of the Mozilla Foundation or any party, including without limitation the
--          Firefox name or logo. Gecko® is a registered trademark of Netscape
--          Communications Corporation.</p>
--
--        <p class="footnote">
-           U.S. GOVERNMENT END USERS. The Software is a “commercial item,”
-           as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
-           “commercial computer software” and “commercial computer software
-diff -urN mozilla.orig/browser/branding/nightly/pref/firefox-branding.js mozilla/browser/branding/nightly/pref/firefox-branding.js
---- mozilla.orig/browser/branding/nightly/pref/firefox-branding.js	2010-02-04 15:47:13.000000000 +0100
-+++ mozilla/browser/branding/nightly/pref/firefox-branding.js	2010-02-04 15:55:23.000000000 +0100
-@@ -1,5 +1,5 @@
--pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
--pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
-+pref("startup.homepage_override_url","http://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/");
-+pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/firefox/%VERSION%/firstrun/");
- // The time interval between checks for a new version (in seconds)
- // nightly=8 hours, official=24 hours
- pref("app.update.interval", 28800);
-@@ -8,13 +8,13 @@
- pref("app.update.download.backgroundInterval", 60);
- // URL user can browse to manually if for some reason all update installation
- // attempts fail.
--pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
-+pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/");
- // A default value for the "More information about this update" link
- // supplied in the "An update is available" page of the update wizard. 
--pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
-+pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/");
- 
- // Release notes URL
--pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
-+pref("app.releaseNotesURL", "http://www.mozilla.org/projects/firefox/%VERSION%/releasenotes/");
- 
- // Search codes belong only in builds with official branding
- pref("browser.search.param.yahoo-fr", "");
-diff -urN mozilla.orig/browser/branding/unofficial/pref/firefox-branding.js mozilla/browser/branding/unofficial/pref/firefox-branding.js
---- mozilla.orig/browser/branding/unofficial/pref/firefox-branding.js	2010-02-04 15:47:13.000000000 +0100
-+++ mozilla/browser/branding/unofficial/pref/firefox-branding.js	2010-02-04 15:50:56.000000000 +0100
-@@ -1,5 +1,5 @@
--pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
--pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
-+pref("startup.homepage_override_url","http://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/");
-+pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/firefox/%VERSION%/firstrun/");
- // The time interval between checks for a new version (in seconds)
- // nightly=8 hours, official=24 hours
- pref("app.update.interval", 28800);
-@@ -8,13 +8,13 @@
- pref("app.update.download.backgroundInterval", 60);
- // URL user can browse to manually if for some reason all update installation
- // attempts fail.
--pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
-+pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/");
- // A default value for the "More information about this update" link
- // supplied in the "An update is available" page of the update wizard. 
--pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
-+pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/");
- 
- // Release notes URL
--pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
-+pref("app.releaseNotesURL", "http://www.mozilla.org/projects/firefox/%VERSION%/releasenotes/");
- 
- // Search codes belong only in builds with official branding
- pref("browser.search.param.yahoo-fr", "");
-diff -urN mozilla.orig/browser/components/nsBrowserGlue.js mozilla/browser/components/nsBrowserGlue.js
---- mozilla.orig/browser/components/nsBrowserGlue.js	2010-02-04 15:47:12.000000000 +0100
-+++ mozilla/browser/components/nsBrowserGlue.js	2010-02-04 15:48:50.000000000 +0100
-@@ -1087,7 +1087,7 @@
- 
- 
-   // for XPCOM
--  classDescription: "Firefox Browser Glue Service",
-+  classDescription: "Iceweasel Browser Glue Service",
-   classID:          Components.ID("{eab9012e-5f74-4cbc-b2b5-a590235513cc}"),
-   contractID:       "@mozilla.org/browser/browserglue;1",
- 
-diff -urN mozilla.orig/browser/components/safebrowsing/content/report-phishing-overlay.xul mozilla/browser/components/safebrowsing/content/report-phishing-overlay.xul
---- mozilla.orig/browser/components/safebrowsing/content/report-phishing-overlay.xul	2010-02-04 15:47:12.000000000 +0100
-+++ mozilla/browser/components/safebrowsing/content/report-phishing-overlay.xul	2010-02-13 15:13:33.000000000 +0100
-@@ -52,14 +52,14 @@
-     <menuitem id="menu_HelpPopup_reportPhishingtoolmenu"
-               label="&reportPhishSiteMenu.title2;"
-               accesskey="&reportPhishSiteMenu.accesskey;"
--              insertbefore="updateSeparator"
-+              insertbefore="aboutSeparator"
-               observes="reportPhishingBroadcaster"
-               oncommand="openUILink(safebrowsing.getReportURL('Phish'), event);"
-               onclick="checkForMiddleClick(this, event);"/>
-     <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu"
-               label="&safeb.palm.notforgery.label2;"
-               accesskey="&reportPhishSiteMenu.accesskey;"
--              insertbefore="updateSeparator"
-+              insertbefore="aboutSeparator"
-               observes="reportPhishingErrorBroadcaster"
-               oncommand="openUILinkIn(safebrowsing.getReportURL('Error'), 'tab');"
-               onclick="checkForMiddleClick(this, event);"/>
 diff -urN mozilla.orig/browser/components/shell/src/nsWindowsShellService.cpp mozilla/browser/components/shell/src/nsWindowsShellService.cpp
 --- mozilla.orig/browser/components/shell/src/nsWindowsShellService.cpp	2010-02-04 15:47:12.000000000 +0100
 +++ mozilla/browser/components/shell/src/nsWindowsShellService.cpp	2010-02-04 15:49:28.000000000 +0100
@@ -330,21 +164,8 @@
 -  <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/>
 +  <MozParam name="client" condition="defaultEngine" trueValue="iceweasel-a" falseValue="iceweasel"/>
  </Url>
--<SearchForm>http://www.google.com/firefox</SearchForm>
-+<SearchForm>http://www.google.com/</SearchForm>
+ <SearchForm>http://www.google.com/</SearchForm>
  </SearchPlugin>
-diff -urN mozilla.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul mozilla/extensions/reporter/resources/content/reporter/reporterOverlay.xul
---- mozilla.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul	2010-02-04 15:47:15.000000000 +0100
-+++ mozilla/extensions/reporter/resources/content/reporter/reporterOverlay.xul	2010-02-04 15:48:50.000000000 +0100
-@@ -55,7 +55,7 @@
-     <menuitem id="menu_HelpPopup_reportertoolmenu" 
-               label="&reporterMenu2.title;" 
-               accesskey="&reporterMenu.accesskey;"
--              insertafter="releaseNotes"
-+              insertbefore="aboutSeparator"
-               observes="reporterItemsBroadcaster"
-               oncommand="loadReporterWizard()"/>
-   </menupopup>
 diff -urN mozilla.orig/toolkit/xre/nsAppRunner.cpp mozilla/toolkit/xre/nsAppRunner.cpp
 --- mozilla.orig/toolkit/xre/nsAppRunner.cpp	2010-02-04 15:47:20.000000000 +0100
 +++ mozilla/toolkit/xre/nsAppRunner.cpp	2010-02-04 15:48:50.000000000 +0100
@@ -358,3 +179,51 @@
    if (gAppData->copyright)
        printf(", %s", gAppData->copyright);
    printf("\n");
+--- mozilla/browser/branding/nightly/pref/firefox-branding.js~	2011-03-19 00:33:32.000000000 +0100
++++ mozilla/browser/branding/nightly/pref/firefox-branding.js	2011-03-22 22:31:41.133961031 +0100
+@@ -1,5 +1,5 @@
+-pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
+-pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
++pref("startup.homepage_override_url","http://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/");
++pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/firefox/%VERSION%/firstrun/");
+ pref("browser.panorama.welcome_url", "http://www.mozilla.com/firefox/panorama/");
+ // The time interval between checks for a new version (in seconds)
+ // nightly=8 hours, official=24 hours
+@@ -12,7 +12,7 @@
+ pref("app.update.url.manual", "http://nightly.mozilla.org/");
+ // A default value for the "More information about this update" link
+ // supplied in the "An update is available" page of the update wizard. 
+-pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
++pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/");
+ 
+ // Release notes and vendor URLs
+ pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
+--- mozilla/browser/branding/unofficial/pref/firefox-branding.js~	2011-03-19 00:33:32.000000000 +0100
++++ mozilla/browser/branding/unofficial/pref/firefox-branding.js	2011-03-22 22:32:15.552191452 +0100
+@@ -1,5 +1,5 @@
+-pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
+-pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
++pref("startup.homepage_override_url","http://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/");
++pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/firefox/%VERSION%/firstrun/");
+ pref("browser.panorama.welcome_url", "http://www.mozilla.com/firefox/panorama/");
+ // The time interval between checks for a new version (in seconds)
+ // nightly=8 hours, official=24 hours
+@@ -9,14 +9,14 @@
+ pref("app.update.download.backgroundInterval", 60);
+ // URL user can browse to manually if for some reason all update installation
+ // attempts fail.
+-pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
++pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/");
+ // A default value for the "More information about this update" link
+ // supplied in the "An update is available" page of the update wizard. 
+-pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
++pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/");
+ 
+ // Release notes and vendor URLs
+-pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
+-pref("app.vendorURL", "http://www.mozilla.org/projects/%APP%/");
++pref("app.releaseNotesURL", "http://www.mozilla.org/projects/firefox/%VERSION%/releasenotes/");
++pref("app.vendorURL", "http://www.mozilla.org/projects/firefox/");
+ 
+ // Search codes belong only in builds with official branding
+ pref("browser.search.param.yahoo-fr", "");
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-branding.patch?r1=1.16&r2=1.17&f=u

More information about the pld-cvs-commit mailing list