[389-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.23, 1.24 certManager.xul, 1.3, 1.4 password.xul, 1.4, 1.5

[Jack Magne]

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20779/esc/src/app/xul/esc/chrome/content/esc

Modified Files:
	ESC.js certManager.xul password.xul 
Log Message:
Fix for #501336, esc hangs on error.


Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ESC.js	31 Mar 2009 18:35:59 -0000	1.23
+++ ESC.js	7 Jun 2009 00:09:15 -0000	1.24
@@ -522,7 +522,10 @@
     if(!string_id || !gStringBundle)
        return null;
 
-    str = gStringBundle.getString(string_id);
+    try {
+        str = gStringBundle.getString(string_id);
+    } catch(e) {
+    }
 
     return str;
 }


Index: certManager.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/certManager.xul,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- certManager.xul	26 Feb 2009 22:34:43 -0000	1.3
+++ certManager.xul	7 Jun 2009 00:09:16 -0000	1.4
@@ -59,7 +59,6 @@
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
   <script type="application/x-javascript" src="chrome://pippki/content/certManager.js"/>
-  <script type="application/x-javascript" src="escCertManager.js"/>
 
   <vbox flex="1">
     <tabbox id="certmanagertabs" flex="1" style="margin:5px">


Index: password.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/password.xul,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- password.xul	4 Feb 2009 01:43:47 -0000	1.4
+++ password.xul	7 Jun 2009 00:09:16 -0000	1.5
@@ -23,7 +23,6 @@
     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"/>