Commit 4a7d100e authored by jorendorff@mozilla.com's avatar jorendorff@mozilla.com
Browse files

Merge from cvs-trunk-mirror to mozilla-central. 

--HG--
rename : js/src/jsobj.c => js/src/jsobj.cpp
parents b4225d2b 77aa6a3b

browser/app/profile/firefox.js

+1 −3
Original line number Diff line number Diff line
@@ -653,9 +653,7 @@ pref("browser.EULA.3.accepted", true); 
#elifdef XP_WIN

pref("browser.EULA.3.accepted", true);

#else

# Need to fix the unittest and talos machine profiles before flipping this by default

#pref("browser.EULA.3.accepted", false);

pref("browser.EULA.3.accepted", true);

pref("browser.EULA.3.accepted", false);

#endif



// if we rev the EULA again, we should bump this so users agree to the new EULA

browser/base/content/baseMenuOverlay.xul

+1 −6
Original line number Diff line number Diff line
@@ -113,13 +113,8 @@ 


    <keyset id="baseMenuKeyset">

#ifdef XP_MACOSX

<!-- On mac, we map Cmd+Shift+/, but show Cmd+?

     (that's for en-US, it might be different for other keyboard layouts) -->

        <key id="key_openHelpMac"

             oncommand="openHelpLink('firefox-help');"

             key="&openHelpMac.commandkey;"

             modifiers="&openHelpMac.modifiers;"/>

        <key id="key_openHelpMacFrontend"

             oncommand="openHelpLink('firefox-help');"

             key="&openHelpMac.frontendCommandkey;"

             modifiers="&openHelpMac.frontendModifiers;"/>

<!-- These are used to build the Application menu under Cocoa widgets -->

browser/base/content/browser-places.js

+1 −0
Original line number Diff line number Diff line
@@ -914,6 +914,7 @@ var PlacesMenuDNDController = { 
      delete this._timers.loadTime;

    if (event.target.id == "bookmarksMenu") {

      // If this is the bookmarks menu, tell its menupopup child to show.

      event.target.lastChild.setAttribute("autoopened", "true");

      event.target.lastChild.showPopup(event.target.lastChild);

    }  

  },

browser/base/content/browser.js

+9 −3
Original line number Diff line number Diff line
@@ -4203,7 +4203,8 @@ nsBrowserStatusHandler.prototype = 
    var locationObj = {};

    try {

      locationObj.host = location.host;

      locationObj.hostname = location.hostname

      locationObj.hostname = location.hostname;

      locationObj.port = location.port;

    } catch (ex) {

      // Can sometimes throw if the URL being visited has no host/hostname,

      // e.g. about:blank. The _state for these pages means we won't need these
@@ -6442,7 +6443,7 @@ IdentityHandler.prototype = { 
   * 

   * @param PRUint32 state

   * @param JS Object location that mirrors an nsLocation (i.e. has .host and

   *                           .hostname)

   *                           .hostname and .port)

   */

  checkIdentity : function(state, location) {

    var currentStatus = gBrowser.securityUI
@@ -6535,8 +6536,13 @@ IdentityHandler.prototype = { 
      // for certs that are trusted because of a security exception.

      var tooltip = this._stringBundle.getFormattedString("identity.identified.verifier",

                                                          [iData.caOrg]);

      

      // Check whether this site is a security exception. XPConnect does the right

      // thing here in terms of converting _lastLocation.port from string to int, but

      // the overrideService doesn't like undefined ports, so make sure we have

      // something in the default case (bug 432241).

      if (this._overrideService.hasMatchingOverride(this._lastLocation.hostname, 

                                                    this._lastLocation.port, 

                                                    (this._lastLocation.port || 443),

                                                    iData.cert, {}, {}))

        tooltip = this._stringBundle.getString("identity.identified.verified_by_you");

    }

browser/base/content/browser.xul

+2 −2
Original line number Diff line number Diff line
@@ -233,8 +233,8 @@ 
  <tooltip id="btTooltip" noautohide="true"

           onpopupshowing="return BookmarksEventHandler.fillInBTTooltip(document.tooltipNode)">

    <vbox id="btTooltipTextBox" flex="1">

      <label id="btTitleText" />

      <label id="btUrlText" />

      <label id="btTitleText" class="tooltip-label" />

      <label id="btUrlText" class="tooltip-label" />

    </vbox>

  </tooltip>