Fix the build with Mozilla-1.6a.

Tested by:	adamw

4 files changed, 117 insertions, 0 deletions

diff --git a/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp b/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp
new file mode 100644
index 00000000000..48f6e973a59
--- /dev/null
+++ b/www/epiphany/files/patch-embed_mozilla_EphyEventListener.cpp
@@ -0,0 +1,29 @@
+--- embed/mozilla/EphyEventListener.cpp.orig	Sat Nov  1 22:39:59 2003
++++ embed/mozilla/EphyEventListener.cpp	Sat Nov  1 22:41:44 2003
+@@ -16,6 +16,10 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <nsCOMPtr.h>
+ 
+ #include "EphyEventListener.h"
+@@ -80,9 +84,15 @@
+ 		nsCOMPtr<nsIDocument> doc = do_QueryInterface (domDoc);
+ 		if(!doc) return NS_ERROR_FAILURE;
+ 
++#if MOZILLA_SNAPSHOT > 11
++		nsIURI *uri;
++		uri = doc->GetDocumentURL ();
++		if (uri == NULL) return NS_ERROR_FAILURE;
++#else
+ 		nsCOMPtr<nsIURI> uri;
+ 		result = doc->GetDocumentURL(getter_AddRefs(uri));
+ 		if (NS_FAILED (result)) return NS_ERROR_FAILURE;
++#endif
+ 
+ 		const nsACString &link = NS_ConvertUCS2toUTF8(value);
+ 		nsCAutoString favicon_url;
diff --git a/www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp b/www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp
new file mode 100644
index 00000000000..f3575e0abe4
--- /dev/null
+++ b/www/epiphany/files/patch-embed_mozilla_EphyWrapper.cpp
@@ -0,0 +1,30 @@
+--- embed/mozilla/EphyWrapper.cpp.orig	Sat Nov  1 22:42:25 2003
++++ embed/mozilla/EphyWrapper.cpp	Sat Nov  1 22:53:59 2003
+@@ -582,8 +582,13 @@
+ 	nsCOMPtr<nsIDocument> doc = do_QueryInterface(DOMDocument);
+ 	if(!doc) return NS_ERROR_FAILURE;
+ 
++#if MOZILLA_SNAPSHOT > 11
++	nsIURI *uri;
++	uri = doc->GetDocumentURL ();
++#else
+ 	nsCOMPtr<nsIURI> uri;
+ 	doc->GetDocumentURL(getter_AddRefs(uri));
++#endif
+ 
+ 	return uri->GetSpec (url);
+ }
+@@ -600,8 +605,13 @@
+         nsCOMPtr<nsIDocument> doc = do_QueryInterface(DOMDocument);
+         if(!doc) return NS_ERROR_FAILURE;
+ 
++#if MOZILLA_SNAPSHOT > 11
++	nsIURI *uri;
++	uri = doc->GetDocumentURL ();
++#else
+         nsCOMPtr<nsIURI> uri;
+         doc->GetDocumentURL(getter_AddRefs(uri));
++#endif
+ 
+         uri->GetSpec (url);
+ 
diff --git a/www/epiphany/files/patch-embed_mozilla_EventContext.cpp b/www/epiphany/files/patch-embed_mozilla_EventContext.cpp
new file mode 100644
index 00000000000..504b977cc4c
--- /dev/null
+++ b/www/epiphany/files/patch-embed_mozilla_EventContext.cpp
@@ -0,0 +1,40 @@
+--- embed/mozilla/EventContext.cpp.orig	Sat Nov  1 22:42:40 2003
++++ embed/mozilla/EventContext.cpp	Sat Nov  1 22:57:20 2003
+@@ -139,13 +139,19 @@
+ nsresult EventContext::ResolveBaseURL (nsIDocument *doc, const nsAString &relurl, nsACString &url)
+ {
+ 	nsresult rv;
++#if MOZILLA_SNAPSHOT > 11
++	nsIURI *base;
++	base = doc->GetBaseURL ();
++	if (base == NULL) return NS_ERROR_FAILURE;
++#elif MOZILLA_SNAPSHOT > 9
+ 	nsCOMPtr<nsIURI> base;
+-#if MOZILLA_SNAPSHOT > 9
+ 	rv = doc->GetBaseURL (getter_AddRefs(base));
++	if (NS_FAILED(rv)) return rv;
+ #else
++	nsCOMPtr<nsIURI> base;
+ 	rv = doc->GetBaseURL (*getter_AddRefs(base));
+-#endif
+ 	if (NS_FAILED(rv)) return rv;
++#endif
+ 
+ 	return base->Resolve (NS_ConvertUCS2toUTF8(relurl), url);
+ }
+@@ -153,9 +159,15 @@
+ nsresult EventContext::ResolveDocumentURL (nsIDocument *doc, const nsAString &relurl, nsACString &url)
+ {
+ 	nsresult rv;
++#if MOZILLA_SNAPSHOT > 11
++	nsIURI *uri;
++	uri = doc->GetDocumentURL ();
++	if (uri == NULL) return NS_ERROR_FAILURE;
++#else
+ 	nsCOMPtr<nsIURI> uri;
+ 	rv = doc->GetDocumentURL(getter_AddRefs(uri));
+ 	if (NS_FAILED(rv)) return rv;
++#endif
+ 
+ 	return uri->Resolve (NS_ConvertUCS2toUTF8(relurl), url);
+ }
diff --git a/www/epiphany/files/patch-embed_mozilla_mozilla-embed-persist.cpp b/www/epiphany/files/patch-embed_mozilla_mozilla-embed-persist.cpp
new file mode 100644
index 00000000000..0980c3c25d0
--- /dev/null
+++ b/www/epiphany/files/patch-embed_mozilla_mozilla-embed-persist.cpp
@@ -0,0 +1,18 @@
+--- embed/mozilla/mozilla-embed-persist.cpp.orig	Sat Nov  1 23:12:09 2003
++++ embed/mozilla/mozilla-embed-persist.cpp	Sun Nov  2 00:03:17 2003
+@@ -254,9 +254,15 @@
+                                 do_QueryInterface (DOMDocument, &rv);
+         	if (NS_FAILED(rv) || !document) return G_FAILED;
+ 
++#if MOZILLA_SNAPSHOT > 11
++	        nsIURI *uri;
++	        uri = document->GetDocumentURL ();
++	        if (uri == NULL) return G_FAILED;
++#else
+ 	        nsCOMPtr<nsIURI> uri;
+         	rv = document->GetDocumentURL (getter_AddRefs(uri));
+         	if (NS_FAILED(rv) || !uri) return G_FAILED;
++#endif
+ 
+         	aProgress->InitForPersist (bpersist, parent,
+                    	                   uri, file,