aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-08-02 00:13:59 +0800
committerChristian Persch <chpe@src.gnome.org>2004-08-02 00:13:59 +0800
commitc52692d0bec5e3ae4e49abd6c0476a8750b43910 (patch)
tree0f7a4bac14a98661f3e7cb29ca66d988efe185ed
parent16909b7bf29098f7668ff2a8057e94d79277aa1c (diff)
downloadgsoc2013-epiphany-c52692d0bec5e3ae4e49abd6c0476a8750b43910.tar
gsoc2013-epiphany-c52692d0bec5e3ae4e49abd6c0476a8750b43910.tar.gz
gsoc2013-epiphany-c52692d0bec5e3ae4e49abd6c0476a8750b43910.tar.bz2
gsoc2013-epiphany-c52692d0bec5e3ae4e49abd6c0476a8750b43910.tar.lz
gsoc2013-epiphany-c52692d0bec5e3ae4e49abd6c0476a8750b43910.tar.xz
gsoc2013-epiphany-c52692d0bec5e3ae4e49abd6c0476a8750b43910.tar.zst
gsoc2013-epiphany-c52692d0bec5e3ae4e49abd6c0476a8750b43910.zip
Mozilla API change; thanks to Crispin for alerting me to it.
2004-08-01 Christian Persch <chpe@cvs.gnome.org> * embed/mozilla/EphyBrowser.cpp: Mozilla API change; thanks to Crispin for alerting me to it.
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/EphyBrowser.cpp8
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d56f197d..d616a8f11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-08-01 Christian Persch <chpe@cvs.gnome.org>
+ * embed/mozilla/EphyBrowser.cpp:
+
+ Mozilla API change; thanks to Crispin for alerting me to it.
+
+2004-08-01 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-nautilus-view.c: (gnv_cmd_file_print):
Fix compilation with --enable-nautilus-view. Fixes bug #148995.
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 0a6108d41..b413bbc0e 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -77,7 +77,11 @@
#include "nsIDOMHTMLInputElement.h"
#include "nsIDOMHTMLTextAreaElement.h"
#include "nsIDeviceContext.h"
+#if MOZILLA_SNAPSHOT >= 20
+#include "nsPresContext.h"
+#else
#include "nsIPresContext.h"
+#endif
#include "nsIAtom.h"
#include "nsIDocumentCharsetInfo.h"
#include "nsPromiseFlatString.h"
@@ -513,7 +517,11 @@ nsresult EphyBrowser::SetZoom (float aZoom, PRBool reflow)
nsresult EphyBrowser::SetZoomOnDocshell (float aZoom, nsIDocShell *DocShell)
{
+#if MOZILLA_SNAPSHOT >= 20
+ nsCOMPtr<nsPresContext> PresContext;
+#else
nsCOMPtr<nsIPresContext> PresContext;
+#endif
DocShell->GetPresContext (getter_AddRefs(PresContext));
NS_ENSURE_TRUE (PresContext, NS_ERROR_FAILURE);