packages: iceweasel/iceweasel-branding.patch - updated to 3.5 (merged from ...

paszczus paszczus at pld-linux.org
Tue Jun 30 15:24:11 CEST 2009 

Author: paszczus                     Date: Tue Jun 30 13:24:11 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.5 (merged from DEVEL)

---- Files affected:
packages/iceweasel:
   iceweasel-branding.patch (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel-branding.patch
diff -u packages/iceweasel/iceweasel-branding.patch:1.9 packages/iceweasel/iceweasel-branding.patch:1.10
--- packages/iceweasel/iceweasel-branding.patch:1.9	Sun Jun 28 13:25:41 2009
+++ packages/iceweasel/iceweasel-branding.patch	Tue Jun 30 15:24:06 2009
@@ -1,6 +1,6 @@
-diff -urN mozilla.orig/browser/app/application.ini mozilla/browser/app/application.ini
---- mozilla.orig/browser/app/application.ini	2009-01-01 05:03:00.000000000 +0100
-+++ mozilla/browser/app/application.ini	2009-06-28 13:16:06.000000000 +0200
+diff -urN mozilla-1.9.1.orig/browser/app/application.ini mozilla-1.9.1/browser/app/application.ini
+--- mozilla-1.9.1.orig/browser/app/application.ini	2009-06-24 10:20:27.000000000 +0200
++++ mozilla-1.9.1/browser/app/application.ini	2009-06-28 14:11:09.000000000 +0200
 @@ -37,8 +37,8 @@
  
  #filter substitution
@@ -11,16 +11,19 @@
 +Name=Iceweasel
  Version=@APP_VERSION@
  BuildID=@GRE_BUILDID@
- #ifdef MOZ_SOURCE_STAMP
-diff -urN mozilla.orig/browser/app/firefox-branding.js mozilla/browser/app/firefox-branding.js
---- mozilla.orig/browser/app/firefox-branding.js	2006-09-12 16:08:31.000000000 +0200
-+++ mozilla/browser/app/firefox-branding.js	2009-06-28 13:16:06.000000000 +0200
-@@ -1,14 +1,15 @@
+ #ifdef MOZ_SOURCE_REPO
+diff -urN mozilla-1.9.1.orig/browser/app/firefox-branding.js mozilla-1.9.1/browser/app/firefox-branding.js
+--- mozilla-1.9.1.orig/browser/app/firefox-branding.js	2009-06-24 10:20:27.000000000 +0200
++++ mozilla-1.9.1/browser/app/firefox-branding.js	2009-06-28 14:12:51.000000000 +0200
+@@ -1,17 +1,18 @@
 -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("browser.startup.homepage_override.mstone", "ignore");
 +pref("startup.homepage_override_url","");
 +pref("startup.homepage_welcome_url","");
+ // The time interval between checks for a new version (in seconds)
+ // nightly=8 hours, official=24 hours
+ pref("app.update.interval", 28800);
  // 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%/");
@@ -32,13 +35,13 @@
  
  // Release notes URL
 -pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
-+pref("app.releaseNotesURL", "");
++pref("app.releaseNotesURL", "")
  
  // Search codes belong only in builds with official branding
  pref("browser.search.param.yahoo-fr", "");
-diff -urN mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile/firefox.js
---- mozilla.orig/browser/app/profile/firefox.js	2009-01-01 18:57:29.000000000 +0100
-+++ mozilla/browser/app/profile/firefox.js	2009-06-28 13:16:06.000000000 +0200
+diff -urN mozilla-1.9.1.orig/browser/app/profile/firefox.js mozilla-1.9.1/browser/app/profile/firefox.js
+--- mozilla-1.9.1.orig/browser/app/profile/firefox.js	2009-06-24 10:20:27.000000000 +0200
++++ mozilla-1.9.1/browser/app/profile/firefox.js	2009-06-28 14:15:29.000000000 +0200
 @@ -70,12 +70,12 @@
  
  // Preferences for the Get Add-ons pane
@@ -57,7 +60,7 @@
  
  // Blocklist preferences
  pref("extensions.blocklist.enabled", true);
-@@ -158,9 +158,9 @@
+@@ -161,9 +161,9 @@
  pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
                                              // Themes every day
  // Non-symmetric (not shared by extensions) extension-specific [update] preferences
@@ -70,7 +73,7 @@
  pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
  pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
                                                  // restart.
-@@ -658,10 +658,8 @@
+@@ -728,10 +728,8 @@
  pref("browser.rights.version", 3);
  pref("browser.rights.3.shown", false);
  
@@ -79,51 +82,59 @@
  pref("browser.rights.override", true);
 -#endif
  
- pref("browser.sessionstore.enabled", true);
  pref("browser.sessionstore.resume_from_crash", true);
-@@ -762,4 +760,4 @@
+ pref("browser.sessionstore.resume_session_once", false);
+@@ -831,7 +829,7 @@
  pref("breakpad.reportURL", "http://crash-stats.mozilla.com/report/index/");
  
  // base URL for web-based support pages
 -pref("app.support.baseURL", "http://support.mozilla.com/1/%APP%/%VERSION%/%OS%/%LOCALE%/");
 +pref("app.support.baseURL", "http://support.mozilla.com/1/firefox/%VERSION%/%OS%/%LOCALE%/");
-diff -urN mozilla.orig/browser/base/content/baseMenuOverlay.xul mozilla/browser/base/content/baseMenuOverlay.xul
---- mozilla.orig/browser/base/content/baseMenuOverlay.xul	2008-05-06 06:07:24.000000000 +0200
-+++ mozilla/browser/base/content/baseMenuOverlay.xul	2009-06-28 13:16:06.000000000 +0200
-@@ -92,17 +92,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-1.9.1.orig/browser/base/content/aboutDialog.xul mozilla-1.9.1/browser/base/content/aboutDialog.xul
+--- mozilla-1.9.1.orig/browser/base/content/aboutDialog.xul	2009-06-24 10:20:27.000000000 +0200
++++ mozilla-1.9.1/browser/base/content/aboutDialog.xul	2009-06-28 17:29:14.000000000 +0200
+@@ -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-1.9.1.orig/browser/base/content/baseMenuOverlay.xul mozilla-1.9.1/browser/base/content/baseMenuOverlay.xul
+--- mozilla-1.9.1.orig/browser/base/content/baseMenuOverlay.xul	2009-06-24 10:20:27.000000000 +0200
++++ mozilla-1.9.1/browser/base/content/baseMenuOverlay.xul	2009-06-28 14:24:47.000000000 +0200
+@@ -92,11 +92,6 @@
                    accesskey="&helpForIEUsers.accesskey;"
                    oncommand="openHelpLink('ieusers');"/>
  #endif
 -        <menuitem id="releaseNotes"
 -                  accesskey="&helpReleaseNotes.accesskey;"
 -                  label="&helpReleaseNotes.label;"
--                  oncommand="openReleaseNotes(event)"
+-                  oncommand="openReleaseNotes()"
 -                  onclick="checkForMiddleClick(this, event);"/>
--        <menuseparator id="updateSeparator"/>
--        <menuitem id="checkForUpdates"
--                  accesskey="&updateCmd.accesskey;"
--                  label="&updateCmd.label;"
--                  class="menuitem-iconic"
--                  oncommand="checkForUpdates();"/>
-         <menuseparator id="aboutSeparator"/>
-         <menuitem id="aboutName"
-                   accesskey="&aboutCmd.accesskey;"
-diff -urN mozilla.orig/browser/base/content/credits.xhtml mozilla/browser/base/content/credits.xhtml
---- mozilla.orig/browser/base/content/credits.xhtml	2009-01-01 05:03:01.000000000 +0100
-+++ mozilla/browser/base/content/credits.xhtml	2009-06-28 13:16:06.000000000 +0200
-@@ -206,7 +206,7 @@
+         <menuseparator id="updateSeparator"/>
+ #ifdef MOZ_UPDATER
+         <menuitem id="checkForUpdates"
+diff -urN mozilla-1.9.1.orig/browser/base/content/credits.xhtml mozilla-1.9.1/browser/base/content/credits.xhtml
+--- mozilla-1.9.1.orig/browser/base/content/credits.xhtml	2009-06-24 10:20:27.000000000 +0200
++++ mozilla-1.9.1/browser/base/content/credits.xhtml	2009-06-28 14:18:00.000000000 +0200
+@@ -209,7 +209,7 @@
      </div>
  
      <div id="creditsBox">
--        <h2 class="title">&brandFullName;&trade;
-+        <h2 class="title">&brandFullName;
+-        <h2 class="title" dir="&locale.dir;">&brandFullName;&trade;
++        <h2 class="title" dir="&locale.dir;">&brandFullName;
            <div class="motto">&brandMotto;</div>
          </h2>
-         <div class="links">
-@@ -529,20 +529,13 @@
-         <p id="gecko" class="center">&credit.poweredByGeckoReg;</p>
+         <div class="links" dir="&locale.dir;">
+@@ -622,20 +622,13 @@
+         <p id="gecko" class="center" dir="&locale.dir;">&credit.poweredByGeckoReg;</p>
  
-         <p class="footnote">
+         <p class="footnote" dir="&locale.dir;">
 -          &brandFullName;&trade; &license.part0; &copy;1998-2009 &license.part1;
 +          &brandFullName; &license.part0; &copy;1998-2009 &license.part1;
            <a href="" link="about:credits" onclick="visitLink(event);">&license.contrib;</a>,
@@ -142,14 +153,17 @@
            U.S. GOVERNMENT END USERS. The Software is a &ldquo;commercial item,&rdquo;
            as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
            &ldquo;commercial computer software&rdquo; and &ldquo;commercial computer software
-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	2006-11-22 03:21:20.000000000 +0100
-+++ mozilla/browser/branding/unofficial/pref/firefox-branding.js	2009-06-28 13:16:06.000000000 +0200
-@@ -1,14 +1,14 @@
+diff -urN mozilla-1.9.1.orig/browser/branding/unofficial/pref/firefox-branding.js mozilla-1.9.1/browser/branding/unofficial/pref/firefox-branding.js
+--- mozilla-1.9.1.orig/browser/branding/unofficial/pref/firefox-branding.js	2009-06-24 10:20:28.000000000 +0200
++++ mozilla-1.9.1/browser/branding/unofficial/pref/firefox-branding.js	2009-06-28 14:19:26.000000000 +0200
+@@ -1,17 +1,17 @@
 -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("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);
  // 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%/");
@@ -165,10 +179,10 @@
  
  // Search codes belong only in builds with official branding
  pref("browser.search.param.yahoo-fr", "");
-diff -urN mozilla.orig/browser/components/nsBrowserContentHandler.js mozilla/browser/components/nsBrowserContentHandler.js
---- mozilla.orig/browser/components/nsBrowserContentHandler.js	2008-11-18 22:36:21.000000000 +0100
-+++ mozilla/browser/components/nsBrowserContentHandler.js	2009-06-28 13:16:06.000000000 +0200
-@@ -843,7 +843,7 @@
+diff -urN mozilla-1.9.1.orig/browser/components/nsBrowserContentHandler.js mozilla-1.9.1/browser/components/nsBrowserContentHandler.js
+--- mozilla-1.9.1.orig/browser/components/nsBrowserContentHandler.js	2009-06-24 10:20:28.000000000 +0200
++++ mozilla-1.9.1/browser/components/nsBrowserContentHandler.js	2009-06-28 14:19:54.000000000 +0200
+@@ -818,7 +818,7 @@
    },
  
    // XXX localize me... how?
@@ -177,11 +191,11 @@
  
    /* nsIFactory */
    createInstance: function dch_CI(outer, iid) {
-diff -urN mozilla.orig/browser/components/nsBrowserGlue.js mozilla/browser/components/nsBrowserGlue.js
---- mozilla.orig/browser/components/nsBrowserGlue.js	2008-11-20 22:47:58.000000000 +0100
-+++ mozilla/browser/components/nsBrowserGlue.js	2009-06-28 13:16:06.000000000 +0200
-@@ -884,7 +884,7 @@
-   },
+diff -urN mozilla-1.9.1.orig/browser/components/nsBrowserGlue.js mozilla-1.9.1/browser/components/nsBrowserGlue.js
+--- mozilla-1.9.1.orig/browser/components/nsBrowserGlue.js	2009-06-24 10:20:28.000000000 +0200
++++ mozilla-1.9.1/browser/components/nsBrowserGlue.js	2009-06-28 14:20:10.000000000 +0200
+@@ -994,7 +994,7 @@
+ 
  
    // for XPCOM
 -  classDescription: "Firefox Browser Glue Service",
@@ -189,37 +203,11 @@
    classID:          Components.ID("{eab9012e-5f74-4cbc-b2b5-a590235513cc}"),
    contractID:       "@mozilla.org/browser/browserglue;1",
  
-diff -urN mozilla.orig/browser/components/preferences/advanced.xul mozilla/browser/components/preferences/advanced.xul
---- mozilla.orig/browser/components/preferences/advanced.xul	2008-05-09 22:59:09.000000000 +0200
-+++ mozilla/browser/components/preferences/advanced.xul	2009-06-28 13:16:06.000000000 +0200
-@@ -267,10 +267,6 @@
-         <tabpanel id="updatePanel" orient="vertical" align="start">
-           <label control="autoUpdateGroup">&autoCheck.label;</label>
-           <vbox class="indent" id="autoUpdateGroup" role="group">
--            <checkbox id="enableAppUpdate"
--                      label="&enableAppUpdate.label;"
--                      accesskey="&enableAppUpdate.accesskey;"
--                      preference="app.update.enabled"/>
-             <checkbox id="enableAddonUpdate"
-                       label="&enableAddonsUpdate.label;"
-                       accesskey="&enableAddonsUpdate.accesskey;"
-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	2008-08-15 21:36:20.000000000 +0200
-+++ mozilla/browser/components/safebrowsing/content/report-phishing-overlay.xul	2009-06-28 13:16:06.000000000 +0200
-@@ -52,7 +52,7 @@
-     <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);"/>
-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	2008-08-12 03:21:27.000000000 +0200
-+++ mozilla/browser/components/shell/src/nsWindowsShellService.cpp	2009-06-28 13:16:06.000000000 +0200
-@@ -189,7 +189,7 @@
-   PRInt32 flags;
+diff -urN mozilla-1.9.1.orig/browser/components/shell/src/nsWindowsShellService.cpp mozilla-1.9.1/browser/components/shell/src/nsWindowsShellService.cpp
+--- mozilla-1.9.1.orig/browser/components/shell/src/nsWindowsShellService.cpp	2009-06-24 10:20:29.000000000 +0200
++++ mozilla-1.9.1/browser/components/shell/src/nsWindowsShellService.cpp	2009-06-28 14:25:50.000000000 +0200
+@@ -181,7 +181,7 @@
+   char* valueData;
  } SETTING;
  
 -#define APP_REG_NAME L"Firefox"
