aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp13
1 files changed, 12 insertions, 1 deletions
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;