Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26412
Modified Files:
Tag: PKI_8_0_RTM_BRANCH
password.js password.xul
Log Message:
Fix bug#568514 ESC crashes after leaving the computer untouched.
Index: password.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/password.js,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- password.js 4 Feb 2009 01:43:47 -0000 1.4
+++ password.js 5 Mar 2010 23:57:11 -0000 1.4.2.1
@@ -42,6 +42,22 @@
window.close();
}
+//
+// unregister our notify event
+//
+function cleanup()
+{
+ TrayRemoveWindow(null);
+ try {
+
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ netkey.rhCoolKeyUnSetNotifyCallback(gNotify);
+ } catch(e) {
+ MyAlert(getBundleString("errorUniversalXPConnect") + e);
+ }
+
+}
+
+
function GetLocalPINValue()
{
Index: password.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/password.xul,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- password.xul 7 Jun 2009 00:09:16 -0000 1.5
+++ password.xul 5 Mar 2010 23:57:11 -0000 1.5.2.1
@@ -23,6 +23,7 @@
id="esc-window"
title="&getESCPassword;"
onload="PasswordLoad();"
+ onunload="cleanup();"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul...
<stringbundle id="esc_strings"
src="chrome://esc/locale/esc.properties"/>