@@ -227,9 +215,9 @@
  #define DI "\\DefaultIcon"
  #define SOP "\\shell\\open\\command"
  
-diff -urN mozilla.orig/browser/confvars.sh mozilla/browser/confvars.sh
---- mozilla.orig/browser/confvars.sh	2009-04-20 20:15:50.000000000 +0200
-+++ mozilla/browser/confvars.sh	2009-06-28 13:16:06.000000000 +0200
+diff -urN mozilla-1.9.1.orig/browser/confvars.sh mozilla-1.9.1/browser/confvars.sh
+--- mozilla-1.9.1.orig/browser/confvars.sh	2009-06-24 10:20:29.000000000 +0200
++++ mozilla-1.9.1/browser/confvars.sh	2009-06-28 14:26:12.000000000 +0200
 @@ -36,7 +36,7 @@
  #
  # ***** END LICENSE BLOCK *****
@@ -239,20 +227,9 @@
  MOZ_UPDATER=1
  MOZ_PHOENIX=1
  
-diff -urN mozilla.orig/browser/locales/en-US/chrome/browser/aboutDialog.dtd mozilla/browser/locales/en-US/chrome/browser/aboutDialog.dtd
---- mozilla.orig/browser/locales/en-US/chrome/browser/aboutDialog.dtd	2009-01-01 05:03:01.000000000 +0100
-+++ mozilla/browser/locales/en-US/chrome/browser/aboutDialog.dtd	2009-06-28 13:16:06.000000000 +0200
-@@ -4,6 +4,4 @@
- <!ENTITY aboutLink              "&lt; About &brandFullName;">
- <!ENTITY aboutLink.accesskey    "A">
- <!ENTITY aboutVersion           "version">
--<!ENTITY copyrightInfo          "&#169;1998-2009 Contributors. All Rights Reserved. Firefox and the 
--                                 Firefox logos are trademarks of the Mozilla Foundation.  All rights 
--                                 reserved.">
-+<!ENTITY copyrightInfo          "&#169;1998-2009 Contributors. All Rights Reserved.">
-diff -urN mozilla.orig/browser/locales/en-US/chrome/overrides/appstrings.properties mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties
---- mozilla.orig/browser/locales/en-US/chrome/overrides/appstrings.properties	2008-01-17 17:07:11.000000000 +0100
-+++ mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties	2009-06-28 13:16:06.000000000 +0200
+diff -urN mozilla-1.9.1.orig/browser/locales/en-US/chrome/overrides/appstrings.properties mozilla-1.9.1/browser/locales/en-US/chrome/overrides/appstrings.properties
+--- mozilla-1.9.1.orig/browser/locales/en-US/chrome/overrides/appstrings.properties	2009-06-24 10:20:29.000000000 +0200
++++ mozilla-1.9.1/browser/locales/en-US/chrome/overrides/appstrings.properties	2009-06-28 14:30:14.000000000 +0200
 @@ -35,23 +35,23 @@
  # ***** END LICENSE BLOCK *****
  
