b44281, r=don, a=don

extensions/psm-glue/res/content/securityUI.js

@@ -32,7 +32,7 @@ function SetSecurityButton()
     securityUI = ui.QueryInterface(Components.interfaces.nsSecureBrowserUI);
 
     var button  = document.getElementById('security-button');
-    var certAuth = document.getElementById('certificate-authority');
+    var certAuth = document.getElementById('security-button');
 	if (button && window._content)
 		securityUI.init(window._content, button, certAuth);
 }

extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp

@@ -382,7 +382,7 @@ nsSecureBrowserUIImpl::OnStateChange(nsIWebProgress* aWebProgress,
                                 // will memcpy just return if size == 0?
                                 memcpy(str + CERT_PREFIX_STR_LENGTH, caName.data, caName.len);
                                 *(str + CERT_PREFIX_STR_LENGTH + caName.len) = '\0';
-                                res = mCertificateAuthorityDisplay->SetAttribute( NS_ConvertASCIItoUCS2("value"), NS_ConvertASCIItoUCS2(str) );
+                                res = mCertificateAuthorityDisplay->SetAttribute( NS_ConvertASCIItoUCS2("tooltiptext"), NS_ConvertASCIItoUCS2(str) );
                                 nsMemory::Free(str);
                             }
                         }

xpfe/browser/resources/content/navigatorOverlay.xul

@@ -504,7 +504,7 @@ END of Deprecated -->
     <statusbarpanel id="statusbar-display" value="&statusText.label;" crop="right" flex="1"/>
     <spring flex="2"/>
     <statusbarpanel id="certificate-authority"/>
-    <statusbarpanel id="security-button"/>
+    <statusbarpanel id="security-button"/> <!-- tooltip="aTooltip"/-->
   </statusbar>
 
 </overlay>