[Epiphany] [PATCH] Build patch for moz CVS

[Lee Willis <lee lee-and-claire co uk>]

I had to apply the attached patch to get the gnome-2-4 branch to build
against mozilla CVS (As of this morning).

You may or may not be interested (Not sure how much maintenance we're
doing on that branch - or whether the patch is required for HEAD).

Big caveat: I'm not at all sure the patch is right - but it seems to
work!

Lee
-- 
Lee Willis <lee@lee-and-claire.co.uk>
? stamp-h1.in
? stamp-h2.in
? help/uk
Index: embed/mozilla/EphyEventListener.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/EphyEventListener.cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 EphyEventListener.cpp
--- embed/mozilla/EphyEventListener.cpp	30 Dec 2002 19:26:37 -0000	1.1.1.1
+++ embed/mozilla/EphyEventListener.cpp	23 Oct 2003 11:20:31 -0000
@@ -81,8 +81,7 @@
 		if(!doc) return NS_ERROR_FAILURE;
 
 		nsCOMPtr<nsIURI> uri;
-		result = doc->GetDocumentURL(getter_AddRefs(uri));
-		if (NS_FAILED (result)) return NS_ERROR_FAILURE;
+		uri = doc->GetDocumentURL();
 
 		const nsACString &link = NS_ConvertUCS2toUTF8(value);
 		nsCAutoString favicon_url;
Index: embed/mozilla/EphyWrapper.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/EphyWrapper.cpp,v
retrieving revision 1.17.2.2
diff -u -r1.17.2.2 EphyWrapper.cpp
--- embed/mozilla/EphyWrapper.cpp	15 Sep 2003 18:30:43 -0000	1.17.2.2
+++ embed/mozilla/EphyWrapper.cpp	23 Oct 2003 11:20:31 -0000
@@ -583,7 +583,7 @@
 	if(!doc) return NS_ERROR_FAILURE;
 
 	nsCOMPtr<nsIURI> uri;
-	doc->GetDocumentURL(getter_AddRefs(uri));
+	uri = doc->GetDocumentURL();
 
 	return uri->GetSpec (url);
 }
@@ -601,7 +601,7 @@
         if(!doc) return NS_ERROR_FAILURE;
 
         nsCOMPtr<nsIURI> uri;
-        doc->GetDocumentURL(getter_AddRefs(uri));
+        uri = doc->GetDocumentURL();
 
         uri->GetSpec (url);
 
Index: embed/mozilla/EventContext.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/EventContext.cpp,v
retrieving revision 1.10.2.1
diff -u -r1.10.2.1 EventContext.cpp
--- embed/mozilla/EventContext.cpp	15 Sep 2003 18:30:43 -0000	1.10.2.1
+++ embed/mozilla/EventContext.cpp	23 Oct 2003 11:20:31 -0000
@@ -141,21 +141,22 @@
 	nsresult rv;
 	nsCOMPtr<nsIURI> base;
 #if MOZILLA_SNAPSHOT > 9
+	base = doc->GetBaseURL();
+#elif MOZILLA_SNAPSHOT > 11
 	rv = doc->GetBaseURL (getter_AddRefs(base));
+	if (NS_FAILED(rv)) return rv;
 #else
 	rv = doc->GetBaseURL (*getter_AddRefs(base));
-#endif
 	if (NS_FAILED(rv)) return rv;
+#endif
 
 	return base->Resolve (NS_ConvertUCS2toUTF8(relurl), url);
 }
 
 nsresult EventContext::ResolveDocumentURL (nsIDocument *doc, const nsAString &relurl, nsACString &url)
 {
-	nsresult rv;
 	nsCOMPtr<nsIURI> uri;
-	rv = doc->GetDocumentURL(getter_AddRefs(uri));
-	if (NS_FAILED(rv)) return rv;
+	uri = doc->GetDocumentURL();
 
 	return uri->Resolve (NS_ConvertUCS2toUTF8(relurl), url);
 }
Index: embed/mozilla/mozilla-embed-persist.cpp
===================================================================
RCS file: /cvs/gnome/epiphany/embed/mozilla/mozilla-embed-persist.cpp,v
retrieving revision 1.11
diff -u -r1.11 mozilla-embed-persist.cpp
--- embed/mozilla/mozilla-embed-persist.cpp	20 Aug 2003 17:45:42 -0000	1.11
+++ embed/mozilla/mozilla-embed-persist.cpp	23 Oct 2003 11:20:31 -0000
@@ -255,8 +255,7 @@
         	if (NS_FAILED(rv) || !document) return G_FAILED;
 
 	        nsCOMPtr<nsIURI> uri;
-        	rv = document->GetDocumentURL (getter_AddRefs(uri));
-        	if (NS_FAILED(rv) || !uri) return G_FAILED;
+        	uri = document->GetDocumentURL ();
 
         	aProgress->InitForPersist (bpersist, parent,
                    	                   uri, file,