From 2f00ef03e4fa04c80915fbbc6cd5d54d9afd2ae6 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Mon, 7 Aug 2006 20:25:17 +0000
Subject: Use AutoJSContextStack on window open. Disable XPrint.

2006-08-07  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/mozilla-embed-single.cpp:

	Use AutoJSContextStack on window open.
	Disable XPrint.
---
 ChangeLog                              |  7 +++++++
 embed/mozilla/mozilla-embed-single.cpp | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d0961e839..928d05819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-07  Christian Persch  <chpe@cvs.gnome.org>
+
+	* embed/mozilla/mozilla-embed-single.cpp:
+
+	Use AutoJSContextStack on window open.
+	Disable XPrint.
+
 2006-08-07  Christian Persch  <chpe@cvs.gnome.org>
 
 	* data/default-prefs-common.js:
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 93798eff8..4c2786632 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -95,6 +95,8 @@
 
 #include "mozilla-embed-single.h"
 
+#include "AutoJSContextStack.h"
+
 #define MOZILLA_PROFILE_DIR  "/mozilla"
 #define MOZILLA_PROFILE_NAME "epiphany"
 #define MOZILLA_PROFILE_FILE "prefs.js"
@@ -584,6 +586,11 @@ impl_init (EphyEmbedSingle *esingle)
 {
 	MozillaEmbedSingle *single = MOZILLA_EMBED_SINGLE (esingle);
 
+#ifdef MOZ_ENABLE_XPRINT
+	/* XPrint? No, thanks! */
+	g_unsetenv ("XPSERVERLIST");
+#endif
+
 #ifdef HAVE_GECKO_1_9
 	NS_LogInit ();
 #endif
@@ -1090,8 +1097,12 @@ impl_open_window (EphyEmbedSingle *single,
 		  const char *name,
 		  const char *features)
 {
-	nsCOMPtr<nsIDOMWindow> domWindow;
+	nsresult rv;
+	AutoJSContextStack stack;
+	rv = stack.Init ();
+	if (NS_FAILED (rv)) return NULL;
 
+	nsCOMPtr<nsIDOMWindow> domWindow;
 	if (parent)
 	{
 		EphyBrowser *browser;
-- 
cgit v1.2.3