From de39adef3863b2e8bdedf6405b9c890185ca8595 Mon Sep 17 00:00:00 2001
From: "kaie%kuix.de" <kaie%kuix.de>
Date: Wed, 6 Dec 2006 16:31:32 +0000
Subject: [PATCH] Bug 360526, Cert not imported - Feedback prompt sometimes
 does not work r=rrelyea

---
 security/manager/ssl/src/nsNSSCertificateDB.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/security/manager/ssl/src/nsNSSCertificateDB.cpp b/security/manager/ssl/src/nsNSSCertificateDB.cpp
index 914ee46ce6e..c193c91840e 100644
--- a/security/manager/ssl/src/nsNSSCertificateDB.cpp
+++ b/security/manager/ssl/src/nsNSSCertificateDB.cpp
@@ -826,6 +826,10 @@ void nsNSSCertificateDB::DisplayCertificateAlert(nsIInterfaceRequestor *ctx,
   nsPSMUITracker tracker;
   if (!tracker.isUIForbidden()) {
 
+    nsCOMPtr<nsIInterfaceRequestor> my_cxt = ctx;
+    if (!my_cxt)
+      my_cxt = new PipUIContext();
+
     // This shall be replaced by embedding ovverridable prompts
     // as discussed in bug 310446, and should make use of certToShow.
 
@@ -841,7 +845,7 @@ void nsNSSCertificateDB::DisplayCertificateAlert(nsIInterfaceRequestor *ctx,
       nsCOMPtr<nsIInterfaceRequestor> proxiedCallbacks;
       NS_GetProxyForObject(NS_PROXY_TO_MAIN_THREAD,
                            NS_GET_IID(nsIInterfaceRequestor),
-                           ctx,
+                           my_cxt,
                            NS_PROXY_SYNC,
                            getter_AddRefs(proxiedCallbacks));