Author: dgolovin Date: 2010-08-03 15:25:10 -0400 (Tue, 03 Aug 2010) New Revision: 23885 Modified: 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/components/components.list trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/jsconsole-clhandler.js 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/nsAddonRepository.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsBlocklistService.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsDefaultCLH.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsExtensionManager.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsFilePicker.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsHelperAppDlg.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsLivemarkService.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsSearchService.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsURLFormatter.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateService.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateServiceStub.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateTimerManager.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsXULAppInstall.js 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/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.chk 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.chk 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/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/mozilla-xremote-client trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/platform.ini 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 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/updater 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/xpt_dump trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpt_link 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-6769 XULRunner 1.9.2 binaries downloaded from mozilla site is not working OOB under RHEL5 with SELinux in restricted mode xulrunner binaries built under RHEL5 x86 and tested under ubuntu 10.04 x86 distribution 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) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/components.list =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/components.list 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/components.list 2010-08-03 19:25:10 UTC (rev 23885) @@ -3,8 +3,8 @@ nsWebHandlerApp.js NetworkGeolocationProvider.js GPSDGeolocationProvider.js -txEXSLTRegExFunctions.js nsBadCertHandler.js +txEXSLTRegExFunctions.js nsHelperAppDlg.js nsProgressDialog.js nsURLFormatter.js @@ -35,8 +35,6 @@ nsUpdateServiceStub.js pluginGlue.js nsContentDispatchChooser.js -libmozgnome.so libdbusservice.so libimgicon.so -libnkgnomevfs.so nsXULAppInstall.js Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/jsconsole-clhandler.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/jsconsole-clhandler.js 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/jsconsole-clhandler.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -1,4 +1,4 @@ -//@line 41 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/console/jsconsole-clhandler.js" +//@line 41 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/console/jsconsole-clhandler.js" const Cc = Components.classes; const Ci = Components.interfaces; Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libdbusservice.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libimgicon.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsAddonRepository.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsAddonRepository.js 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsAddonRepository.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -1,6 +1,6 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* -//@line 38 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsAddonRepository.js" +//@line 38 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsAddonRepository.js" */ const Cc = Components.classes; Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsBlocklistService.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsBlocklistService.js 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsBlocklistService.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -1,6 +1,6 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* -//@line 41 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsBlocklistService.js" +//@line 41 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsBlocklistService.js" */ const Cc = Components.classes; @@ -64,7 +64,7 @@ catch (e) { LOG("BlockList Global gABI: XPCOM ABI unknown."); } -//@line 113 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsBlocklistService.js" +//@line 113 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsBlocklistService.js" return abi; }); @@ -495,7 +495,7 @@ }, /** -//@line 592 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsBlocklistService.js" +//@line 592 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsBlocklistService.js" */ _loadBlocklistFromFile: function(file) { Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsDefaultCLH.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsDefaultCLH.js 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsDefaultCLH.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -1,4 +1,4 @@ -//@line 38 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/nsDefaultCLH.js" +//@line 38 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/nsDefaultCLH.js" const nsISupports = Components.interfaces.nsISupports; Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsExtensionManager.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsExtensionManager.js 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsExtensionManager.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -1,6 +1,6 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* -//@line 44 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in" +//@line 44 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsExtensionManager.js.in" */ // @@ -1399,7 +1399,7 @@ QueryInterface: XPCOMUtils.generateQI([Ci.nsIInstallLocation]) }; -//@line 1592 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in" +//@line 1592 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsExtensionManager.js.in" /** * Safely attempt to install or uninstall a given item ID in an install @@ -2053,7 +2053,7 @@ InstallLocations.put(systemLocation); } -//@line 2260 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in" +//@line 2260 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsExtensionManager.js.in" // Register Additional Install Locations var categoryManager = Cc[&quot;(a)mozilla.org/categorymanager;1&quot;]. @@ -4949,13 +4949,13 @@ // count to 0 to prevent this dialog from being displayed again. this._downloadCount = 0; var result; -//@line 5156 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in" +//@line 5156 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsExtensionManager.js.in" result = this._confirmCancelDownloads(this._downloadCount, "quitCancelDownloadsAlertTitle", "quitCancelDownloadsAlertMsgMultiple", "quitCancelDownloadsAlertMsg", "dontQuitButtonWin"); -//@line 5168 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in" +//@line 5168 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsExtensionManager.js.in" if (subject instanceof Ci.nsISupportsPRBool) subject.data = result; } @@ -5498,7 +5498,7 @@ _listener : null, /* ExtensionItemUpdater -//@line 5736 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in" +//@line 5736 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsExtensionManager.js.in" */ checkForUpdates: function ExtensionItemUpdater_checkForUpdates(aItems, aItemCount, @@ -5897,7 +5897,7 @@ onDatasourceLoaded: function RDFItemUpdater_onDatasourceLoaded(aDatasource, aLocalItem) { /* -//@line 6175 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/extensions/src/nsExtensionManager.js.in" +//@line 6175 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/extensions/src/nsExtensionManager.js.in" */ if (!aDatasource.GetAllResources().hasMoreElements()) { LOG("RDFItemUpdater:onDatasourceLoaded: Datasource empty.\r\n" + Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsFilePicker.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsFilePicker.js 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsFilePicker.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -277,9 +277,9 @@ compMgr.registerFactoryLocation(FILEPICKER_CID, "FilePicker JS Component", -//@line 283 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/filepicker/src/nsFilePicker.js.in" +//@line 283 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/filepicker/src/nsFilePicker.js.in" "", -//@line 285 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/filepicker/src/nsFilePicker.js.in" +//@line 285 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/filepicker/src/nsFilePicker.js.in" fileSpec, location, type); Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsHelperAppDlg.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsHelperAppDlg.js 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsHelperAppDlg.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -1,5 +1,5 @@ /* -//@line 45 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 45 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" */ /////////////////////////////////////////////////////////////////////////////// @@ -290,7 +290,7 @@ this.makeFileUnique(aLocalFile); -//@line 354 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 354 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" return aLocalFile; }, @@ -467,7 +467,7 @@ // want users to be able to autodownload .exe files. var rememberChoice = this.dialogElement("rememberChoice"); -//@line 549 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 549 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" if (shouldntRememberChoice) { rememberChoice.checked = false; rememberChoice.disabled = true; @@ -607,12 +607,12 @@ // Returns true if opening the default application makes sense. openWithDefaultOK: function() { // The checking is different on Windows... -//@line 699 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 699 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" // On other platforms, default is Ok if there is a default app. // Note that nsIMIMEInfo providers need to ensure that this holds true // on each platform. return this.mLauncher.MIMEInfo.hasDefaultHandler; -//@line 704 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 704 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" }, // Set "default" application description field. @@ -633,9 +633,9 @@ // getPath: getPath: function (aFile) { -//@line 727 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 727 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" return aFile.path; -//@line 729 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 729 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" }, // initAppAndSaveToDiskValues: @@ -677,9 +677,9 @@ otherHandler.setAttribute("path", this.getPath(this.chosenApp.executable)); -//@line 774 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 774 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" otherHandler.label = this.chosenApp.executable.leafName; -//@line 776 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 776 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" otherHandler.hidden = false; } @@ -867,7 +867,7 @@ // for the file to be saved to to pass to |saveToDisk| - otherwise // we must ask the user to pick a save name. -//@line 977 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 977 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" // see @notify // we cannot use opener's setTimeout, see bug 420405 @@ -922,13 +922,13 @@ // Retrieve the pretty description from the file getFileDisplayName: function getFileDisplayName(file) { -//@line 1039 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 1039 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" return file.leafName; }, // chooseApp: Open file picker and prompt user for application. chooseApp: function() { -//@line 1110 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 1110 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" var nsIFilePicker = Components.interfaces.nsIFilePicker; var fp = Components.classes[&quot;(a)mozilla.org/filepicker;1&quot;] .createInstance(nsIFilePicker); @@ -954,9 +954,9 @@ var otherHandler = this.dialogElement("otherHandler"); otherHandler.removeAttribute("hidden"); otherHandler.setAttribute("path", this.getPath(this.chosenApp.executable)); -//@line 1140 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 1140 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" otherHandler.label = this.chosenApp.executable.leafName; -//@line 1142 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 1142 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" this.dialogElement("openHandler").selectedIndex = 1; this.dialogElement("openHandler").setAttribute("lastSelectedItemID", "otherHandler"); @@ -969,7 +969,7 @@ lastSelectedID = "defaultHandler"; openHandler.selectedItem = this.dialogElement(lastSelectedID); } -//@line 1155 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" +//@line 1155 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/downloads/src/nsHelperAppDlg.js.in" }, // Turn this on to get debugging messages. Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsLivemarkService.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsLivemarkService.js 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsLivemarkService.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -48,7 +48,7 @@ const Ci = Components.interfaces; const Cr = Components.results; -//@line 36 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/url-classifier/content/moz/lang.js" +//@line 36 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/url-classifier/content/moz/lang.js" /** @@ -128,7 +128,7 @@ this.superClass_ = parentCtor.prototype; this.prototype = new tempCtor(); } -//@line 36 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/url-classifier/content/moz/observer.js" +//@line 36 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/url-classifier/content/moz/observer.js" // A couple of classes to simplify creating observers. @@ -228,7 +228,7 @@ this.unregister(); } -//@line 36 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/url-classifier/content/moz/alarm.js" +//@line 36 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/url-classifier/content/moz/alarm.js" // An Alarm fires a callback after a certain amount of time, or at @@ -374,7 +374,7 @@ this.cancel(); } } -//@line 54 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/places/src/nsLivemarkService.js" +//@line 54 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/places/src/nsLivemarkService.js" const LS_CLASSID = Components.ID("{dca61eb5-c7cd-4df1-b0fb-d0722baba251}"); const LS_CLASSNAME = "Livemark Service"; Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsSearchService.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsSearchService.js 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsSearchService.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -1,4 +1,4 @@ -//@line 40 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/search/nsSearchService.js" +//@line 40 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/search/nsSearchService.js" const Ci = Components.interfaces; const Cc = Components.classes; @@ -108,9 +108,9 @@ const USER_DEFINED = "{searchTerms}"; // Custom search parameters -//@line 150 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/search/nsSearchService.js" -const MOZ_OFFICIAL = "official"; -//@line 154 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/search/nsSearchService.js" +//@line 152 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/search/nsSearchService.js" +const MOZ_OFFICIAL = "unofficial"; +//@line 154 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/search/nsSearchService.js" const MOZ_DISTRIBUTION_ID = "org.mozilla"; const MOZ_PARAM_LOCALE = /\{moz:locale\}/g; @@ -203,7 +203,7 @@ consoleService.logStringMessage(aText); } -//@line 258 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/search/nsSearchService.js" +//@line 258 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/search/nsSearchService.js" /** * Otherwise, don't log at all by default. This can be overridden at startup @@ -211,7 +211,7 @@ */ var LOG = function(){}; -//@line 266 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/search/nsSearchService.js" +//@line 266 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/search/nsSearchService.js" /** * Presents an assertion dialog in non-release builds and throws. @@ -3699,7 +3699,7 @@ return gModule; } -//@line 44 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/content/debug.js" +//@line 44 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/content/debug.js" var EXPORTED_SYMBOLS = ["NS_ASSERT"]; Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsURLFormatter.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsURLFormatter.js 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsURLFormatter.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -1,4 +1,4 @@ -//@line 37 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/components/urlformatter/src/nsURLFormatter.js" +//@line 37 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/urlformatter/src/nsURLFormatter.js" /** * @class nsURLFormatterService * Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateService.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateService.js 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateService.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -1,6 +1,6 @@ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* -//@line 44 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in" +//@line 44 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in" */ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/FileUtils.jsm"); @@ -39,7 +39,7 @@ const KEY_APPDIR = "XCurProcD"; const KEY_GRED = "GreD"; -//@line 87 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in" +//@line 87 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in" const DIR_UPDATES = "updates"; const FILE_UPDATE_STATUS = "update.status"; @@ -111,7 +111,7 @@ catch (e) { LOG("gABI - XPCOM ABI unknown: updates are not possible."); } -//@line 167 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in" +//@line 167 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in" return abi; }); @@ -147,7 +147,7 @@ updateTestFile.remove(false); updateTestFile.create(NORMAL_FILE_TYPE, FileUtils.PERMS_FILE); updateTestFile.remove(false); -//@line 276 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in" +//@line 276 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in" } catch (e) { LOG("gCanApplyUpdates - unable to apply updates. Exception: " + e); @@ -200,7 +200,7 @@ } /** -//@line 338 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in" +//@line 338 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in" */ function getPref(func, preference, defaultValue) { try { @@ -230,10 +230,10 @@ } /** -//@line 373 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in" +//@line 373 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in" */ function getUpdateDirCreate(pathArray) { -//@line 384 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in" +//@line 384 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in" return FileUtils.getDir(KEY_APPDIR, pathArray, true); } @@ -321,7 +321,7 @@ } /** -//@line 485 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in" +//@line 485 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in" */ function writeVersionFile(dir, version) { var versionFile = dir.clone(); @@ -1148,7 +1148,7 @@ } /** -//@line 1323 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in" +//@line 1323 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in" */ // Encode version since it could be a non-ascii string (bug 359093) @@ -1177,7 +1177,7 @@ } /** -//@line 1367 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in" +//@line 1367 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in" */ if (update.type == "major") { LOG("Checker:_selectAndInstallUpdate - prompting because it is a major " + @@ -1256,7 +1256,7 @@ if (currentAddons.length > 0) { /** -//@line 1463 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateService.js.in" +//@line 1463 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateService.js.in" */ this._incompatAddonsCount = currentAddons.length; LOG("UpdateService:_checkAddonCompatibility - checking for " + Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateServiceStub.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateServiceStub.js 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateServiceStub.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -1,6 +1,6 @@ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* -//@line 38 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateServiceStub.js" +//@line 38 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateServiceStub.js" */ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/FileUtils.jsm"); @@ -11,13 +11,13 @@ const FILE_UPDATE_STATUS = "update.status"; const KEY_APPDIR = "XCurProcD"; -//@line 53 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateServiceStub.js" +//@line 53 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateServiceStub.js" /** -//@line 61 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateServiceStub.js" +//@line 61 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateServiceStub.js" */ function getUpdateDirNoCreate(pathArray) { -//@line 72 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateServiceStub.js" +//@line 72 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateServiceStub.js" return FileUtils.getDir(KEY_APPDIR, pathArray, false); } Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateTimerManager.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateTimerManager.js 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsUpdateTimerManager.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -1,6 +1,6 @@ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* -//@line 39 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js" +//@line 39 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateTimerManager.js" */ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); @@ -30,7 +30,7 @@ } /** -//@line 78 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js" +//@line 78 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateTimerManager.js" */ function getPref(func, preference, defaultValue) { try { @@ -42,7 +42,7 @@ } /** -//@line 92 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js" +//@line 92 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateTimerManager.js" */ function LOG(string) { if (gLogEnabled) { @@ -52,7 +52,7 @@ } /** -//@line 104 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js" +//@line 104 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateTimerManager.js" */ function TimerManager() { getObserverService().addObserver(this, "xpcom-shutdown", false); @@ -64,7 +64,7 @@ _timer: null, /** -//@line 117 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js" +//@line 117 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateTimerManager.js" */ _timerInterval: null, @@ -74,7 +74,7 @@ _timers: { }, /** -//@line 132 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js" +//@line 132 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateTimerManager.js" */ get _fudge() { return Math.round(Math.random() * this._timerInterval / 1000); @@ -111,7 +111,7 @@ Ci.nsITimer.TYPE_REPEATING_SLACK); }, /** -//@line 171 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/toolkit/mozapps/update/src/nsUpdateTimerManager.js" +//@line 171 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/mozapps/update/src/nsUpdateTimerManager.js" */ notify: function TM_notify(timer) { var prefLastUpdate; Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsXULAppInstall.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsXULAppInstall.js 2010-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsXULAppInstall.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -1,5 +1,5 @@ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -//@line 41 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/setup/nsXULAppInstall.js" +//@line 41 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/setup/nsXULAppInstall.js" const nsIFile = Components.interfaces.nsIFile; const nsIINIParser = Components.interfaces.nsIINIParser; @@ -193,13 +193,13 @@ catch (e) { } if (aDirectory == null) { -//@line 244 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/setup/nsXULAppInstall.js" +//@line 244 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/setup/nsXULAppInstall.js" aDirectory = Components.classes[&quot;(a)mozilla.org/file/local;1&quot;]. createInstance(nsILocalFile); aDirectory.initWithPath("/usr/lib"); if (vendor) aDirectory.append(vendor.toLowerCase()); -//@line 251 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/setup/nsXULAppInstall.js" +//@line 251 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/setup/nsXULAppInstall.js" } else { aDirectory = aDirectory.clone(); @@ -210,9 +210,9 @@ } if (aLeafName == "") { -//@line 267 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/setup/nsXULAppInstall.js" +//@line 267 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/setup/nsXULAppInstall.js" aLeafName = appName.toLowerCase(); -//@line 270 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/setup/nsXULAppInstall.js" +//@line 270 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/setup/nsXULAppInstall.js" } aDirectory.append(aLeafName); @@ -220,14 +220,14 @@ aDirectory.create(nsIFile.DIRECTORY_TYPE, 0755); } -//@line 341 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/setup/nsXULAppInstall.js" +//@line 341 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/setup/nsXULAppInstall.js" extractor.copyTo(aDirectory); var xulrunnerBinary = getDirectoryKey("GreD"); xulrunnerBinary.append("xulrunner-stub"); xulrunnerBinary.copyTo(aDirectory, appName.toLowerCase() + ""); -//@line 348 "/builds/slave/mozilla-1.9.2-linux-xulrunner/build/xulrunner/setup/nsXULAppInstall.js" +//@line 348 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/setup/nsXULAppInstall.js" } }; 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-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/defaults/pref/xulrunner.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -34,7 +34,7 @@ * * ***** END LICENSE BLOCK ***** */ -//@line 38 "/builds/slave/xulrunner_linux_build/build/xulrunner/app/xulrunner.js" +//@line 38 "/home/eskimo/Projects/mozilla-1.9.2/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/xulrunner_linux_build/build/xulrunner/app/xulrunner.js" +//@line 65 "/home/eskimo/Projects/mozilla-1.9.2/xulrunner/app/xulrunner.js" pref("browser.preferences.instantApply", true); -//@line 70 "/builds/slave/xulrunner_linux_build/build/xulrunner/app/xulrunner.js" +//@line 70 "/home/eskimo/Projects/mozilla-1.9.2/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-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/all.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -59,9 +59,9 @@ pref("browser.bookmarks.max_backups", 5); pref("browser.cache.disk.enable", true); -//@line 63 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 63 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" pref("browser.cache.disk.capacity", 51200); -//@line 67 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 67 "/home/eskimo/Projects/mozilla-1.9.2/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/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 76 "/home/eskimo/Projects/mozilla-1.9.2/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/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 92 "/home/eskimo/Projects/mozilla-1.9.2/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/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 156 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" pref("media.ogg.enabled", true); -//@line 159 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 159 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" pref("media.wave.enabled", true); -//@line 161 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 161 "/home/eskimo/Projects/mozilla-1.9.2/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/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 179 "/home/eskimo/Projects/mozilla-1.9.2/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/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 195 "/home/eskimo/Projects/mozilla-1.9.2/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/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 539 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" pref("content.sink.pending_event_mode", 0); -//@line 541 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 541 "/home/eskimo/Projects/mozilla-1.9.2/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/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 592 "/home/eskimo/Projects/mozilla-1.9.2/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,10 +718,7 @@ 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); @@ -731,21 +728,12 @@ pref("network.IDN.whitelist.tw", true); pref("network.IDN.whitelist.vn", true); -// 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 +// non-ccTLDs 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 @@ -825,7 +813,7 @@ // Specify if the gss lib comes standard with the OS pref("network.negotiate-auth.using-native-gsslib", true); -//@line 847 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 835 "/home/eskimo/Projects/mozilla-1.9.2/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 @@ -853,7 +841,9 @@ pref("permissions.default.image", 1); // 1-Accept, 2-Deny, 3-dontAcceptForeign +//@line 864 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" pref("network.proxy.type", 5); +//@line 871 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" pref("network.proxy.ftp", ""); pref("network.proxy.ftp_port", 0); @@ -1204,10 +1194,6 @@ 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); @@ -1243,15 +1229,15 @@ pref("font.minimum-size.x-unicode", 0); pref("font.minimum-size.x-user-def", 0); -//@line 1662 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 1654 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" -//@line 2086 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 2078 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" -//@line 2289 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 2281 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" -//@line 2385 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 2377 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" -//@line 2388 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 2380 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" // Handled differently under Mac/Windows pref("network.hosts.smtp_server", "localhost"); pref("network.hosts.pop_server", "pop"); @@ -1521,15 +1507,15 @@ pref("mousewheel.system_scroll_override_on_root_content.enabled", false); -//@line 2660 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 2652 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" -//@line 2728 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 2720 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" -//@line 2754 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 2746 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" -//@line 2774 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 2766 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" -//@line 2782 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 2774 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" // Login Manager prefs pref("signon.rememberSignons", true); @@ -1566,15 +1552,12 @@ // 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 2824 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 2816 "/home/eskimo/Projects/mozilla-1.9.2/modules/libpref/src/init/all.js" -//@line 2829 "/builds/slave/xulrunner_linux_build/build/modules/libpref/src/init/all.js" +//@line 2821 "/home/eskimo/Projects/mozilla-1.9.2/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-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/greprefs/security-prefs.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -5,11 +5,6 @@ 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); @@ -27,14 +22,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 31 "/builds/slave/xulrunner_linux_build/build/netwerk/base/public/security-prefs.js" +//@line 26 "/home/eskimo/Projects/mozilla-1.9.2/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 38 "/builds/slave/xulrunner_linux_build/build/netwerk/base/public/security-prefs.js" +//@line 33 "/home/eskimo/Projects/mozilla-1.9.2/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) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libfreebl3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libjavaxpcomglue.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libmozjs.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnspr4.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnss3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssckbi.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.chk =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssutil3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplc4.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplds4.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsmime3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.chk =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsqlite3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libssl3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxpcom.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxul.so =================================================================== (Binary files differ) 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-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/DownloadLastDir.jsm 2010-08-03 19:25:10 UTC (rev 23885) @@ -34,13 +34,8 @@ * * ***** 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) || @@ -50,23 +45,13 @@ throw Components.results.NS_NOINTERFACE; }, observe: function (aSubject, aTopic, aData) { - 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; - } + gDownloadLastDirFile = null; } }; -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); +Components.classes[&quot;(a)mozilla.org/observer-service;1&quot;] + .getService(Components.interfaces.nsIObserverService) + .addObserver(observer, "private-browsing", 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-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/LightweightThemeManager.jsm 2010-08-03 19:25:10 UTC (rev 23885) @@ -109,8 +109,6 @@ }, 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", @@ -192,10 +190,39 @@ parseTheme: function (aString, aBaseURI) { try { - return _sanitizeTheme(JSON.parse(aString), aBaseURI); + var data = JSON.parse(aString); } 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 () { @@ -237,55 +264,8 @@ } }; -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) "id" in t && t.id != aId); + LightweightThemeManager.usedThemes.filter(function (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-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/XPCOMUtils.jsm 2010-08-03 19:25:10 UTC (rev 23885) @@ -271,28 +271,6 @@ }, /** - * 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() { @@ -333,4 +311,3 @@ 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-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/debug.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -1,4 +1,4 @@ -//@line 44 "/builds/slave/xulrunner_linux_build/build/toolkit/content/debug.js" +//@line 44 "/home/eskimo/Projects/mozilla-1.9.2/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-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/modules/utils.js 2010-08-03 19:25:10 UTC (rev 23885) @@ -68,10 +68,10 @@ const RESTORE_FAILED_NSIOBSERVER_TOPIC = "bookmarks-restore-failed"; const RESTORE_NSIOBSERVER_DATA = "json"; -//@line 76 "/builds/slave/xulrunner_linux_build/build/toolkit/components/places/src/utils.js" +//@line 76 "/home/eskimo/Projects/mozilla-1.9.2/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/xulrunner_linux_build/build/toolkit/components/places/src/utils.js" +//@line 79 "/home/eskimo/Projects/mozilla-1.9.2/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/mozilla-xremote-client =================================================================== (Binary files differ) 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-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/platform.ini 2010-08-03 19:25:10 UTC (rev 23885) @@ -1,5 +1,3 @@ [Build] -BuildID=20100222070631 +BuildID=20100803022546 Milestone=1.9.2 -SourceStamp=448d0d2d310c -SourceRepository=http://hg.mozilla.org/releases/mozilla-1.9.2 Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libnullplugin.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libunixprintplugin.so =================================================================== (Binary files differ) 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-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/charsetalias.properties 2010-08-03 19:25:10 UTC (rev 23885) @@ -297,7 +297,6 @@ 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-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/res/html.css 2010-08-03 19:25:10 UTC (rev 23885) @@ -483,14 +483,14 @@ } /* focusable content: anything w/ tabindex >=0 is focusable */ -abbr:focus, acronym:focus, address:focus, b:focus, +abbr:focus, acronym:focus, address:focus, applet: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, -ol:focus, p:focus, pre:focus, q:focus, s:focus, samp:focus, +object: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/updater =================================================================== (Binary files differ) 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/xpt_dump =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpt_link =================================================================== (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-08-03 18:49:00 UTC (rev 23884) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner 2010-08-03 19:25:10 UTC (rev 23885) @@ -50,7 +50,7 @@ #uncomment for debugging #set -x -moz_libdir=/usr/local/lib/xulrunner-1.9.2.6 +moz_libdir=/usr/local/lib/xulrunner-1.9.2 # 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)