aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--embed/mozilla/GtkNSSDialogs.cpp8
-rw-r--r--embed/mozilla/GtkNSSKeyPairDialogs.cpp4
-rw-r--r--embed/mozilla/GtkNSSSecurityWarningDialogs.cpp4
4 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 5190b688e..c67ee3b49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2006-03-02 Christian Persch <chpe@cvs.gnome.org>
+ * embed/mozilla/GtkNSSDialogs.cpp:
+ * embed/mozilla/GtkNSSKeyPairDialogs.cpp:
+ * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:
+
+ Make these implement threadsafe isupports.
+
+2006-03-02 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/EventContext.cpp:
Don't activate typeaheadfind on XUL documents.
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index b9dfca829..72b85b7f7 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -98,9 +98,9 @@ GtkNSSDialogs::~GtkNSSDialogs ()
{
}
-NS_IMPL_ISUPPORTS2 (GtkNSSDialogs,
- nsICertificateDialogs,
- nsIBadCertListener)
+NS_IMPL_THREADSAFE_ISUPPORTS2 (GtkNSSDialogs,
+ nsICertificateDialogs,
+ nsIBadCertListener)
/**
* Call the mozilla service to display a certificate
@@ -111,7 +111,7 @@ view_certificate (nsIInterfaceRequestor *ctx, nsIX509Cert *cert)
nsresult rv;
nsCOMPtr<nsICertificateDialogs> certDialogs =
do_GetService (NS_CERTIFICATEDIALOGS_CONTRACTID, &rv);
- g_return_if_fail (NS_SUCCEEDED (rv));
+ NS_ENSURE_SUCCESS (rv, );
certDialogs->ViewCert (ctx, cert);
}
diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
index cd8315604..e5f5c35cd 100644
--- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp
+++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
@@ -80,8 +80,8 @@ GtkNSSKeyPairDialogs::~GtkNSSKeyPairDialogs ()
LOG ("GtkNSSKeyPairDialogs dtor (%p)", this);
}
-NS_IMPL_ISUPPORTS1 (GtkNSSKeyPairDialogs,
- nsIGeneratingKeypairInfoDialogs)
+NS_IMPL_THREADSAFE_ISUPPORTS1 (GtkNSSKeyPairDialogs,
+ nsIGeneratingKeypairInfoDialogs)
#ifdef HAVE_GECKO_1_8
diff --git a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
index 384c41905..72b722aae 100644
--- a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
+++ b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
@@ -64,9 +64,7 @@
#include <gtk/gtkvbox.h>
#include <gtk/gtklabel.h>
-/* FIXME why threadsafe? it's proxied by nsSecureBrowserImpl */
-/* NS_IMPL_THREADSAFE_ISUPPORTS1 (GtkNSSSecurityWarningDialogs, nsISecurityWarningDialogs) */
-NS_IMPL_ISUPPORTS1 (GtkNSSSecurityWarningDialogs, nsISecurityWarningDialogs)
+NS_IMPL_THREADSAFE_ISUPPORTS1 (GtkNSSSecurityWarningDialogs, nsISecurityWarningDialogs)
#define ENTER_SITE_PREF "security.warn_entering_secure"
#define WEAK_SITE_PREF "security.warn_entering_weak"