diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-08-08 04:25:17 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-08-08 04:25:17 +0800 |
| commit | 2f00ef03e4fa04c80915fbbc6cd5d54d9afd2ae6 (patch) | |
| tree | 33deec12f32d30d0fd18645e3d62165c649d9e88 | |
| parent | afe63de9741cde4169dd31a9241951dea97016cb (diff) | |
| download | gsoc2013-epiphany-2f00ef03e4fa04c80915fbbc6cd5d54d9afd2ae6.tar gsoc2013-epiphany-2f00ef03e4fa04c80915fbbc6cd5d54d9afd2ae6.tar.gz gsoc2013-epiphany-2f00ef03e4fa04c80915fbbc6cd5d54d9afd2ae6.tar.bz2 gsoc2013-epiphany-2f00ef03e4fa04c80915fbbc6cd5d54d9afd2ae6.tar.lz gsoc2013-epiphany-2f00ef03e4fa04c80915fbbc6cd5d54d9afd2ae6.tar.xz gsoc2013-epiphany-2f00ef03e4fa04c80915fbbc6cd5d54d9afd2ae6.tar.zst gsoc2013-epiphany-2f00ef03e4fa04c80915fbbc6cd5d54d9afd2ae6.zip | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 13 |
2 files changed, 19 insertions, 1 deletions
@@ -1,5 +1,12 @@ 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: Set printer name setting. 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; |