@@ -287,9 +264,9 @@
  contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
  unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
  externalProtocolTitle=External Protocol Request
-diff -urN mozilla.orig/browser/locales/en-US/searchplugins/answers.xml mozilla/browser/locales/en-US/searchplugins/answers.xml
---- mozilla.orig/browser/locales/en-US/searchplugins/answers.xml	2006-07-05 20:47:38.000000000 +0200
-+++ mozilla/browser/locales/en-US/searchplugins/answers.xml	2009-06-28 13:16:06.000000000 +0200
+diff -urN mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/answers.xml mozilla-1.9.1/browser/locales/en-US/searchplugins/answers.xml
+--- mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/answers.xml	2009-06-24 10:20:29.000000000 +0200
++++ mozilla-1.9.1/browser/locales/en-US/searchplugins/answers.xml	2009-06-28 14:30:42.000000000 +0200
 @@ -8,6 +8,6 @@
    <Param name="gwp" value="13"/>
  </Url>
@@ -298,15 +275,15 @@
 +     template="http://www.answers.com/main/startswith?output=json&amp;client=iceweasel&amp;s={searchTerms}"/>
  <SearchForm>http://www.answers.com/</SearchForm>
  </SearchPlugin>
-diff -urN mozilla.orig/browser/locales/en-US/searchplugins/google.xml mozilla/browser/locales/en-US/searchplugins/google.xml
---- mozilla.orig/browser/locales/en-US/searchplugins/google.xml	2008-04-16 06:08:20.000000000 +0200
-+++ mozilla/browser/locales/en-US/searchplugins/google.xml	2009-06-28 13:16:06.000000000 +0200
+diff -urN mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/google.xml mozilla-1.9.1/browser/locales/en-US/searchplugins/google.xml
+--- mozilla-1.9.1.orig/browser/locales/en-US/searchplugins/google.xml	2009-06-24 10:20:29.000000000 +0200
++++ mozilla-1.9.1/browser/locales/en-US/searchplugins/google.xml	2009-06-28 14:31:31.000000000 +0200
 @@ -3,7 +3,7 @@
  <Description>Google Search</Description>
  <InputEncoding>UTF-8</InputEncoding>
