aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-07-22 15:56:50 +0800
committerChristian Persch <chpe@src.gnome.org>2004-07-22 15:56:50 +0800
commitb67a6275078be6d5dcdc2328fe54856868c908e2 (patch)
treecf9fbcd8a1422f72dc49f1b46cc32ddefa535ed8
parent7272bd9d1b20ba18d727839927c529fb7d2f60d8 (diff)
downloadgsoc2013-epiphany-b67a6275078be6d5dcdc2328fe54856868c908e2.tar
gsoc2013-epiphany-b67a6275078be6d5dcdc2328fe54856868c908e2.tar.gz
gsoc2013-epiphany-b67a6275078be6d5dcdc2328fe54856868c908e2.tar.bz2
gsoc2013-epiphany-b67a6275078be6d5dcdc2328fe54856868c908e2.tar.lz
gsoc2013-epiphany-b67a6275078be6d5dcdc2328fe54856868c908e2.tar.xz
gsoc2013-epiphany-b67a6275078be6d5dcdc2328fe54856868c908e2.tar.zst
gsoc2013-epiphany-b67a6275078be6d5dcdc2328fe54856868c908e2.zip
Mozilla API change (backported from HEAD).
2004-07-22 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/mozilla-embed-single.cpp: Mozilla API change (backported from HEAD).
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp4
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 443fc8a5a..39e12cf67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-07-22 Christian Persch <chpe@cvs.gnome.org>
+ * embed/mozilla/mozilla-embed-single.cpp:
+
+ Mozilla API change (backported from HEAD).
+
+2004-07-22 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
* embed/mozilla/GtkNSSDialogs.cpp:
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index ffab10d8f..914213438 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -560,7 +560,11 @@ impl_load_proxy_autoconf (EphyEmbedSingle *shell,
do_GetService ("@mozilla.org/network/protocol-proxy-service;1");
if (!pps) return;
+#if MOZILLA_SNAPSHOT >= 19
+ pps->ConfigureFromPAC (nsDependentCString (url));
+#else
pps->ConfigureFromPAC (url);
+#endif
}
static GList *