From bdd50fc85d15aaf2b35f51c0e1e6c7dc87a8bc32 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Mon, 14 Jul 2003 22:14:05 +0000
Subject: [PATCH] Add a button for visiting security devices to the account
 manager security panel.

Temporarily remove the description for this button as it causes the panel to overflow. Hopefully we'll
put it back when I can create some more space.
---
 mail/extensions/smime/content/am-smime.js  | 17 ++++++++++++++++-
 mail/extensions/smime/content/am-smime.xul |  6 +++++-
 mail/extensions/smime/locale/am-smime.dtd  |  5 +++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/mail/extensions/smime/content/am-smime.js b/mail/extensions/smime/content/am-smime.js
index 1590e06b2f21..1e2ff7dc2683 100644
--- a/mail/extensions/smime/content/am-smime.js
+++ b/mail/extensions/smime/content/am-smime.js
@@ -408,4 +408,19 @@ function openCertManager()
   else
     window.open('chrome://pippki/content/certManager.xul',  "",
                 'chrome,height=400,centerscreen,resizable=yes,dialog=no');
-}
\ No newline at end of file
+}
+
+function openDeviceManager()
+{
+  //check for an existing deviceManger window and focus it; it's not application modal
+  const kWindowMediatorContractID = "@mozilla.org/appshell/window-mediator;1";
+  const kWindowMediatorIID = Components.interfaces.nsIWindowMediator;
+  const kWindowMediator = Components.classes[kWindowMediatorContractID].getService(kWindowMediatorIID);
+  var lastCertManager = kWindowMediator.getMostRecentWindow("mozilla:devicemanager");
+  if (lastCertManager)
+    lastCertManager.focus();
+  else {
+    window.open('chrome://pippki/content/device_manager.xul',  "devmgr",
+                'chrome,height=400,centerscreen,resizable=yes,dialog=no');
+  }
+}
diff --git a/mail/extensions/smime/content/am-smime.xul b/mail/extensions/smime/content/am-smime.xul
index 264cf0a73970..2b9e7826fe5a 100644
--- a/mail/extensions/smime/content/am-smime.xul
+++ b/mail/extensions/smime/content/am-smime.xul
@@ -98,12 +98,16 @@
   <!-- Certificate manager -->
   <groupbox>
     <caption label="&managecerts.label;"/>
-    <description>&managecerts.text;</description>
     <hbox align="right">
       <button label="&managecerts.button;"
               oncommand="openCertManager();" 
               id="openCertManagerButton"
               accesskey="&managecerts.accesskey;"/>
+      <button label="&managedevices.button;"
+              oncommand="openDeviceManager();"
+              id="openDeviceManagerButton"
+              accesskey="&managedevices.accesskey;"
+              prefstring="security.disable_button.openDeviceManager"/>
     </hbox>
   </groupbox>
      
diff --git a/mail/extensions/smime/locale/am-smime.dtd b/mail/extensions/smime/locale/am-smime.dtd
index 9fbe67f40470..b1614be2f4d1 100644
--- a/mail/extensions/smime/locale/am-smime.dtd
+++ b/mail/extensions/smime/locale/am-smime.dtd
@@ -13,7 +13,8 @@
 <!ENTITY signingCert.message "Use this certificate to digitally sign messages you send:">
 <!ENTITY signingCert.notselected "No certificate set">
 
-<!ENTITY  managecerts.label      "Manage Certificates">
-<!ENTITY  managecerts.text       "Use the Certificate Manager to manage your personal certificates, as well as those of other people and certificate authorities.">
+<!ENTITY  managecerts.label      "Manage Certificates and Devices">
 <!ENTITY  managecerts.button     "Manage Certificates...">
 <!ENTITY  managecerts.accesskey  "M">
+<!ENTITY  managedevices.button   "Manage Security Devices...">
+<!ENTITY  managedevices.accesskey   "S">
\ No newline at end of file