- <Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAaRJREFUeNpiVIg5JRURw0A0YAHio943kYV%2B%2Ff33%2BdvvX7%2F%2FMjEx8nKycrGzwKXOiPKzICvdeezLhCV3jp15%2Bfv%2FX0YGhv8MDDxMX2qKTIw0RK10eYD6QYqATvoPBkt3f5K0W9Ew4fjTFz%2F%2Bw8Dm3W8UPeZxqFa%2BevsFyD0twgfVsOfkRxHrtfV9u5BVQ8Crd98%2FffkGYQM1QJ20%2FfSPv79eNxQGYfpSVJADmcvEAHbr7oOX2dj%2FERNKIA2%2F%2F%2Fz%2FxfCDhYVoDUDw5P6vf9%2B5iY0HVmZGQWm%2BN3fff%2Fn2k4eLHS739x%2FDiRs%2Ff%2F%2F5x8HO%2FOHzN3djfqgNjIwMgc6qzLx%2Fpy47j2zY%2Feff06tXhOUucgxeun33AUZGpHh4%2Bvo7t8EyIJqz%2FhpasD59%2B5dNrqdnznZIsEL9ICXCsWuBCwvTv%2FymS5PWPP32ExEALz%2F%2BB5r848cPCJcRaMP9xaYQzofPPzfuvrnj0Jst%2B5%2F8%2Bc4sLPeDkYlRgJc93VPE18NIXkYUmJYQSQMZ%2FP3379uPH7%2F%2F%2FEETBzqJ0WqLGvFpe2LCC4AAAwAyjg7ENzDDWAAAAABJRU5ErkJggg%3D%3D</Image>
+ <Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToP
 K4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
 -<Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=firefox&amp;client=firefox&amp;hl={moz:locale}&amp;q={searchTerms}"/>
