Author: dgolovin Date: 2010-07-20 17:24:34 -0400 (Tue, 20 Jul 2010) New Revision: 23608 Added: trunk/xulrunner/plugins/org.mozilla.xpcom/MozillaInterfaces.jar trunk/xulrunner/plugins/org.mozilla.xpcom/about.html trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/about.html trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libdbusservice.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libimgicon.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libmozgnome.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libnkgnomevfs.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libfreebl3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libjavaxpcomglue.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libmozjs.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnspr4.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnss3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssckbi.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssutil3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplc4.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplds4.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsmime3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsqlite3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libssl3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxpcom.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxul.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/CrashSubmit.jsm trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugin-container trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libnullplugin.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libunixprintplugin.so Modified: trunk/xulrunner/plugins/org.mozilla.xpcom/.classpath trunk/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF trunk/xulrunner/plugins/org.mozilla.xpcom/MozillaGlue.jar trunk/xulrunner/plugins/org.mozilla.xpcom/build.properties trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/classic.jar trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/comm.jar trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/en-US.jar trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/pippki.jar trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/toolkit.jar trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/crashreporter trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/defaults/pref/xulrunner.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/all.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/security-prefs.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/javaxpcom.jar trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libfreebl3.chk trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.chk trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.chk trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/DownloadLastDir.jsm trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/LightweightThemeManager.jsm trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/XPCOMUtils.jsm trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/debug.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/utils.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/platform.ini trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/charsetalias.properties trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/html.css trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpcshell trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpidl trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner-bin trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner-stub Log: https://jira.jboss.org/browse/JBIDE-6429 - Move to XULRunner 1.9.2 xulrunner binaries for gtk.linux.x86 are fixed Modified: trunk/xulrunner/plugins/org.mozilla.xpcom/.classpath =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xpcom/.classpath 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xpcom/.classpath 2010-07-20 21:24:34 UTC (rev 23608) @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> - <classpathentry exported="true" kind="lib" path="bin/"/> + <classpathentry exported="true" kind="lib" path="MozillaInterfaces.jar" sourcepath="MozillaInterfaces-src.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry exported="true" kind="lib" path="MozillaGlue.jar" sourcepath="/org.mozilla.xpcom.source/src/MozillaInterfaces-src.jar"/> + <classpathentry exported="true" kind="lib" path="MozillaGlue.jar" sourcepath="/home/eskimo/Projects/mozilla-1.9.2/extensions/java/xpcom/interfaces"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xpcom/META-INF/MANIFEST.MF 2010-07-20 21:24:34 UTC (rev 23608) @@ -4,9 +4,10 @@ Bundle-SymbolicName: org.mozilla.xpcom;singleton:=true Bundle-Version: 1.9.2 Bundle-ClassPath: MozillaGlue.jar, - bin/ + MozillaInterfaces.jar Export-Package: org.mozilla.interfaces, org.mozilla.xpcom Bundle-Vendor: mozilla.org Eclipse-BuddyPolicy: registered Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-ActivationPolicy: lazy Modified: trunk/xulrunner/plugins/org.mozilla.xpcom/MozillaGlue.jar =================================================================== (Binary files differ) Added: trunk/xulrunner/plugins/org.mozilla.xpcom/MozillaInterfaces.jar =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xpcom/MozillaInterfaces.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xpcom/about.html =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xpcom/about.html (rev 0) +++ trunk/xulrunner/plugins/org.mozilla.xpcom/about.html 2010-07-20 21:24:34 UTC (rev 23608) @@ -0,0 +1,580 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> +<HTML> + +<HEAD> +<TITLE>About</TITLE> +<META http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> +</HEAD> + +<BODY lang="EN-US"> +<PRE> + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code 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 documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``The contents of this file are subject to the Mozilla Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + The Original Code is ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + + ---------------------------------------------------------------------- + + AMENDMENTS + + The Netscape Public License Version 1.1 ("NPL") consists of the + Mozilla Public License Version 1.1 with the following Amendments, + including Exhibit A-Netscape Public License. Files identified with + "Exhibit A-Netscape Public License" are governed by the Netscape + Public License Version 1.1. + + Additional Terms applicable to the Netscape Public License. + I. Effect. + These additional terms described in this Netscape Public + License -- Amendments shall apply to the Mozilla Communicator + client code and to all Covered Code under this License. + + II. "Netscape's Branded Code" means Covered Code that Netscape + distributes and/or permits others to distribute under one or more + trademark(s) which are controlled by Netscape but which are not + licensed for use under this License. + + III. Netscape and logo. + This License does not grant any rights to use the trademarks + "Netscape", the "Netscape N and horizon" logo or the "Netscape + lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript", + "Smart Browsing" even if such marks are included in the Original + Code or Modifications. + + IV. Inability to Comply Due to Contractual Obligation. + Prior to licensing the Original Code under this License, Netscape + has licensed third party code for use in Netscape's Branded Code. + To the extent that Netscape is limited contractually from making + such third party code available under this License, Netscape may + choose to reintegrate such code into Covered Code without being + required to distribute such code in Source Code form, even if + such code would otherwise be considered "Modifications" under + this License. + + V. Use of Modifications and Covered Code by Initial Developer. + V.1. In General. + The obligations of Section 3 apply to Netscape, except to + the extent specified in this Amendment, Section V.2 and V.3. + + V.2. Other Products. + Netscape may include Covered Code in products other than the + Netscape's Branded Code which are released by Netscape + during the two (2) years following the release date of the + Original Code, without such additional products becoming + subject to the terms of this License, and may license such + additional products on different terms from those contained + in this License. + + V.3. Alternative Licensing. + Netscape may license the Source Code of Netscape's Branded + Code, including Modifications incorporated therein, without + such Netscape Branded Code becoming subject to the terms of + this License, and may license such Netscape Branded Code on + different terms from those contained in this License. + + VI. Litigation. + Notwithstanding the limitations of Section 11 above, the + provisions regarding litigation in Section 11(a), (b) and (c) of + the License shall apply to all disputes relating to this License. + + EXHIBIT A-Netscape Public License. + + "The contents of this file are subject to the Netscape Public + License Version 1.1 (the "License"); you may not use this file + except in compliance with the License. You may obtain a copy of + the License at http://www.mozilla.org/NPL/ + + Software distributed under the License is distributed on an "AS + IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + implied. See the License for the specific language governing + rights and limitations under the License. + + The Original Code is Mozilla Communicator client code, released + March 31, 1998. + + The Initial Developer of the Original Code is Netscape + Communications Corporation. Portions created by Netscape are + Copyright (C) 1998-1999 Netscape Communications Corporation. All + Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the + terms of the _____ license (the "[___] License"), in which case + the provisions of [______] License are applicable instead of + those above. If you wish to allow use of your version of this + file only under the terms of the [____] License and not to allow + others to use your version of this file under the NPL, indicate + your decision by deleting the provisions above and replace them + with the notice and other provisions required by the [___] + License. If you do not delete the provisions above, a recipient + may use your version of this file under either the NPL or the + [___] License." +</PRE> +</BODY +</HTML> \ No newline at end of file Property changes on: trunk/xulrunner/plugins/org.mozilla.xpcom/about.html ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/xulrunner/plugins/org.mozilla.xpcom/build.properties =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xpcom/build.properties 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xpcom/build.properties 2010-07-20 21:24:34 UTC (rev 23608) @@ -1,4 +1,5 @@ output.. = bin/ bin.includes = META-INF/,\ MozillaGlue.jar,\ - bin/ + MozillaInterfaces.jar,\ + about.html Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/about.html =================================================================== Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/about.html ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/classic.jar =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/comm.jar =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/en-US.jar =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/pippki.jar =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/toolkit.jar =================================================================== (Binary files differ) Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libdbusservice.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libdbusservice.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libimgicon.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libimgicon.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libmozgnome.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libmozgnome.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libnkgnomevfs.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libnkgnomevfs.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/crashreporter =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/defaults/pref/xulrunner.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/defaults/pref/xulrunner.js 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/defaults/pref/xulrunner.js 2010-07-20 21:24:34 UTC (rev 23608) @@ -34,7 +34,7 @@ * * ***** END LICENSE BLOCK ***** */ -//@line 38 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/app/xulrunner.js" +//@line 38 "/builds/slave/xulrunner_linux_build/build/xulrunner/app/xulrunner.js" // We need to override the default values of these preferences since all.js // assumes these are in the navigator package, which for us is non-existant. @@ -59,7 +59,7 @@ pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager"); pref("xpinstall.dialog.progress.type.skin", "Extension:Manager"); pref("xpinstall.enabled", true); -//@line 65 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/app/xulrunner.js" +//@line 65 "/builds/slave/xulrunner_linux_build/build/xulrunner/app/xulrunner.js" pref("browser.preferences.instantApply", true); -//@line 70 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/app/xulrunner.js" +//@line 70 "/builds/slave/xulrunner_linux_build/build/xulrunner/app/xulrunner.js" pref("browser.preferences.animateFadeIn", false); Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/all.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/all.js 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/all.js 2010-07-20 21:24:34 UTC (rev 23608) @@ -59,9 +59,9 @@ pref("browser.bookmarks.max_backups", 5); pref("browser.cache.disk.enable", true); -//@line 63 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 63 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" pref("browser.cache.disk.capacity", 51200); -//@line 67 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 67 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" pref("browser.cache.memory.enable", true); //pref("browser.cache.memory.capacity", -1); // -1 = determine dynamically, 0 = none, n = memory capacity in kilobytes @@ -70,7 +70,7 @@ pref("browser.cache.check_doc_frequency", 3); pref("browser.cache.offline.enable", true); -//@line 76 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 76 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" // offline cache capacity in kilobytes pref("browser.cache.offline.capacity", 512000); @@ -81,7 +81,7 @@ // the user should be warned if offline app disk usage exceeds this amount // (in kilobytes) pref("offline-apps.quota.warn", 51200); -//@line 92 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 92 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" // Fastback caching - if this pref is negative, then we calculate the number // of content viewers to cache based on the amount of available memory. @@ -145,11 +145,11 @@ // Media cache size in kilobytes pref("media.cache_size", 51200); -//@line 156 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 156 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" pref("media.ogg.enabled", true); -//@line 159 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 159 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" pref("media.wave.enabled", true); -//@line 161 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 161 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" // Whether to autostart a media element with an |autoplay| attribute pref("media.autoplay.enabled", true); @@ -167,7 +167,7 @@ pref("accessibility.browsewithcaret_shortcut.enabled", true); -//@line 179 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 179 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" // Tab focus model bit field: // 1 focuses text controls, 2 focuses other form elements, 4 adds links. // Most users will want 1, 3, or 7. @@ -180,7 +180,7 @@ // unless this preference was set manually pref("ui.scrollToClick", 0); -//@line 195 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 195 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" pref("accessibility.usetexttospeech", ""); pref("accessibility.usebrailledisplay", ""); @@ -524,9 +524,9 @@ pref("dom.storage.default_quota", 5120); // Parsing perf prefs. For now just mimic what the old code did. -//@line 539 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 539 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" pref("content.sink.pending_event_mode", 0); -//@line 541 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 541 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" // Disable popups from plugins by default // 0 = openAllowed @@ -575,7 +575,7 @@ pref("network.protocol-handler.external.ms-help", false); pref("network.protocol-handler.external.shell", false); pref("network.protocol-handler.external.vnd.ms.radio", false); -//@line 592 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 592 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" pref("network.protocol-handler.external.disk", false); pref("network.protocol-handler.external.disks", false); pref("network.protocol-handler.external.afp", false); @@ -718,7 +718,10 @@ pref("network.IDN.whitelist.kr", true); pref("network.IDN.whitelist.li", true); pref("network.IDN.whitelist.lt", true); +pref("network.IDN.whitelist.lu", true); pref("network.IDN.whitelist.no", true); +pref("network.IDN.whitelist.nu", true); +pref("network.IDN.whitelist.nz", true); pref("network.IDN.whitelist.pl", true); pref("network.IDN.whitelist.pr", true); pref("network.IDN.whitelist.se", true); @@ -728,12 +731,21 @@ pref("network.IDN.whitelist.tw", true); pref("network.IDN.whitelist.vn", true); -// non-ccTLDs +// IDN ccTLDs +// sa, Saudi Arabia, .<al-Saudiah> +pref("network.IDN.whitelist.xn--mgberp4a5d4ar", true); +// ru, Russian Federation, .<RF> +pref("network.IDN.whitelist.xn--p1ai", true); +// jo, Jordan, .<Al-Ordon> +pref("network.IDN.whitelist.xn--mgbayh7gpa", true); + +// gTLDs pref("network.IDN.whitelist.biz", true); pref("network.IDN.whitelist.cat", true); pref("network.IDN.whitelist.info", true); pref("network.IDN.whitelist.museum", true); pref("network.IDN.whitelist.org", true); +pref("network.IDN.whitelist.tel", true); // NOTE: Before these can be removed, one of bug 414812's tests must be updated // or it will likely fail! Please CC jwalden+bmo on the bug associated @@ -813,7 +825,7 @@ // Specify if the gss lib comes standard with the OS pref("network.negotiate-auth.using-native-gsslib", true); -//@line 835 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 847 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" // Controls which NTLM authentication implementation we default to. True forces // the use of our generic (internal) NTLM authentication implementation vs. any @@ -841,9 +853,7 @@ pref("permissions.default.image", 1); // 1-Accept, 2-Deny, 3-dontAcceptForeign -//@line 864 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" pref("network.proxy.type", 5); -//@line 871 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" pref("network.proxy.ftp", ""); pref("network.proxy.ftp_port", 0); @@ -1194,6 +1204,10 @@ pref("dom.max_chrome_script_run_time", 20); pref("dom.max_script_run_time", 10); +// How long a plugin is allowed to process a synchronous IPC message +// before we consider it "hung". +pref("dom.ipc.plugins.timeoutSecs", 45); + pref("svg.enabled", true); pref("svg.smil.enabled", false); @@ -1229,15 +1243,15 @@ pref("font.minimum-size.x-unicode", 0); pref("font.minimum-size.x-user-def", 0); -//@line 1654 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 1662 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" -//@line 2078 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 2086 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" -//@line 2281 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 2289 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" -//@line 2377 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 2385 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" -//@line 2380 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 2388 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" // Handled differently under Mac/Windows pref("network.hosts.smtp_server", "localhost"); pref("network.hosts.pop_server", "pop"); @@ -1507,15 +1521,15 @@ pref("mousewheel.system_scroll_override_on_root_content.enabled", false); -//@line 2652 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 2660 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" -//@line 2720 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 2728 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" -//@line 2746 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 2754 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" -//@line 2766 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 2774 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" -//@line 2774 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 2782 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" // Login Manager prefs pref("signon.rememberSignons", true); @@ -1552,12 +1566,15 @@ // The default Accept header sent for images loaded over HTTP(S) pref("image.http.accept", "image/png,image/*;q=0.8,*/*;q=0.5"); -//@line 2816 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 2824 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" -//@line 2821 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/modules/libpref/src/init/all.js" +//@line 2829 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" // Enable/Disable the geolocation API for content pref("geo.enabled", true); +// Enable/Disable the orientation API for content +pref("accelerometer.enabled", true); + // Enable/Disable HTML5 parser pref("html5.enable", false); Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/security-prefs.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/security-prefs.js 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/security-prefs.js 2010-07-20 21:24:34 UTC (rev 23608) @@ -5,6 +5,11 @@ pref("security.enable_tls", true); pref("security.enable_tls_session_tickets", true); +pref("security.ssl.allow_unrestricted_renego_everywhere__temporarily_available_pref", true); +pref("security.ssl.renego_unrestricted_hosts", ""); +pref("security.ssl.treat_unsafe_negotiation_as_broken", false); +pref("security.ssl.require_safe_negotiation", false); + pref("security.ssl2.rc4_128", false); pref("security.ssl2.rc2_128", false); pref("security.ssl2.des_ede3_192", false); @@ -22,14 +27,14 @@ pref("security.ssl3.rsa_rc4_40_md5", false); pref("security.ssl3.rsa_rc2_40_md5", false); // Camellia is broken on Windows CE for now, see bug 508113 -//@line 26 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/netwerk/base/public/security-prefs.js" +//@line 31 "/builds/slave/xulrunner_linux_build/build/netwerk/base/public/security-prefs.js" pref("security.ssl3.dhe_rsa_camellia_256_sha", true); pref("security.ssl3.dhe_dss_camellia_256_sha", true); pref("security.ssl3.rsa_camellia_256_sha", true); pref("security.ssl3.dhe_rsa_camellia_128_sha", true); pref("security.ssl3.dhe_dss_camellia_128_sha", true); pref("security.ssl3.rsa_camellia_128_sha", true); -//@line 33 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/netwerk/base/public/security-prefs.js" +//@line 38 "/builds/slave/xulrunner_linux_build/build/netwerk/base/public/security-prefs.js" pref("security.ssl3.dhe_rsa_aes_256_sha", true); pref("security.ssl3.dhe_dss_aes_256_sha", true); pref("security.ssl3.rsa_aes_256_sha", true); Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/javaxpcom.jar =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libfreebl3.chk =================================================================== (Binary files differ) Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libfreebl3.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libfreebl3.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libjavaxpcomglue.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libjavaxpcomglue.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libmozjs.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libmozjs.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnspr4.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnspr4.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnss3.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnss3.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssckbi.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssckbi.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.chk =================================================================== (Binary files differ) Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssutil3.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssutil3.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplc4.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplc4.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplds4.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplds4.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsmime3.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsmime3.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.chk =================================================================== (Binary files differ) Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsqlite3.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsqlite3.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libssl3.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libssl3.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxpcom.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxpcom.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxul.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxul.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/CrashSubmit.jsm =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/CrashSubmit.jsm (rev 0) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/CrashSubmit.jsm 2010-07-20 21:24:34 UTC (rev 23608) @@ -0,0 +1,404 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Mozilla code. + * + * The Initial Developer of the Original Code is + * Mozilla Foundation. + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Ted Mielczarek <ted.mielczarek(a)gmail.com&gt; (original author) + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +let EXPORTED_SYMBOLS = [ + "CrashSubmit" +]; + +const Cc = Components.classes; +const Ci = Components.interfaces; +const STATE_START = Ci.nsIWebProgressListener.STATE_START; +const STATE_STOP = Ci.nsIWebProgressListener.STATE_STOP; + +const SUCCESS = "success"; +const FAILED = "failed"; +const SUBMITTING = "submitting"; + +let reportURL = null; +let strings = null; +let myListener = null; + +function parseKeyValuePairs(text) { + var lines = text.split('\n'); + var data = {}; + for (let i = 0; i < lines.length; i++) { + if (lines[i] == '') + continue; + + // can't just .split() because the value might contain = characters + let eq = lines[i].indexOf('='); + if (eq != -1) { + let [key, value] = [lines[i].substring(0, eq), + lines[i].substring(eq + 1)]; + if (key && value) + data[key] = value.replace("\\n", "\n", "g").replace("\\\\", "\\", "g"); + } + } + return data; +} + +function parseKeyValuePairsFromFile(file) { + var fstream = Cc[&quot;(a)mozilla.org/network/file-input-stream;1&quot;]. + createInstance(Ci.nsIFileInputStream); + fstream.init(file, -1, 0, 0); + var is = Cc[&quot;(a)mozilla.org/intl/converter-input-stream;1&quot;]. + createInstance(Ci.nsIConverterInputStream); + is.init(fstream, "UTF-8", 1024, Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER); + var str = {}; + var contents = ''; + while (is.readString(4096, str) != 0) { + contents += str.value; + } + is.close(); + fstream.close(); + return parseKeyValuePairs(contents); +} + +function parseINIStrings(file) { + var factory = Cc[&quot;(a)mozilla.org/xpcom/ini-parser-factory;1&quot;]. + getService(Ci.nsIINIParserFactory); + var parser = factory.createINIParser(file); + var obj = {}; + var en = parser.getKeys("Strings"); + while (en.hasMore()) { + var key = en.getNext(); + obj[key] = parser.getString("Strings", key); + } + return obj; +} + +// Since we're basically re-implementing part of the crashreporter +// client here, we'll just steal the strings we need from crashreporter.ini +function getL10nStrings() { + let dirSvc = Cc[&quot;(a)mozilla.org/file/directory_service;1&quot;]. + getService(Ci.nsIProperties); + let path = dirSvc.get("GreD", Ci.nsIFile); + path.append("crashreporter.ini"); + if (!path.exists()) { + // see if we're on a mac + path = path.parent; + path.append("crashreporter.app"); + path.append("Contents"); + path.append("MacOS"); + path.append("crashreporter.ini"); + if (!path.exists()) { + // very bad, but I don't know how to recover + return; + } + } + let crstrings = parseINIStrings(path); + strings = { + 'crashid': crstrings.CrashID, + 'reporturl': crstrings.CrashDetailsURL + }; + + path = dirSvc.get("XCurProcD", Ci.nsIFile); + path.append("crashreporter-override.ini"); + if (path.exists()) { + crstrings = parseINIStrings(path); + if ('CrashID' in crstrings) + strings['crashid'] = crstrings.CrashID; + if ('CrashDetailsURL' in crstrings) + strings['reporturl'] = crstrings.CrashDetailsURL; + } +} + +function getPendingMinidump(id) { + let directoryService = Cc[&quot;(a)mozilla.org/file/directory_service;1&quot;]. + getService(Ci.nsIProperties); + let pendingDir = directoryService.get("UAppData", Ci.nsIFile); + pendingDir.append("Crash Reports"); + pendingDir.append("pending"); + let dump = pendingDir.clone(); + let extra = pendingDir.clone(); + dump.append(id + ".dmp"); + extra.append(id + ".extra"); + return [dump, extra]; +} + +function addFormEntry(doc, form, name, value) { + var input = doc.createElement("input"); + input.type = "hidden"; + input.name = name; + input.value = value; + form.appendChild(input); +} + +function writeSubmittedReport(crashID, viewURL) { + let directoryService = Cc[&quot;(a)mozilla.org/file/directory_service;1&quot;]. + getService(Ci.nsIProperties); + let reportFile = directoryService.get("UAppData", Ci.nsIFile); + reportFile.append("Crash Reports"); + reportFile.append("submitted"); + if (!reportFile.exists()) + reportFile.create(Ci.nsIFile.DIRECTORY_TYPE, 0700); + reportFile.append(crashID + ".txt"); + var fstream = Cc[&quot;(a)mozilla.org/network/file-output-stream;1&quot;]. + createInstance(Ci.nsIFileOutputStream); + // open, write, truncate + fstream.init(reportFile, -1, -1, 0); + var os = Cc[&quot;(a)mozilla.org/intl/converter-output-stream;1&quot;]. + createInstance(Ci.nsIConverterOutputStream); + os.init(fstream, "UTF-8", 0, 0x0000); + + var data = strings.crashid.replace("%s", crashID); + if (viewURL) + data += "\n" + strings.reporturl.replace("%s", viewURL); + + os.writeString(data); + os.close(); + fstream.close(); +} + +// the Submitter class represents an individual submission. +function Submitter(id, element, submitSuccess, submitError) { + this.id = id; + this.element = element; + this.document = element.ownerDocument; + this.successCallback = submitSuccess; + this.errorCallback = submitError; +} + +Submitter.prototype = { + submitSuccess: function Submitter_submitSuccess(ret) + { + if (!ret.CrashID) { + this.notifyStatus(FAILED); + this.cleanup(); + return; + } + + // Write out the details file to submitted/ + writeSubmittedReport(ret.CrashID, ret.ViewURL); + + // Delete from pending dir + try { + this.dump.remove(false); + this.extra.remove(false); + } + catch (ex) { + // report an error? not much the user can do here. + } + + this.notifyStatus(SUCCESS, ret); + this.cleanup(); + }, + + cleanup: function Submitter_cleanup() { + // drop some references just to be nice + this.element = null; + this.document = null; + this.successCallback = null; + this.errorCallback = null; + this.iframe = null; + this.dump = null; + this.extra = null; + // remove this object from the list of active submissions + let idx = CrashSubmit._activeSubmissions.indexOf(this); + if (idx != -1) + CrashSubmit._activeSubmissions.splice(idx, 1); + }, + + submitForm: function Submitter_submitForm() + { + let reportData = parseKeyValuePairsFromFile(this.extra); + let form = this.iframe.contentDocument.forms[0]; + if ('ServerURL' in reportData) { + form.action = reportData.ServerURL; + delete reportData.ServerURL; + } + else { + return false; + } + // add the other data + for (let [name, value] in Iterator(reportData)) { + addFormEntry(this.iframe.contentDocument, form, name, value); + } + // tell the server not to throttle this, since it was manually submitted + addFormEntry(this.iframe.contentDocument, form, "Throttleable", "0"); + // add the minidump + this.iframe.contentDocument.getElementById('minidump').value + = this.dump.path; + this.iframe.docShell.QueryInterface(Ci.nsIWebProgress); + this.iframe.docShell.addProgressListener(this, Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT); + form.submit(); + return true; + }, + + // web progress listener + QueryInterface: function(aIID) + { + if (aIID.equals(Ci.nsIWebProgressListener) || + aIID.equals(Ci.nsISupportsWeakReference) || + aIID.equals(Ci.nsISupports)) + return this; + throw Components.results.NS_NOINTERFACE; + }, + + onStateChange: function(aWebProgress, aRequest, aFlag, aStatus) + { + if(aFlag & STATE_STOP) { + this.iframe.docShell.QueryInterface(Ci.nsIWebProgress); + this.iframe.docShell.removeProgressListener(this); + + // check general request status first + if (!Components.isSuccessCode(aStatus)) { + this.element.removeChild(this.iframe); + this.notifyStatus(FAILED); + this.cleanup(); + return 0; + } + // check HTTP status + if (aRequest instanceof Ci.nsIHttpChannel && + aRequest.responseStatus != 200) { + this.element.removeChild(this.iframe); + this.notifyStatus(FAILED); + this.cleanup(); + return 0; + } + + var ret = parseKeyValuePairs(this.iframe.contentDocument.documentElement.textContent); + this.element.removeChild(this.iframe); + this.submitSuccess(ret); + } + return 0; + }, + + onLocationChange: function(aProgress, aRequest, aURI) {return 0;}, + onProgressChange: function() {return 0;}, + onStatusChange: function() {return 0;}, + onSecurityChange: function() {return 0;}, + + notifyStatus: function Submitter_notify(status, ret) + { + let propBag = Cc[&quot;(a)mozilla.org/hash-property-bag;1&quot;]. + createInstance(Ci.nsIWritablePropertyBag2); + propBag.setPropertyAsAString("minidumpID", this.id); + + Cc[&quot;(a)mozilla.org/observer-service;1&quot;] + .getService(Ci.nsIObserverService) + .notifyObservers(propBag, "crash-report-status", status); + + switch (status) { + case SUCCESS: + if (this.successCallback) + this.successCallback(this.id, ret); + break; + case FAILED: + if (this.errorCallback) + this.errorCallback(this.id); + break; + default: + // no callbacks invoked. + } + }, + + submit: function Submitter_submit() + { + let [dump, extra] = getPendingMinidump(this.id); + if (!dump.exists() || !extra.exists()) { + this.notifyStatus(FAILED); + this.cleanup(); + return false; + } + + this.notifyStatus(SUBMITTING); + + this.dump = dump; + this.extra = extra; + let iframe = this.document.createElementNS("http://www.mozilla.org/keymaster/gate...;, "iframe"); + iframe.setAttribute("type", "content"); + iframe.style.width = 0; + iframe.style.minWidth = 0; + + let self = this; + function loadHandler() { + if (iframe.contentWindow.location == "about:blank") + return; + iframe.removeEventListener("load", loadHandler, true); + if (!self.submitForm()) { + this.notifyStatus(FAILED); + self.cleanup(); + } + } + + iframe.addEventListener("load", loadHandler, true); + this.element.appendChild(iframe); + this.iframe = iframe; + iframe.webNavigation.loadURI("chrome://global/content/crash-submit-form.xhtml", 0, null, null, null); + return true; + } +}; + +//=================================== +// External API goes here +let CrashSubmit = { + /** + * Submit the crash report named id.dmp from the "pending" directory. + * + * @param id + * Filename (minus .dmp extension) of the minidump to submit. + * @param element + * A DOM element to which an iframe can be appended as a child, + * used for form submission. + * @param submitSuccess + * A function that will be called if the report is submitted + * successfully with two parameters: the id that was passed + * to this function, and an object containing the key/value + * data returned from the server in its properties. + * @param submitError + * A function that will be called with one parameter if the + * report fails to submit: the id that was passed to this + * function. + * + * @return true if the submission began successfully, or false if + * it failed for some reason. (If the dump file does not + * exist, for example.) + */ + submit: function CrashSubmit_submit(id, element, submitSuccess, submitError) + { + let submitter = new Submitter(id, element, submitSuccess, submitError); + CrashSubmit._activeSubmissions.push(submitter); + return submitter.submit(); + }, + + // List of currently active submit objects + _activeSubmissions: [] +}; + +// Run this when first loaded +getL10nStrings(); Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/DownloadLastDir.jsm =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/DownloadLastDir.jsm 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/DownloadLastDir.jsm 2010-07-20 21:24:34 UTC (rev 23608) @@ -34,8 +34,13 @@ * * ***** END LICENSE BLOCK ***** */ +const LAST_DIR_PREF = "browser.download.lastDir"; + var EXPORTED_SYMBOLS = [ "gDownloadLastDir" ]; +let prefSvc = Components.classes[&quot;(a)mozilla.org/preferences-service;1&quot;] + .getService(Components.interfaces.nsIPrefBranch); + let observer = { QueryInterface: function (aIID) { if (aIID.equals(Components.interfaces.nsIObserver) || @@ -45,13 +50,23 @@ throw Components.results.NS_NOINTERFACE; }, observe: function (aSubject, aTopic, aData) { - gDownloadLastDirFile = null; + switch (aTopic) { + case "private-browsing": + gDownloadLastDirFile = null; + break; + case "browser:purge-session-history": + gDownloadLastDirFile = null; + if (prefSvc.prefHasUserValue(LAST_DIR_PREF)) + prefSvc.clearUserPref(LAST_DIR_PREF); + break; + } } }; -Components.classes[&quot;(a)mozilla.org/observer-service;1&quot;] - .getService(Components.interfaces.nsIObserverService) - .addObserver(observer, "private-browsing", true); +let os = Components.classes[&quot;(a)mozilla.org/observer-service;1&quot;] + .getService(Components.interfaces.nsIObserverService); +os.addObserver(observer, "private-browsing", true); +os.addObserver(observer, "browser:purge-session-history", true); let gDownloadLastDirFile = null; let gDownloadLastDir = { Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/LightweightThemeManager.jsm =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/LightweightThemeManager.jsm 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/LightweightThemeManager.jsm 2010-07-20 21:24:34 UTC (rev 23608) @@ -109,6 +109,8 @@ }, set currentTheme (aData) { + aData = _sanitizeTheme(aData); + let cancel = Cc[&quot;(a)mozilla.org/supports-PRBool;1&quot;].createInstance(Ci.nsISupportsPRBool); cancel.data = false; _observerService.notifyObservers(cancel, "lightweight-theme-change-requested", @@ -190,39 +192,10 @@ parseTheme: function (aString, aBaseURI) { try { - var data = JSON.parse(aString); + return _sanitizeTheme(JSON.parse(aString), aBaseURI); } catch (e) { return null; } - - if (!data || typeof data != "object") - return null; - - for (let prop in data) { - if (typeof data[prop] == "string" && - (data[prop] = data[prop].trim()) && - (MANDATORY.indexOf(prop) > -1 || OPTIONAL.indexOf(prop) > -1)) { - if (!/URL$/.test(prop)) - continue; - - try { - data[prop] = _makeURI(data[prop], _makeURI(aBaseURI)).spec; - if (/^https:/.test(data[prop])) - continue; - if (prop != "updateURL" && /^http:/.test(data[prop])) - continue; - } catch (e) {} - } - - delete data[prop]; - } - - for (let i = 0; i < MANDATORY.length; i++) { - if (!(MANDATORY[i] in data)) - return null; - } - - return data; }, updateCurrentTheme: function () { @@ -264,8 +237,55 @@ } }; +function _sanitizeTheme(aData, aBaseURI) { + if (!aData || typeof aData != "object") + return null; + + function sanitizeProperty(prop) { + if (!(prop in aData)) + return null; + if (typeof aData[prop] != "string") + return null; + let val = aData[prop].trim(); + if (!val) + return null; + + if (!/URL$/.test(prop)) + return val; + + try { + val = _makeURI(val, aBaseURI ? _makeURI(aBaseURI) : null).spec; + if (/^https:/.test(val)) + return val; + if (prop != "updateURL" && /^http:/.test(val)) + return val; + return null; + } + catch (e) { + return null; + } + } + + let result = {}; + for (let i = 0; i < MANDATORY.length; i++) { + let val = sanitizeProperty(MANDATORY[i]); + if (!val) + throw Components.results.NS_ERROR_INVALID_ARG; + result[MANDATORY[i]] = val; + } + + for (let i = 0; i < OPTIONAL.length; i++) { + let val = sanitizeProperty(OPTIONAL[i]); + if (!val) + continue; + result[OPTIONAL[i]] = val; + } + + return result; +} + function _usedThemesExceptId(aId) - LightweightThemeManager.usedThemes.filter(function (t) t.id != aId); + LightweightThemeManager.usedThemes.filter(function (t) "id" in t && t.id != aId); function _version(aThemeData) aThemeData.version || ""; Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/XPCOMUtils.jsm =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/XPCOMUtils.jsm 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/XPCOMUtils.jsm 2010-07-20 21:24:34 UTC (rev 23608) @@ -271,6 +271,28 @@ }, /** + * Helper which iterates over a nsISimpleEnumerator. + * @param e The nsISimpleEnumerator to iterate over. + * @param i The expected interface for each element. + */ + IterSimpleEnumerator: function XPCU_IterSimpleEnumerator(e, i) + { + while (e.hasMoreElements()) + yield e.getNext().QueryInterface(i); + }, + + /** + * Helper which iterates over a string enumerator. + * @param e The string enumerator (nsIUTF8StringEnumerator or + * nsIStringEnumerator) over which to iterate. + */ + IterStringEnumerator: function XPCU_IterStringEnumerator(e) + { + while (e.hasMore()) + yield e.getNext(); + }, + + /** * Convenience access to category manager */ get categoryManager() { @@ -311,3 +333,4 @@ throw Cr.NS_ERROR_NO_INTERFACE; }; } + Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/debug.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/debug.js 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/debug.js 2010-07-20 21:24:34 UTC (rev 23608) @@ -1,4 +1,4 @@ -//@line 44 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/content/debug.js" +//@line 44 "/builds/slave/xulrunner_linux_build/build/toolkit/content/debug.js" var EXPORTED_SYMBOLS = ["NS_ASSERT"]; Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/utils.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/utils.js 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/utils.js 2010-07-20 21:24:34 UTC (rev 23608) @@ -68,10 +68,10 @@ const RESTORE_FAILED_NSIOBSERVER_TOPIC = "bookmarks-restore-failed"; const RESTORE_NSIOBSERVER_DATA = "json"; -//@line 76 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/places/src/utils.js" +//@line 76 "/builds/slave/xulrunner_linux_build/build/toolkit/components/places/src/utils.js" // On other platforms, the transferable system converts "\r\n" to "\n". const NEWLINE = "\r\n"; -//@line 79 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/places/src/utils.js" +//@line 79 "/builds/slave/xulrunner_linux_build/build/toolkit/components/places/src/utils.js" function QI_node(aNode, aIID) { var result = null; Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/platform.ini =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/platform.ini 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/platform.ini 2010-07-20 21:24:34 UTC (rev 23608) @@ -1,5 +1,5 @@ [Build] -BuildID=20100222070631 -Milestone=1.9.2 -SourceStamp=448d0d2d310c +BuildID=20100625222713 +Milestone=1.9.2.6 +SourceStamp=c07c6c1b5071 SourceRepository=http://hg.mozilla.org/releases/mozilla-1.9.2 Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugin-container =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugin-container ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libnullplugin.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libnullplugin.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libunixprintplugin.so =================================================================== (Binary files differ) Property changes on: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libunixprintplugin.so ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/charsetalias.properties =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/charsetalias.properties 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/charsetalias.properties 2010-07-20 21:24:34 UTC (rev 23608) @@ -297,6 +297,7 @@ ms_kanji=Shift_JIS csshiftjis=Shift_JIS windows-31j=Shift_JIS +cp932=Shift_JIS # # Aliases for EUC_JP # Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/html.css =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/html.css 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/html.css 2010-07-20 21:24:34 UTC (rev 23608) @@ -483,14 +483,14 @@ } /* focusable content: anything w/ tabindex >=0 is focusable */ -abbr:focus, acronym:focus, address:focus, applet:focus, b:focus, +abbr:focus, acronym:focus, address:focus, b:focus, base:focus, big:focus, blockquote:focus, br:focus, canvas:focus, caption:focus, center:focus, cite:focus, code:focus, col:focus, colgroup:focus, dd:focus, del:focus, dfn:focus, dir:focus, div:focus, dl:focus, dt:focus, em:focus, fieldset:focus, font:focus, form:focus, h1:focus, h2:focus, h3:focus, h4:focus, h5:focus, h6:focus, hr:focus, i:focus, img:focus, ins:focus, kbd:focus, label:focus, legend:focus, li:focus, link:focus, menu:focus, -object:focus, ol:focus, p:focus, pre:focus, q:focus, s:focus, samp:focus, +ol:focus, p:focus, pre:focus, q:focus, s:focus, samp:focus, small:focus, span:focus, strike:focus, strong:focus, sub:focus, sup:focus, table:focus, tbody:focus, td:focus, tfoot:focus, th:focus, thead:focus, tr:focus, tt:focus, u:focus, ul:focus, var:focus { Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpcshell =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpidl =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner 2010-07-20 20:48:20 UTC (rev 23607) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner 2010-07-20 21:24:34 UTC (rev 23608) @@ -50,7 +50,7 @@ #uncomment for debugging #set -x -moz_libdir=/usr/local/lib/xulrunner-1.9.2 +moz_libdir=/usr/local/lib/xulrunner-1.9.2.6 # Use run-mozilla.sh in the current dir if it exists # If not, then start resolving symlinks until we find run-mozilla.sh Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner-bin =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner-stub =================================================================== (Binary files differ)