249601 - add back lock icon to status bar, rev version number

browser/base/content/browser.js

@@ -2295,6 +2295,7 @@ nsBrowserStatusHandler.prototype =
     this.statusMeter     = document.getElementById("statusbar-icon");
     this.stopCommand     = document.getElementById("Browser:Stop");
     this.statusTextField = document.getElementById("statusbar-display");
+    this.securityButton  = document.getElementById("security-button");
     this.urlBar          = document.getElementById("urlbar");
 
     // Initialize the security button's state and tooltip text
@@ -2309,6 +2310,7 @@ nsBrowserStatusHandler.prototype =
     this.statusMeter     = null;
     this.stopCommand     = null;
     this.statusTextField = null;
+    this.securityButton  = null;
     this.urlBar          = null;
     this.statusText      = null;
   },
@@ -2512,25 +2514,33 @@ nsBrowserStatusHandler.prototype =
 
     switch (aState) {
       case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_HIGH:
+        this.securityButton.setAttribute("level", "high");
         this.urlBar.setAttribute("level", "high");
         break;
       case wpl.STATE_IS_SECURE | wpl.STATE_SECURE_LOW:
+        this.securityButton.setAttribute("level", "low");
         this.urlBar.setAttribute("level", "low");
         break;
       case wpl.STATE_IS_BROKEN:
+        this.securityButton.setAttribute("level", "broken");
         this.urlBar.setAttribute("level", "broken");
         break;
       case wpl.STATE_IS_INSECURE:
       default:
+        this.securityButton.removeAttribute("level");
         this.urlBar.removeAttribute("level");
         break;
     }
 
     var securityUI = gBrowser.securityUI;
-    if (securityUI)
+    if (securityUI) {
+      this.securityButton.setAttribute("tooltiptext", securityUI.tooltipText);
       this.urlBar.setAttribute("infotext", securityUI.tooltipText);
-    else
+    }
+    else {
+      this.securityButton.setAttribute("tooltiptext", securityUI.tooltipText);
       this.urlBar.removeAttribute("infotext");
+    }
   },
 
   startDocumentLoad : function(aRequest)

browser/base/content/browser.xul

@@ -418,6 +418,7 @@
   </hbox>
   <statusbar class="chromeclass-status" id="status-bar"
              ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
+    <statusbarpanel id="security-button" class="statusbarpanel-iconic" ondblclick="displaySecurityInfo();"/>
     <statusbarpanel id="page-report-button" class="statusbarpanel-iconic" tooltiptext="&pageReportIcon.tooltip;"
                     ondblclick="displayPageReport();"/>
     <statusbarpanel id="page-theme-button" type="menu" class="statusbarpanel-menu-iconic" tooltiptext="&pageThemeIcon.tooltip;">

browser/config/version.txt

@@ -1 +1 @@
-0.8.0+
+0.9.0+

browser/installer/unix/installer.cfg.in

@@ -2,7 +2,7 @@ VersionLanguage           = en
 NameCompany               = mozilla.org
 NameProduct               = Mozilla Firefox
 NameProductInternal       = Mozilla Firefox
-VersionProduct            = 0.8
+VersionProduct            = 0.9+
 FileInstallerEXE          = $INSTALLER_NAME$
 FileMainEXE               = firefox
 FileUninstall             = UninstallFirefox

browser/installer/windows/installer.cfg

@@ -3,7 +3,7 @@ NameCompany               = Mozilla
 NameProduct               = Mozilla Firefox
 NameProductInternal       = Mozilla Firefox
 ShortNameProduct          = Firefox
-VersionProduct            = 0.8
+VersionProduct            = 0.9+
 FileInstallerEXE          = FirefoxSetup.exe
 FileMainEXE               = firefox.exe
 FileUninstall             = UninstallFirefox.exe