Fix build with Mozilla 1.4a.

6 files changed, 313 insertions, 1 deletions

diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 41448d5a0ef2..076bc4ec98f6 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -31,7 +31,7 @@ HEADERS_SUFX=
 .if ${WITH_MOZILLA}=="mozilla-devel-gtk2"
 MOZILLA=	${WITH_MOZILLA}
 HEADERS_SUFX=	-devel
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="trunk"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.4a"
 .else
 MOZILLA=	mozilla
 HEADERS_SUFX=
diff --git a/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp b/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp
new file mode 100644
index 000000000000..599a228fb546
--- /dev/null
+++ b/www/galeon2/files/patch-mozilla_GaleonWrapper.cpp
@@ -0,0 +1,41 @@
+--- mozilla/GaleonWrapper.cpp.orig	Mon Apr  7 18:45:26 2003
++++ mozilla/GaleonWrapper.cpp	Mon Apr  7 18:45:35 2003
+@@ -666,10 +666,16 @@
+ 	nsCOMPtr<nsIDocument> doc = do_QueryInterface(DOMDocument);
+ 	if(!doc) return NS_ERROR_FAILURE;
+ 
++#if MOZILLA_SNAPSHOT >= 6
++	nsAutoString t;
++	doc->GetDocumentTitle(t);
++	*title = g_strdup (NS_ConvertUCS2toUTF8(t).get());
++#else
+ 	const nsString* t;
+ 	t = doc->GetDocumentTitle();
+ 
+ 	*title = g_strdup (NS_ConvertUCS2toUTF8(*t).get());
++#endif
+ 
+ 	return NS_OK;
+ }
+@@ -735,7 +741,7 @@
+ 	return NS_OK;
+ }
+ 
+-nsresult GaleonWrapper::ForceCharacterSet (char *charset) 
++nsresult GaleonWrapper::ForceCharacterSet (const char *charset) 
+ {
+ 	nsresult result;
+ 
+@@ -839,12 +845,7 @@
+ 	if (NS_FAILED(result)) return NS_ERROR_FAILURE;
+ 
+ 	nsICSSStyleSheet *sheet;
+-#if MOZILLA_SNAPSHOT > 3
+ 	result = loader->LoadAgentSheet(uri, &sheet);
+-#else
+-	PRBool completed;
+-	result = loader->LoadAgentSheet(uri, sheet, completed, nsnull);
+-#endif
+ 	if (NS_FAILED(result)) return NS_ERROR_FAILURE;
+ 
+ 	/* catch stylesheet stuff and apply by appending it as a override
diff --git a/www/galeon2/files/patch-mozilla_GaleonWrapper.h b/www/galeon2/files/patch-mozilla_GaleonWrapper.h
new file mode 100644
index 000000000000..77b723b32986
--- /dev/null
+++ b/www/galeon2/files/patch-mozilla_GaleonWrapper.h
@@ -0,0 +1,11 @@
+--- mozilla/GaleonWrapper.h.orig	Mon Apr  7 18:48:36 2003
++++ mozilla/GaleonWrapper.h	Mon Apr  7 18:48:49 2003
+@@ -91,7 +91,7 @@
+ 
+ 	nsresult GoToHistoryIndex (PRInt16 index);
+ 
+-	nsresult ForceCharacterSet (char *charset);
++	nsresult ForceCharacterSet (const char *charset);
+ 
+ 	nsresult CanCutSelection(PRBool *result);
+ 
diff --git a/www/galeon2/files/patch-mozilla_Makefile.in b/www/galeon2/files/patch-mozilla_Makefile.in
new file mode 100644
index 000000000000..6db4987efa4e
--- /dev/null
+++ b/www/galeon2/files/patch-mozilla_Makefile.in
@@ -0,0 +1,11 @@
+--- mozilla/Makefile.in.orig	Mon Apr  7 18:09:47 2003
++++ mozilla/Makefile.in	Mon Apr  7 18:10:08 2003
+@@ -246,7 +246,7 @@
+         -DGDK_PIXBUF_DISABLE_DEPRECATED \
+         -DGNOME_DISABLE_DEPRECATED	\
+ 	-DSHARE_DIR=\"$(pkgdatadir)\" \
+-	-DNEW_H=\<new\>
++	-include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h
+ 
+ 
+ libgaleon_xpcom_la_LIBADD = \
diff --git a/www/galeon2/files/patch-mozilla_mozilla-embed-shell.cpp b/www/galeon2/files/patch-mozilla_mozilla-embed-shell.cpp
new file mode 100644
index 000000000000..41293a28e8a3
--- /dev/null
+++ b/www/galeon2/files/patch-mozilla_mozilla-embed-shell.cpp
@@ -0,0 +1,235 @@
+--- mozilla/mozilla-embed-shell.cpp.orig	Mon Apr  7 18:39:50 2003
++++ mozilla/mozilla-embed-shell.cpp	Mon Apr  7 18:39:59 2003
+@@ -42,6 +42,7 @@
+ #include <nsICacheService.h>
+ #include <nsCOMPtr.h>
+ #include <nsNetCID.h>
++#include <nsNetUtil.h>
+ #include <nsIServiceManager.h>
+ #include <nsIIOService.h>
+ #include <nsIProtocolProxyService.h>
+@@ -848,17 +849,26 @@
+ }
+ 
+ static gresult           
+-impl_set_permission (GaleonEmbedShell *shell,
+-		     const char *url, 
+-		     PermissionType type,
+-		     gboolean allow)
++impl_set_permission(GaleonEmbedShell *shell,
++		    const char *url, 
++		    PermissionType type,
++		    gboolean allow)
+ {
+ 	nsresult rv;
+ 	nsCOMPtr<nsIPermissionManager> permissionManager =
+-                        do_CreateInstance (NS_PERMISSIONMANAGER_CONTRACTID);
++                        do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
+ 
+-        rv = permissionManager->Add (nsDependentCString(url),
+-        			     allow ? PR_TRUE : PR_FALSE, type);
++#if MOZILLA_SNAPSHOT >= 6
++	nsCOMPtr<nsIURI> uri;
++	rv = NS_NewURI(getter_AddRefs(uri), url);
++	if (NS_FAILED(rv) || !uri) return G_FAILED;
++	rv = permissionManager->Add(uri, type,
++				    allow ? (PRUint32)nsIPermissionManager::ALLOW_ACTION
++				    	  : (PRUint32)nsIPermissionManager::DENY_ACTION);
++#else
++        rv = permissionManager->Add(nsDependentCString(url),
++        			    allow ? PR_TRUE : PR_FALSE, type);
++#endif
+ 	if (NS_FAILED(rv)) return G_FAILED;
+ 
+ 	return G_OK;
+@@ -874,9 +884,9 @@
+ 	*permissions = NULL;
+ 	
+ 	nsCOMPtr<nsIPermissionManager> permissionManager = 
+-                        do_CreateInstance (NS_PERMISSIONMANAGER_CONTRACTID);
++                        do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
+         nsCOMPtr<nsISimpleEnumerator> permissionEnumerator;
+-        result = permissionManager->GetEnumerator (getter_AddRefs(permissionEnumerator));
++        result = permissionManager->GetEnumerator(getter_AddRefs(permissionEnumerator));
+         if (NS_FAILED(result)) return G_FAILED;
+ 	
+         PRBool enumResult;
+@@ -885,47 +895,68 @@
+              permissionEnumerator->HasMoreElements(&enumResult))
+         {
+                 nsCOMPtr<nsIPermission> nsPermission;
+-                result = permissionEnumerator->GetNext (getter_AddRefs(nsPermission));
++                result = permissionEnumerator->GetNext(getter_AddRefs(nsPermission));
+                 if (NS_FAILED(result)) return G_FAILED;
+ 
++#if MOZILLA_SNAPSHOT >= 6
++		PRUint32 cType;
++#else
+                 PRInt32 cType;
+-                nsPermission->GetType (&cType);
+-                if (cType == type)
++#endif
++                nsPermission->GetType(&cType);
++                if ((PRUint32)cType == (PRUint32)type)
+                 {
+-                        PermissionInfo *b = g_new0 (PermissionInfo, 1);
+-                        gchar *tmp = NULL;
+-
+-                        nsPermission->GetHost (&tmp);
+-                        b->domain = g_strdup (tmp);
+-                        nsMemory::Free (tmp);
++                        PermissionInfo *b = g_new0(PermissionInfo, 1);
++#if MOZILLA_SNAPSHOT >= 6
++			nsCString host;
++			nsPermission->GetHost(host);
++			b->domain = g_strdup(host.get());
++
++			PRUint32 cap;
++			nsPermission->GetCapability(&cap);
++			switch (cap)
++			{
++			  case nsIPermissionManager::ALLOW_ACTION :
++			  	b->status = TRUE;
++			  	break;
++			  case nsIPermissionManager::DENY_ACTION :
++			 	b->status = FALSE;
++			 	break;
++			  default :
++			  	b->status = FALSE;
++			}
++#else
++			nsXPIDLCString host;
++                        nsPermission->GetHost(getter_Copies(host));
++                        b->domain = g_strdup(host.get());
+ 
+                         PRBool cap;
+-                        nsPermission->GetCapability (&cap);
++                        nsPermission->GetCapability(&cap);
+ 			b->status = cap;
+-
+-                        *permissions = g_list_prepend (*permissions, b);
++#endif
++                        *permissions = g_list_prepend(*permissions, b);
+                 }
+         }
+ 
+-        *permissions = g_list_reverse (*permissions);
++        *permissions = g_list_reverse(*permissions);
+ 	
+ 	return G_OK;
+ }
+ 
+ static gresult           
+-impl_remove_permissions (GaleonEmbedShell *shell,
+-		         PermissionType type,
+-		         GList *permissions)
++impl_remove_permissions(GaleonEmbedShell *shell,
++		        PermissionType type,
++		        GList *permissions)
+ {
+ 	nsresult result;
+         nsCOMPtr<nsIPermissionManager> permissionManager =
+-                        do_CreateInstance (NS_PERMISSIONMANAGER_CONTRACTID);
++                        do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
+ 
+         for (GList *l = permissions; l != NULL; l = l->next)
+         {
+                 PermissionInfo *b = (PermissionInfo *)l->data;
+-                result = permissionManager->Remove (nsDependentCString(b->domain),
+-                				    type);
++                result = permissionManager->Remove(nsDependentCString(b->domain),
++                				   type);
+                 if (NS_FAILED(result)) return G_FAILED;
+         };
+ 
+@@ -937,28 +968,27 @@
+ 		   GList **cookies)
+ {
+         nsresult result;
+-
+         nsCOMPtr<nsICookieManager> cookieManager = 
+-                        do_CreateInstance (NS_COOKIEMANAGER_CONTRACTID);
++                        do_GetService(NS_COOKIEMANAGER_CONTRACTID);
+         nsCOMPtr<nsISimpleEnumerator> cookieEnumerator;
+         result = 
+-            cookieManager->GetEnumerator (getter_AddRefs(cookieEnumerator));
++            cookieManager->GetEnumerator(getter_AddRefs(cookieEnumerator));
+         if (NS_FAILED(result)) return G_FAILED;
+-	
++
+         PRBool enumResult;
+         for (cookieEnumerator->HasMoreElements(&enumResult) ;
+              enumResult == PR_TRUE ;
+              cookieEnumerator->HasMoreElements(&enumResult))
+         {
+                 nsCOMPtr<nsICookie> nsCookie;
+-                result = cookieEnumerator->GetNext (getter_AddRefs(nsCookie));
++                result = cookieEnumerator->GetNext(getter_AddRefs(nsCookie));
+                 if (NS_FAILED(result)) return G_FAILED;
+ 
+-                CookieInfo *c = mozilla_cookie_to_info (nsCookie);
+-                *cookies = g_list_prepend (*cookies, c);
++                CookieInfo *c = mozilla_cookie_to_info(nsCookie);
++                *cookies = g_list_prepend(*cookies, c);
+         }       
+ 
+-	*cookies = g_list_reverse (*cookies);
++	*cookies = g_list_reverse(*cookies);
+ 		
+ 	return G_OK;
+ }
+@@ -969,15 +999,15 @@
+ {
+ 	nsresult result;
+         nsCOMPtr<nsICookieManager> cookieManager =
+-                        do_CreateInstance (NS_COOKIEMANAGER_CONTRACTID);
++                        do_GetService(NS_COOKIEMANAGER_CONTRACTID);
+ 	
+         for (GList *l = cookies; l != NULL; l = l->next)
+         {
+                 CookieInfo *c = (CookieInfo *)l->data;
+ 
+-                result = cookieManager->Remove (NS_LITERAL_CSTRING(c->domain),
+-                                                NS_LITERAL_CSTRING(c->name),
+-                                                NS_LITERAL_CSTRING(c->path),
++                result = cookieManager->Remove (nsDependentCString(c->domain),
++                                                nsDependentCString(c->name),
++                                                nsDependentCString(c->path),
+                                                 PR_FALSE);
+                 if (NS_FAILED(result)) return G_FAILED;
+         };
+@@ -993,7 +1023,7 @@
+         nsresult result = NS_ERROR_FAILURE;
+ 
+         nsCOMPtr<nsIPasswordManager> passwordManager =
+-                        do_CreateInstance (NS_PASSWORDMANAGER_CONTRACTID);
++                        do_GetService(NS_PASSWORDMANAGER_CONTRACTID);
+         nsCOMPtr<nsISimpleEnumerator> passwordEnumerator;
+         if (type == PASSWORD_PASSWORD)
+                 result = passwordManager->GetEnumerator 
+@@ -1041,14 +1071,14 @@
+ {
+ 	nsresult result = NS_ERROR_FAILURE;
+         nsCOMPtr<nsIPasswordManager> passwordManager =
+-                        do_CreateInstance (NS_PASSWORDMANAGER_CONTRACTID);
++                        do_GetService(NS_PASSWORDMANAGER_CONTRACTID);
+ 
+         for (GList *l = passwords; l != NULL; l = l->next)
+         {
+                 PasswordInfo *p = (PasswordInfo *)l->data;
+                 if (type == PASSWORD_PASSWORD)
+                 {
+-                        result = passwordManager->RemoveUser (NS_LITERAL_CSTRING(p->host),
++                        result = passwordManager->RemoveUser (nsDependentCString(p->host),
+                                                               NS_ConvertUTF8toUCS2(nsDependentCString(p->username)));
+                 }
+                 else if (type == PASSWORD_REJECT)
+@@ -1129,8 +1159,6 @@
+         }
+         else
+         {
+-                if (*ret_fullpath)
+-                        g_free (*ret_fullpath);
+                 nsCOMPtr<nsILocalFile> file;
+                 filePicker->GetFile (getter_AddRefs(file));
+ 		nsCAutoString tempFullPathStr;
diff --git a/www/galeon2/files/patch-mozilla_nsMailtoUrl.h b/www/galeon2/files/patch-mozilla_nsMailtoUrl.h
new file mode 100644
index 000000000000..fdaa127c2e7f
--- /dev/null
+++ b/www/galeon2/files/patch-mozilla_nsMailtoUrl.h
@@ -0,0 +1,14 @@
+--- mozilla/nsMailtoUrl.h.orig	Mon Apr  7 18:13:50 2003
++++ mozilla/nsMailtoUrl.h	Mon Apr  7 18:14:24 2003
+@@ -43,8 +43,10 @@
+ 
+ #include "nsIMailtoUrl.h"
+ #include "nsIURI.h"
+-#include "nsIFileSpec.h"
++#include "nsCRT.h"
+ #include "nsCOMPtr.h"
++#include "nsString.h"
++#include "nsIComponentManager.h"
+ #include "nsIPrompt.h"
+ #include "nsIAuthPrompt.h"
+ #include "nsIInterfaceRequestor.h"