aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2007-12-24 06:33:52 +0800
committerChristian Persch <chpe@src.gnome.org>2007-12-24 06:33:52 +0800
commit8ffe4f1d013547bb9e3d38c5061a5e2a2ec75015 (patch)
treec6c4be1b3aa312449710325d24e16727fbf3d6c6
parent357b0c05ce39abe15fe90f424b72942130b8ee56 (diff)
downloadgsoc2013-epiphany-8ffe4f1d013547bb9e3d38c5061a5e2a2ec75015.tar
gsoc2013-epiphany-8ffe4f1d013547bb9e3d38c5061a5e2a2ec75015.tar.gz
gsoc2013-epiphany-8ffe4f1d013547bb9e3d38c5061a5e2a2ec75015.tar.bz2
gsoc2013-epiphany-8ffe4f1d013547bb9e3d38c5061a5e2a2ec75015.tar.lz
gsoc2013-epiphany-8ffe4f1d013547bb9e3d38c5061a5e2a2ec75015.tar.xz
gsoc2013-epiphany-8ffe4f1d013547bb9e3d38c5061a5e2a2ec75015.tar.zst
gsoc2013-epiphany-8ffe4f1d013547bb9e3d38c5061a5e2a2ec75015.zip
Xr 1.9 fixes. Bug #503657.
svn path=/trunk/; revision=7806
-rw-r--r--embed/mozilla/EphyUtils.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp
index 885a49f08..07aa4ceed 100644
--- a/embed/mozilla/EphyUtils.cpp
+++ b/embed/mozilla/EphyUtils.cpp
@@ -39,7 +39,6 @@
#ifdef HAVE_GECKO_1_9
#include <nsPIDOMWindow.h>
-#include <nsDOMJSUtils.h> /* for GetScriptContextFromJSContext */
#include <nsIScriptContext.h>
#include <nsIScriptGlobalObject.h>
#endif
@@ -187,10 +186,10 @@ EphyJSUtils::IsCalledFromScript ()
nsIDOMWindow *
EphyJSUtils::GetDOMWindowFromCallContext ()
{
- /* TODO: We can do this on 1.8 too, but we'd need to use headers which include private string API
+ /* TODO: We could do this on 1.8, but we'd need to use headers which include private string API
* so we'll have to move this to MozillaPrivate
*/
-#ifdef HAVE_GECKO_1_9
+#if 0
nsresult rv;
nsCOMPtr<nsIXPConnect> xpc (do_GetService(nsIXPConnect::GetCID(), &rv));
NS_ENSURE_SUCCESS (rv, nsnull);