-+<Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=firefox&amp;client=iceweasel&amp;hl={moz:locale}&amp;q={searchTerms}"/>
++<Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=iceweasel&amp;client=iceweasel&amp;hl={moz:locale}&amp;q={searchTerms}"/>
  <Url type="text/html" method="GET" template="http://www.google.com/search">
    <Param name="q" value="{searchTerms}"/>
    <Param name="ie" value="utf-8"/>
@@ -320,19 +297,10 @@
 -<SearchForm>http://www.google.com/firefox</SearchForm>
 +<SearchForm>http://www.google.com/</SearchForm>
  </SearchPlugin>
-diff -urN mozilla.orig/browser/locales/en-US/updater/updater.ini mozilla/browser/locales/en-US/updater/updater.ini
---- mozilla.orig/browser/locales/en-US/updater/updater.ini	2007-11-27 03:44:45.000000000 +0100
-+++ mozilla/browser/locales/en-US/updater/updater.ini	2009-06-28 13:16:06.000000000 +0200
-@@ -1,4 +1,4 @@
- ; This file is in the UTF-8 encoding
- [Strings]
- Title=Software Update
--Info=Firefox is installing your updates and will start in a few moments…
-+Info=Iceweasel is installing your updates and will start in a few moments…
-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	2008-04-24 00:39:30.000000000 +0200
-+++ mozilla/extensions/reporter/resources/content/reporter/reporterOverlay.xul	2009-06-28 13:16:06.000000000 +0200
-@@ -53,7 +53,7 @@
+diff -urN mozilla-1.9.1.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul mozilla-1.9.1/extensions/reporter/resources/content/reporter/reporterOverlay.xul
+--- mozilla-1.9.1.orig/extensions/reporter/resources/content/reporter/reporterOverlay.xul	2009-06-24 10:20:52.000000000 +0200
++++ mozilla-1.9.1/extensions/reporter/resources/content/reporter/reporterOverlay.xul	2009-06-28 14:45:04.000000000 +0200
+@@ -55,7 +55,7 @@
      <menuitem id="menu_HelpPopup_reportertoolmenu" 
                label="&reporterMenu2.title;" 
                accesskey="&reporterMenu.accesskey;"
@@ -341,10 +309,10 @@
                observes="reporterItemsBroadcaster"
                oncommand="loadReporterWizard()"/>
    </menupopup>
-diff -urN mozilla.orig/toolkit/xre/nsAppRunner.cpp mozilla/toolkit/xre/nsAppRunner.cpp
---- mozilla.orig/toolkit/xre/nsAppRunner.cpp	2009-04-14 09:55:49.000000000 +0200
-+++ mozilla/toolkit/xre/nsAppRunner.cpp	2009-06-28 13:18:04.000000000 +0200
-@@ -1206,8 +1206,7 @@
+diff -urN mozilla-1.9.1.orig/toolkit/xre/nsAppRunner.cpp mozilla-1.9.1/toolkit/xre/nsAppRunner.cpp
+--- mozilla-1.9.1.orig/toolkit/xre/nsAppRunner.cpp	2009-06-24 10:22:27.000000000 +0200
++++ mozilla-1.9.1/toolkit/xre/nsAppRunner.cpp	2009-06-28 14:45:56.000000000 +0200
+@@ -1231,8 +1231,7 @@
  static inline void
  DumpVersion()
  {
================================================================

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

More information about the pld-cvs-commit mailing list