summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-07-14 14:57:10 +0000
committerChristian Persch <chpe@src.gnome.org>2006-07-14 14:57:10 +0000
commitf2d298335f9ea5698a576029aafb228f1616761a (patch)
tree2ccf194751a43ef36c7fb68c0d3954af6da5f509
parente848496bc282a4a82db9f3b67b654efa1e3f4017 (diff)
downloadepiphany-gnome-2-10.tar.gz
=== THIS BRANCH IS DEAD! ===gnome-2-10
2006-07-14 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/AutoJSContextStack.cpp: * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp: Fix compile warnings.
-rw-r--r--ChangeLog15
-rw-r--r--embed/mozilla/AutoJSContextStack.cpp1
-rw-r--r--embed/mozilla/GtkNSSSecurityWarningDialogs.cpp2
3 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b951e9424..a233c9e1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+=== THIS BRANCH IS DEAD! ===
+
+2006-07-14 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/mozilla/AutoJSContextStack.cpp:
+ * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:
+
+ Fix compile warnings.
+
+2006-02-20 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:
+
+ Do return on failure.
+
2006-02-02 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/Makefile.am:
diff --git a/embed/mozilla/AutoJSContextStack.cpp b/embed/mozilla/AutoJSContextStack.cpp
index 77bbb81eb..0098f19eb 100644
--- a/embed/mozilla/AutoJSContextStack.cpp
+++ b/embed/mozilla/AutoJSContextStack.cpp
@@ -24,7 +24,6 @@
#include "AutoJSContextStack.h"
#include <nsIServiceManager.h>
-#include <nsIServiceManagerUtils.h>
AutoJSContextStack::~AutoJSContextStack()
{
diff --git a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
index 887c03558..b40c1f5ff 100644
--- a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
+++ b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
@@ -230,7 +230,7 @@ GtkNSSSecurityWarningDialogs::DoDialog (nsIInterfaceRequestor *aContext,
AutoJSContextStack stack;
rv = stack.Init ();
- if (NS_FAILED (rv));
+ if (NS_FAILED (rv)) return;
/* Didn't you know it, mozilla SUCKS!
* the "aContext" interface requestor is made from a nsIDOMWindow,