Bug 455310: Unfork Account Manager Security Preferences (am-smime.*) - seamonkey/shared part. r+sr=neil

mailnews/extensions/smime/resources/content/am-smime.js

@@ -446,10 +446,38 @@ function smimeClearCert(smime_cert)
   } else if (smime_cert == kSigningCertPref) {
     enableSigningControls(false);
   }
-  
+
   enableCertSelectButtons();
 }
 
+function openCertManager()
+{
+  // Check for an existing certManager window and focus it; it's not
+  // application modal.
+  var windowMediator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                                 .getService(Components.interfaces.nsIWindowMediator);
+  var lastCertManager = windowMediator.getMostRecentWindow("mozilla:certmanager");
+  if (lastCertManager)
+    lastCertManager.focus();
+  else
+    window.openDialog("chrome://pippki/content/certManager.xul", "",
+                      "centerscreen,resizable=yes,dialog=no");
+}
+
+function openDeviceManager()
+{
+  // Check for an existing deviceManager window and focus it; it's not
+  // application modal.
+  var windowMediator = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                                 .getService(Components.interfaces.nsIWindowMediator);
+  var lastCertManager = windowMediator.getMostRecentWindow("mozilla:devicemanager");
+  if (lastCertManager)
+    lastCertManager.focus();
+  else
+    window.openDialog("chrome://pippki/content/device_manager.xul", "",
+                      "centerscreen,resizable=yes,dialog=no");
+}
+
 function smimeOnLoadEditor()
 {
   smimeInitializeFields();

mailnews/extensions/smime/resources/content/am-smime.xul

@@ -56,4 +56,5 @@
   <dialogheader title="&securityTitle.label;"/>
 
   <vbox flex="1" id="smimeEditing"/>
+
 </page>

mailnews/extensions/smime/resources/content/am-smimeOverlay.xul

@@ -122,5 +122,16 @@
                accesskey="&alwaysEncryptMessage.accesskey;"/>
       </radiogroup>
     </groupbox>
+
+    <!-- Certificate manager -->
+    <groupbox id="smimeCertificateManager" orient="horizontal">
+      <caption label="&certificates.label;"/>
+      <button id="openCertManagerButton" oncommand="openCertManager();"
+              label="&manageCerts.label;" accesskey="&manageCerts.accesskey;"
+              prefstring="security.disable_button.openCertManager"/>
+      <button id="openDeviceManagerButton" oncommand="openDeviceManager();"
+              label="&manageDevices.label;" accesskey="&manageDevices.accesskey;"
+              prefstring="security.disable_button.openDeviceManager"/>
+    </groupbox>
   </vbox>
 </overlay>

suite/locales/en-US/chrome/mailnews/smime/am-smime.dtd

@@ -20,3 +20,9 @@
 <!ENTITY signMessage.label "Digitally sign messages (by default)">
 <!ENTITY signMessage.accesskey "D">
 <!ENTITY signingCert.message "Use this certificate to digitally sign messages you send:">
+
+<!ENTITY certificates.label "Certificates">
+<!ENTITY manageCerts.label "Manage Certificates…">
+<!ENTITY manageCerts.accesskey "M">
+<!ENTITY manageDevices.label "Manage Security Devices…">
+<!ENTITY manageDevices.accesskey "g">