aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-07-03 19:34:21 +0800
committerChristian Persch <chpe@src.gnome.org>2004-07-03 19:34:21 +0800
commit4f05ea67e32470322a557738b548f31e1f15c4f3 (patch)
tree2a68f7ec2e2f129b7ba30a62d22a1fd7813be90a
parent3dfe6d63ae73d28f1dbe2f9815a02e0b2b47a2c7 (diff)
downloadgsoc2013-epiphany-4f05ea67e32470322a557738b548f31e1f15c4f3.tar
gsoc2013-epiphany-4f05ea67e32470322a557738b548f31e1f15c4f3.tar.gz
gsoc2013-epiphany-4f05ea67e32470322a557738b548f31e1f15c4f3.tar.bz2
gsoc2013-epiphany-4f05ea67e32470322a557738b548f31e1f15c4f3.tar.lz
gsoc2013-epiphany-4f05ea67e32470322a557738b548f31e1f15c4f3.tar.xz
gsoc2013-epiphany-4f05ea67e32470322a557738b548f31e1f15c4f3.tar.zst
gsoc2013-epiphany-4f05ea67e32470322a557738b548f31e1f15c4f3.zip
Mozilla API change.
2004-07-03 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/mozilla-embed-single.cpp: Mozilla API change.
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp5
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1575369ce..c2f8a4d57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-03 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/mozilla/mozilla-embed-single.cpp:
+
+ Mozilla API change.
+
2004-07-02 Christian Persch <chpe@cvs.gnome.org>
* data/art/Makefile.am:
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 5882b3fae..9556d8227 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -24,6 +24,7 @@
#endif
#include "mozilla-embed-single.h"
+#include "mozilla-version.h"
#include "ephy-cookie-manager.h"
#include "ephy-password-manager.h"
@@ -589,7 +590,11 @@ impl_load_proxy_autoconf (EphyEmbedSingle *shell,
do_GetService ("@mozilla.org/network/protocol-proxy-service;1");
if (!pps) return;
+#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 2)
+ pps->ConfigureFromPAC (nsEmbedCString (url));
+#else
pps->ConfigureFromPAC (url);
+#endif
}
static GList *