Attachment 275751 Details for Bug 404271 – firts minimal patch

[patch] firts minimal patch

galeon-2.0.3-xulrunner.patch (text/plain), 40.72 KB, created by Martin Stransky on 2007-12-03 15:11:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Stransky

Created: 2007-12-03 15:11:42 UTC

Size: 40.72 KB

patch

obsolete

>diff -up galeon-2.0.3/mozilla/FilePicker.cpp.xl galeon-2.0.3/mozilla/FilePicker.cpp
>--- galeon-2.0.3/mozilla/FilePicker.cpp.xl	2005-04-08 17:16:03.000000000 +0200
>+++ galeon-2.0.3/mozilla/FilePicker.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -27,14 +27,12 @@
> 
> #include <nsCOMPtr.h>
> #include <nsCOMPtr.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
> #include <nsIURI.h>
> #include <nsIFileURL.h>
> #include <nsILocalFile.h>
> #include <nsIDOMWindow.h>
> #include <nsNetCID.h>
>+#include <nsComponentManagerUtils.h>
> 
> #ifndef HAVE_NSIFILEPICKER_NSASTRING
> #include <nsIDOMWindowInternal.h>
>diff -up galeon-2.0.3/mozilla/mozilla-embed-persist.cpp.xl galeon-2.0.3/mozilla/mozilla-embed-persist.cpp
>--- galeon-2.0.3/mozilla/mozilla-embed-persist.cpp.xl	2006-07-01 22:55:18.000000000 +0200
>+++ galeon-2.0.3/mozilla/mozilla-embed-persist.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -21,9 +21,6 @@
> #endif
> 
> #include <nscore.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
> 
> #include "ProgressListener.h"
> #include "mozilla-embed-persist.h"
>@@ -52,6 +49,7 @@
> #include <nsIStreamListener.h>
> #include <nsIURI.h>
> #include <nsIInputStream.h>
>+#include <nsComponentManagerUtils.h>
> 
> struct MozillaEmbedPersistPrivate
> {
>diff -up galeon-2.0.3/mozilla/nsMailtoUrl.h.xl galeon-2.0.3/mozilla/nsMailtoUrl.h
>--- galeon-2.0.3/mozilla/nsMailtoUrl.h.xl	2005-01-01 15:54:06.000000000 +0100
>+++ galeon-2.0.3/mozilla/nsMailtoUrl.h	2007-12-03 15:58:59.000000000 +0100
>@@ -48,7 +48,7 @@ public:
>     NS_DECL_ISUPPORTS
>     NS_DECL_NSIURI
>     NS_DECL_NSIMAILTOURL
>-
>+    
>     nsMailtoUrl();
> 
> protected:
>diff -up galeon-2.0.3/mozilla/GtkNSSSecurityWarningDialogs.cpp.xl galeon-2.0.3/mozilla/GtkNSSSecurityWarningDialogs.cpp
>--- galeon-2.0.3/mozilla/GtkNSSSecurityWarningDialogs.cpp.xl	2006-02-20 22:23:02.000000000 +0100
>+++ galeon-2.0.3/mozilla/GtkNSSSecurityWarningDialogs.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -51,9 +51,7 @@
> #include <nsCOMPtr.h>
> #include <nsIPrefBranch.h>
> #include <nsIPrefService.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
>+#include <nsServiceManagerUtils.h>
> #include <nsIInterfaceRequestor.h>
> #include <nsIInterfaceRequestorUtils.h>
> #include <nsIDOMWindow.h>
>diff -up galeon-2.0.3/mozilla/EventContext.cpp.xl galeon-2.0.3/mozilla/EventContext.cpp
>--- galeon-2.0.3/mozilla/EventContext.cpp.xl	2006-07-01 22:55:18.000000000 +0200
>+++ galeon-2.0.3/mozilla/EventContext.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -20,9 +20,6 @@
> #endif
> 
> #include <nscore.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
> 
> #include "EventContext.h"
> #include "GaleonWrapper.h"
>@@ -67,6 +64,7 @@
> #include <nsIDOMNSHTMLDocument.h>
> #include <nsIDOMHTMLSelectElement.h>
> #include <nsIDOMHTMLIsIndexElement.h>
>+#include <nsComponentManagerUtils.h>
> 
> #include <nsMemory.h>
> 
>diff -up galeon-2.0.3/mozilla/GtkNSSDialogs.cpp.xl galeon-2.0.3/mozilla/GtkNSSDialogs.cpp
>--- galeon-2.0.3/mozilla/GtkNSSDialogs.cpp.xl	2006-04-14 07:49:24.000000000 +0200
>+++ galeon-2.0.3/mozilla/GtkNSSDialogs.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -35,9 +35,6 @@
> 
> #include <nsCOMPtr.h>
> #include <nsMemory.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
> #include <nsIInterfaceRequestor.h>
> #include <nsIInterfaceRequestorUtils.h>
> #include <nsIX509Cert.h>
>@@ -55,6 +52,8 @@
> #include <nsEmbedString.h>
> #undef MOZILLA_STRICT_API
> #include <nsIDOMWindow.h>
>+#include <nsComponentManagerUtils.h>
>+#include <nsServiceManagerUtils.h>
> #include <gconf/gconf-client.h>
> #include <gtk/gtkdialog.h>
> #include <gtk/gtkstock.h>
>@@ -104,7 +103,7 @@ GtkNSSDialogs::~GtkNSSDialogs ()
> 
> NS_IMPL_ISUPPORTS2 (GtkNSSDialogs, 
> 		    nsICertificateDialogs,
>-		    nsIBadCertListener)
>+		    nsIBadCertListener2)
> 
> /**
>  *  Call the mozilla service to display a certificate
>@@ -287,7 +286,7 @@ display_cert_warning_box (nsIInterfaceRe
>         return res;
> }
> 
>-
>+/*
> NS_IMETHODIMP
> GtkNSSDialogs::ConfirmMismatchDomain (nsIInterfaceRequestor *ctx,
>                                       const nsACString &targetURL,
>@@ -333,8 +332,8 @@ GtkNSSDialogs::ConfirmMismatchDomain (ns
> 	*_retval = (res == GTK_RESPONSE_ACCEPT);
> 	return NS_OK;
> }
>-
>-
>+*/
>+/*
> NS_IMETHODIMP
> GtkNSSDialogs::ConfirmUnknownIssuer (nsIInterfaceRequestor *ctx,
>                                      nsIX509Cert *cert, PRInt16 *outAddType,
>@@ -397,10 +396,11 @@ GtkNSSDialogs::ConfirmUnknownIssuer (nsI
> 
>  	return NS_OK;
> }
>-
>+*/
> 
> /* boolean confirmCertExpired (in nsIInterfaceRequestor socketInfo, 
>    in nsIX509Cert cert); */
>+/*
> NS_IMETHODIMP 
> GtkNSSDialogs::ConfirmCertExpired (nsIInterfaceRequestor *ctx,
>                                    nsIX509Cert *cert, PRBool *_retval)
>@@ -451,9 +451,9 @@ GtkNSSDialogs::ConfirmCertExpired (nsIIn
> 
> 	LL_DIV (normalizedTime, timeToUse, PR_USEC_PER_SEC);
> 	LL_L2UI (t, normalizedTime);
>-	/* To translators: this a time format that is used while displaying the
>-	 * expiry or start date of an SSL certificate, for the format see 
>-	 * strftime(3) */
>+	// To translators: this a time format that is used while displaying the
>+	// expiry or start date of an SSL certificate, for the format see 
>+	// strftime(3)
> 	strftime (formattedDate, sizeof(formattedDate), _("%a %d %b %Y"), 
> 		  localtime_r (&t, &tm));
> 	fdate = g_locale_to_utf8 (formattedDate, -1, NULL, NULL, NULL);
>@@ -477,9 +477,11 @@ GtkNSSDialogs::ConfirmCertExpired (nsIIn
> 	
> 	return NS_OK;
> }
>+*/
> 
> /* void notifyCrlNextupdate (in nsIInterfaceRequestor socketInfo, 
>    in AUTF8String targetURL, in nsIX509Cert cert); */
>+/*
> NS_IMETHODIMP 
> GtkNSSDialogs::NotifyCrlNextupdate (nsIInterfaceRequestor *ctx,
> 				    const nsACString & targetURL, nsIX509Cert *cert)
>@@ -539,6 +541,7 @@ GtkNSSDialogs::NotifyCrlNextupdate (nsII
> 	gtk_widget_show_all (dialog);
> 	return NS_OK;
> }
>+*/
> 
> NS_IMETHODIMP 
> GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx, 
>@@ -679,6 +682,12 @@ GtkNSSDialogs::NotifyCACertExists (nsIIn
> 	return NS_OK;
> }
> 
>+NS_IMETHODIMP 
>+GtkNSSDialogs::NotifyCertProblem(nsIInterfaceRequestor *socketInfo, nsISSLStatus *status, const nsACString & targetSite, PRBool *_retval)
>+{
>+	return NS_OK;
>+}
>+ 
> struct SetPasswordCallback
> {
> 	GtkWidget *entry1;
>diff -up galeon-2.0.3/mozilla/JSConsoleService.cpp.xl galeon-2.0.3/mozilla/JSConsoleService.cpp
>--- galeon-2.0.3/mozilla/JSConsoleService.cpp.xl	2005-01-03 14:27:10.000000000 +0100
>+++ galeon-2.0.3/mozilla/JSConsoleService.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -18,7 +18,7 @@
> 
> #include "JSConsoleService.h"
> #include "GaleonUtils.h"
>-
>+/*
> NS_IMPL_ISUPPORTS1(JSConsoleService, nsIJSConsoleService)
> 
> JSConsoleService::JSConsoleService()  
>@@ -43,3 +43,4 @@ JSConsoleService::Open (nsIDOMWindow *in
> 
> 	return NS_OK;
> }
>+*/
>diff -up galeon-2.0.3/mozilla/MyportalProtocolHandler.cpp.xl galeon-2.0.3/mozilla/MyportalProtocolHandler.cpp
>--- galeon-2.0.3/mozilla/MyportalProtocolHandler.cpp.xl	2006-07-01 22:55:18.000000000 +0200
>+++ galeon-2.0.3/mozilla/MyportalProtocolHandler.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -23,9 +23,7 @@
> #endif
> 
> #include <nscore.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
>+#include <nsComponentManagerUtils.h>
> #include <nsCOMPtr.h>
> #include <nsIIOService.h>
> #include <nsIURI.h>
>@@ -35,8 +33,6 @@
> #include <nsILoadGroup.h>
> #include <nsIInterfaceRequestor.h>
> 
>-#include <nsIStorageStream.h>
>-#include <nsIInputStreamChannel.h>
> #include <nsNetCID.h>
> 
> #include <libgnomevfs/gnome-vfs-utils.h>
>@@ -413,12 +409,14 @@ GMyportalProtocolHandler::CreateMyportal
> {
> 	nsresult rv;
> 
>+	return NS_ERROR_NOT_IMPLEMENTED;
>+/*
> 	if (!path || path[0] == '\0')
> 	{
> 		path = "/";
> 	}
> 
>-	/* open the rendering stream */
>+	// open the rendering stream 
> 	nsCOMPtr<nsIStorageStream> sStream;
> 
> 	rv = NS_NewStorageStream(16384, (PRUint32)-1, getter_AddRefs(sStream));
>@@ -427,7 +425,7 @@ GMyportalProtocolHandler::CreateMyportal
> 	rv = sStream->GetOutputStream(0, getter_AddRefs(mStream));
> 	NS_ENSURE_SUCCESS (rv, rv);
> 
>-	/* render the complete portal */
>+	// render the complete portal
> 	Write ("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
> 	       "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n");
> 	Write ("<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">\n");
>@@ -443,12 +441,12 @@ GMyportalProtocolHandler::CreateMyportal
> 	Write ("<title>");
> 
> 	gchar *tmp = gnome_vfs_unescape_string (path, "");
>-	/* Skip multiple leading '/' (it's guaranteed to be at least 1 char long due
>-	 * to the path being set to '/' at the top of the function */
>+	// Skip multiple leading '/' (it's guaranteed to be at least 1 char long due
>+	// to the path being set to '/' at the top of the function 
> 	const gchar *q = tmp;
> 	while (q[1] == '/') q++;
> 
>-	/* Translators: the %s is the bookmark path, e.g. "/Programs/Galeon" */
>+	// Translators: the %s is the bookmark path, e.g. "/Programs/Galeon" 
> 	gchar *str = g_strdup_printf (_("My Portal: %s"), q);
> 	WriteHTMLEscape (str);
> 	g_free (str);
>@@ -473,7 +471,7 @@ GMyportalProtocolHandler::CreateMyportal
>  
> 	mStream = nsnull;
> 
>-	/* finish the rendering */
>+	// finish the rendering
> 	nsCOMPtr<nsIInputStream> iStream;
> 	rv = sStream->NewInputStream(0, getter_AddRefs(iStream));
> 	NS_ENSURE_SUCCESS (rv, rv);
>@@ -494,6 +492,7 @@ GMyportalProtocolHandler::CreateMyportal
> 
> 	NS_ADDREF(*result = channel);
> 	return rv;
>+*/
> }
> 
> ////////////////////////////////////////////////////////////////////////////////
>diff -up galeon-2.0.3/mozilla/ExternalProtocolService.cpp.xl galeon-2.0.3/mozilla/ExternalProtocolService.cpp
>--- galeon-2.0.3/mozilla/ExternalProtocolService.cpp.xl	2006-02-20 22:23:02.000000000 +0100
>+++ galeon-2.0.3/mozilla/ExternalProtocolService.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -19,14 +19,15 @@
> #include "config.h"
> #endif
> 
>+#undef HAVE_NSPIEXTERNALPROTOCOLSERVICE
>+
> #include <nsIMailtoUrl.h>
> #include <nsCOMPtr.h>
> #include <nsIURI.h>
> #include <nsIDOMWindow.h>
> #include <nsIWindowWatcher.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
>+#include <nsServiceManagerUtils.h>
>+#include <nsComponentManagerUtils.h>
> #include <nsMemory.h>
> #include "AutoJSContextStack.h"
> 
>@@ -100,18 +101,6 @@ NS_IMETHODIMP GExternalProtocolService::
> 	return NS_OK;
> }
> 
>-#if defined(HAVE_NSIEXTERNALPROTOCOLSERVICE_LOADURI) || defined (HAVE_NSPIEXTERNALPROTOCOLSERVICE)
>-NS_IMETHODIMP GExternalProtocolService::LoadURI(nsIURI *aURL, nsIPrompt *)
>-{
>-	/* Under some circumstances, the mozilla implementation of
>-	 * this asks the user whether they want to open the URI, e.g
>-	 * webcal urls. I'm not convinced we need to bother with that
>-	 * on linux:
>-	 *  http://bugzilla.mozilla.org/show_bug.cgi?id=263546 */
>-	return LoadUrl (aURL);
>-}
>-#endif
>-
> /* void loadUrl (in nsIURI aURL); */
> NS_IMETHODIMP GExternalProtocolService::LoadUrl(nsIURI *aURL)
> {
>@@ -193,6 +182,16 @@ NS_IMETHODIMP GExternalProtocolService::
> 	return NS_ERROR_FAILURE;
> }
> 
>+NS_IMETHODIMP GExternalProtocolService::LoadURI(nsIURI *aURI, nsIInterfaceRequestor *aWindowContext)
>+{
>+        return NS_ERROR_NOT_IMPLEMENTED;
>+}
>+
>+NS_IMETHODIMP GExternalProtocolService::GetProtocolHandlerInfo(const nsACString & aProtocolScheme, nsIHandlerInfo **_retval)
>+{
>+	return NS_ERROR_NOT_IMPLEMENTED;
>+}
>+
> NS_IMETHODIMP GExternalProtocolService::IsExposedProtocol(const char *aProtocolScheme, 
> 							  PRBool *_retval)
> {
>diff -up galeon-2.0.3/mozilla/ContentHandler.cpp.xl galeon-2.0.3/mozilla/ContentHandler.cpp
>--- galeon-2.0.3/mozilla/ContentHandler.cpp.xl	2006-02-20 22:23:02.000000000 +0100
>+++ galeon-2.0.3/mozilla/ContentHandler.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -159,9 +159,7 @@
> #include <nsIPromptService.h>
> #include <nsIWebProgressListener.h>
> #include <nsCOMPtr.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
>+#include <nsServiceManagerUtils.h>
> #include <nsIInterfaceRequestorUtils.h>
> #include <nsIURI.h>
> #include <nsIURL.h>
>@@ -500,13 +498,14 @@ NS_METHOD GContentHandler::SynchroniseMI
> 	 * a button (it is used as the time for the application opening) */
> 	char * info = g_strdup_printf ("%d:%s", gtk_get_current_event_time(),
> 				       id);
>-
>+/*
> 	rv = mimeInfo->SetApplicationDescription
> #ifdef HAVE_NSIMIMEINFO_NSASTRING
> 		(GulString(info));
> #else
> 		(GulString(info).get());
> #endif
>+*/
> 	g_free (info);
> 
> 	if(NS_FAILED(rv)) return NS_ERROR_FAILURE;
>@@ -957,6 +956,13 @@ NS_IMETHODIMP MiniProgressListener::OnSe
> 	return NS_ERROR_NOT_IMPLEMENTED;
> }
> 
>+NS_IMETHODIMP MiniProgressListener::OnRefreshAttempted(nsIWebProgress *aWebProgress, 
>+						nsIURI *aRefreshURI, PRInt32 aMillis, PRBool aSameURI, PRBool *_retval)
>+{
>+	return NS_ERROR_NOT_IMPLEMENTED;
>+}
>+  
>+
> #ifdef HAVE_NSIWEBPROGRESSLISTENER2_H
> NS_IMETHODIMP MiniProgressListener::OnProgressChange64(nsIWebProgress *aWebProgress,
> 						nsIRequest *aRequest, PRInt64 aCurSelfProgress,
>diff -up galeon-2.0.3/mozilla/GtkNSSDialogs.h.xl galeon-2.0.3/mozilla/GtkNSSDialogs.h
>--- galeon-2.0.3/mozilla/GtkNSSDialogs.h.xl	2003-10-13 23:25:28.000000000 +0200
>+++ galeon-2.0.3/mozilla/GtkNSSDialogs.h	2007-12-03 15:58:59.000000000 +0100
>@@ -9,7 +9,7 @@
> #define GTKNSSDIALOGS_H 1
> 
> #include <nsError.h>
>-#include "nsIBadCertListener.h"
>+#include "nsIBadCertListener2.h"
> #include "nsICertificateDialogs.h"
> 
> // 7a50a10d-9425-4e12-84b1-5822edacd8ce
>@@ -19,12 +19,12 @@
> #define GTK_NSSDIALOGS_CLASSNAME  "Gtk NSS Dialogs"
> 
> class GtkNSSDialogs
>-: public nsIBadCertListener,
>+: public nsIBadCertListener2,
>   public nsICertificateDialogs
> {
> public:
>   NS_DECL_ISUPPORTS
>-  NS_DECL_NSIBADCERTLISTENER
>+  NS_DECL_NSIBADCERTLISTENER2
>   NS_DECL_NSICERTIFICATEDIALOGS
> 
>   GtkNSSDialogs();
>diff -up galeon-2.0.3/mozilla/HeaderSniffer.cpp.xl galeon-2.0.3/mozilla/HeaderSniffer.cpp
>--- galeon-2.0.3/mozilla/HeaderSniffer.cpp.xl	2005-04-08 17:16:03.000000000 +0200
>+++ galeon-2.0.3/mozilla/HeaderSniffer.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -55,9 +55,6 @@
> #include "prefs-strings.h"
> #include "hig-alert.h"
> 
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
> #include <nsIChannel.h>
> #include <nsIHttpChannel.h>
> #include <nsIEncodedChannel.h>
>@@ -67,7 +64,6 @@
> #include <nsIMIMEService.h>
> #include <nsIMIMEInfo.h>
> #include <nsIDOMHTMLDocument.h>
>-#include <nsIDownload.h>
> #include <nsIWindowWatcher.h>
> #include <nsNetCID.h>
> #include <nsIDOMDocument.h>
>@@ -78,6 +74,8 @@
> #include <nsILocalFile.h>
> #include <nsIInputStream.h>
> #include <nsMemory.h>
>+#include <nsServiceManagerUtils.h>
>+#include <nsComponentManagerUtils.h>
> 
> #include <glib/gi18n.h>
> #include <libgnomevfs/gnome-vfs-utils.h>
>diff -up galeon-2.0.3/mozilla/GaleonUtils.cpp.xl galeon-2.0.3/mozilla/GaleonUtils.cpp
>--- galeon-2.0.3/mozilla/GaleonUtils.cpp.xl	2006-07-01 22:55:18.000000000 +0200
>+++ galeon-2.0.3/mozilla/GaleonUtils.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -20,9 +20,7 @@
> #include "config.h"
> 
> #include <nscore.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
>+#include <nsServiceManagerUtils.h>
> 
> #include "GaleonUtils.h"
> #include "GulString.h"
>@@ -306,7 +304,7 @@ GaleonUtils::EmbedPrintInfoToPrintSettin
> 	}
> 
> 	/* native paper size formats. Our dialog does not support custom yet */
>-	options->SetPaperSize (nsIPrintSettings::kPaperSizeNativeData);
>+	options->SetPaperSizeType (nsIPrintSettings::kPaperSizeNativeData);
> 
> 	gchar *paperName = (gchar *)g_ptr_array_index(info->paper_array, info->paper);
> 	options->SetPaperName (GulString (paperName).get());
>diff -up galeon-2.0.3/mozilla/EphyDirectoryProvider.cpp.xl galeon-2.0.3/mozilla/EphyDirectoryProvider.cpp
>--- galeon-2.0.3/mozilla/EphyDirectoryProvider.cpp.xl	2006-02-22 09:59:30.000000000 +0100
>+++ galeon-2.0.3/mozilla/EphyDirectoryProvider.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -34,9 +34,8 @@
> #include <nsIDirectoryService.h>
> #include <nsISupportsArray.h>
> #include <nsIProperties.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
>+#include <nsComponentManagerUtils.h>
>+#include <nsServiceManagerUtils.h>
> 
> #ifndef HAVE_NSDEPENDENTSTRING
> typedef nsEmbedString nsDependentString;
>@@ -90,17 +89,19 @@ EphyDirectoryProvider::GetFiles (const c
> 		NS_ENSURE_SUCCESS (rv, rv);
> 
> 		nsCOMPtr<nsISupportsArray> array;
>-		rv = NS_NewISupportsArray (getter_AddRefs (array));
>-		NS_ENSURE_SUCCESS (rv, rv);
>+		//rv = NS_NewISupportsArray (getter_AddRefs (array));
>+		array = do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID);
>+		//NS_ENSURE_SUCCESS (rv, rv);
> 
> 		rv = array->AppendElement (manifestDir);
> 		rv |= array->AppendElement (chromeDir);
> 		NS_ENSURE_SUCCESS (rv, rv);
> 
>-		rv = NS_NewArrayEnumerator (_retval, array);
>-		NS_ENSURE_SUCCESS (rv, rv);
>+		//rv = NS_NewArrayEnumerator (_retval, array);
>+		//NS_ENSURE_SUCCESS (rv, rv);
> 
>-		rv = NS_SUCCESS_AGGREGATE_RESULT;
>+		//rv = NS_SUCCESS_AGGREGATE_RESULT;
>+		rv = NS_ERROR_FAILURE;
> 	}
> 
> 	return rv;
>diff -up galeon-2.0.3/mozilla/GaleonWrapper.cpp.xl galeon-2.0.3/mozilla/GaleonWrapper.cpp
>--- galeon-2.0.3/mozilla/GaleonWrapper.cpp.xl	2006-07-01 22:55:18.000000000 +0200
>+++ galeon-2.0.3/mozilla/GaleonWrapper.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -21,9 +21,7 @@
> #endif
> 
> #include <nscore.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
>+#include <nsServiceManagerUtils.h>
> 
> #include "galeon-embed.h"
> #include "galeon-debug.h"
>@@ -1240,7 +1238,7 @@ nsresult GaleonWrapper::GetPagePropertie
> 	doc->GetLastModified(value);
> 	nsTime last_modified (GulCString(value).get(), PR_TRUE);
> 	LL_DIV (props->modification_time,
>-		NS_STATIC_CAST(PRTime, last_modified), PR_USEC_PER_SEC);
>+		(PRTime) last_modified, PR_USEC_PER_SEC);
> 
> 	doc->GetContentType(value);
> 	props->content_type = g_strdup (GulCString(value).get());
>@@ -2029,7 +2027,7 @@ GDOMPopupEventListener::HandleEvent (nsI
> 	nsCOMPtr<nsIDOMPopupBlockedEvent> popupEvent =
> 		do_QueryInterface(aDOMEvent);
> 	NS_ENSURE_TRUE (popupEvent, NS_ERROR_FAILURE);
>-
>+/*
> 	nsCOMPtr<nsIURI> requesterURI;
> 	popupEvent->GetRequestingWindowURI(getter_AddRefs(requesterURI));
> 	NS_ENSURE_TRUE (requesterURI, NS_ERROR_FAILURE);
>@@ -2042,6 +2040,8 @@ GDOMPopupEventListener::HandleEvent (nsI
> 	g_signal_emit_by_name (mEmbed, "ge_popupblocked", spec.get());
> 
> 	return rv;
>+*/
>+	return NS_ERROR_FAILURE;
> }
> 
> // ------------------------------------------------------------
>diff -up galeon-2.0.3/mozilla/AutoJSContextStack.cpp.xl galeon-2.0.3/mozilla/AutoJSContextStack.cpp
>--- galeon-2.0.3/mozilla/AutoJSContextStack.cpp.xl	2006-02-20 22:23:02.000000000 +0100
>+++ galeon-2.0.3/mozilla/AutoJSContextStack.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -20,10 +20,7 @@
> #include "config.h"
> 
> #include "AutoJSContextStack.h"
>-
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
>+#include <nsServiceManagerUtils.h>
> 
> AutoJSContextStack::~AutoJSContextStack()
> {
>diff -up galeon-2.0.3/mozilla/JSConsoleService.h.xl galeon-2.0.3/mozilla/JSConsoleService.h
>--- galeon-2.0.3/mozilla/JSConsoleService.h.xl	2004-12-12 11:16:56.000000000 +0100
>+++ galeon-2.0.3/mozilla/JSConsoleService.h	2007-12-03 15:58:59.000000000 +0100
>@@ -26,7 +26,7 @@
>  { 0x35807600, 0x35bd, 0x11d5, {0xbb, 0x6f, 0xb9, 0xf2, 0xe9, 0xfe, 0xe0, 0x3c}}
> #define NS_JSCONSOLESERVICE_CONTRACTID \
>  "@mozilla.org/embedcomp/jsconsole-service;1"
>-
>+/*
> #include <nsIJSConsoleService.h>
> 
> class JSConsoleService: public nsIJSConsoleService
>@@ -40,6 +40,6 @@ public:
>   NS_DECL_ISUPPORTS
> 
> };
>-
>+*/
> #endif
> 
>diff -up galeon-2.0.3/mozilla/MozRegisterComponents.cpp.xl galeon-2.0.3/mozilla/MozRegisterComponents.cpp
>--- galeon-2.0.3/mozilla/MozRegisterComponents.cpp.xl	2006-03-19 03:43:54.000000000 +0100
>+++ galeon-2.0.3/mozilla/MozRegisterComponents.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -50,16 +50,15 @@
> #include <nsIComponentRegistrar.h>
> #include <nsICategoryManager.h>
> #include <nsCOMPtr.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
> #include <nsDocShellCID.h>
>+#include <nsComponentManagerUtils.h>
>+#include <nsServiceManagerUtils.h>
>+#include <nsIComponentManager.h>
> 
> #include <glib.h>
> 
> NS_GENERIC_FACTORY_CONSTRUCTOR(GProgressListener)
> NS_GENERIC_FACTORY_CONSTRUCTOR(GFilePicker)
>-NS_GENERIC_FACTORY_CONSTRUCTOR(JSConsoleService)
> NS_GENERIC_FACTORY_CONSTRUCTOR(GContentHandler)
> NS_GENERIC_FACTORY_CONSTRUCTOR(MozGlobalHistory)
> NS_GENERIC_FACTORY_CONSTRUCTOR(GPrintingPromptService)
>@@ -112,12 +111,6 @@ static const nsModuleComponentInfo sAppC
> 		NS_TRANSFER_CONTRACTID,
> 		GProgressListenerConstructor
> 	},
>-	{	
>-		G_JS_CONSOLESERVICE_CLASSNAME,
>-		G_JSCONSOLESERVICE_CID,
>-		NS_JSCONSOLESERVICE_CONTRACTID,
>-		JSConsoleServiceConstructor
>-	},
> 	{
> 		G_FILEPICKER_CLASSNAME,
> 		G_FILEPICKER_CID,
>@@ -171,12 +164,6 @@ static const nsModuleComponentInfo sAppC
> 	{
> 		GTK_NSSDIALOGS_CLASSNAME,
> 		GTK_NSSDIALOGS_CID,
>-		NS_BADCERTLISTENER_CONTRACTID,
>-		GtkNSSDialogsConstructor
>-	},
>-	{
>-		GTK_NSSDIALOGS_CLASSNAME,
>-		GTK_NSSDIALOGS_CID,
> 		NS_CERTIFICATEDIALOGS_CONTRACTID,
> 		GtkNSSDialogsConstructor
> 	},
>diff -up galeon-2.0.3/mozilla/GlobalHistory.cpp.xl galeon-2.0.3/mozilla/GlobalHistory.cpp
>--- galeon-2.0.3/mozilla/GlobalHistory.cpp.xl	2006-03-09 17:33:04.000000000 +0100
>+++ galeon-2.0.3/mozilla/GlobalHistory.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -26,6 +26,8 @@
> #include "GlobalHistory.h"
> #include "GulString.h"
> 
>+#define HAVE_NSIBROWSERHISTORY_ADDURI_WITH_REFERRER 1
>+
> /**
>  * class GlobalHistory: 
>  *
>diff -up galeon-2.0.3/mozilla/mozilla-embed.cpp.xl galeon-2.0.3/mozilla/mozilla-embed.cpp
>--- galeon-2.0.3/mozilla/mozilla-embed.cpp.xl	2006-07-01 22:55:18.000000000 +0200
>+++ galeon-2.0.3/mozilla/mozilla-embed.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -21,9 +21,6 @@
> #endif
> 
> #include <nscore.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
> 
> #define MOZILLA_CLIENT
> #include "gtkmozembed.h"
>@@ -54,6 +51,7 @@
> #include <nsIPrintSettings.h>
> #include <nsIDOMWindow.h>
> #include <nsIDOMKeyEvent.h>
>+#include <nsServiceManagerUtils.h>
> 
> #include <math.h>
> 
>@@ -1810,7 +1808,7 @@ impl_remove_user_stylesheet(GaleonEmbed 
> {
> 	if (!sheet) return;
> 
>-	MozillaEmbedStyleSheet *mess = NS_STATIC_CAST(MozillaEmbedStyleSheet*, sheet);
>+	MozillaEmbedStyleSheet *mess = (MozillaEmbedStyleSheet*) sheet;
> 	g_return_if_fail(mess != NULL);
> 
>         GaleonWrapper *wrapper = MOZILLA_EMBED(embed)->priv->wrapper;
>@@ -1830,7 +1828,7 @@ galeon_embed_stylesheet_new (EmbedStyleS
> void
> galeon_embed_stylesheet_free (EmbedStyleSheet *sheet)
> {
>-	MozillaEmbedStyleSheet *mess = NS_STATIC_CAST(MozillaEmbedStyleSheet*, sheet);
>+	MozillaEmbedStyleSheet *mess = (MozillaEmbedStyleSheet*) sheet;
> 
> 	if (mess)
> 	{
>diff -up galeon-2.0.3/mozilla/GaleonFind.cpp.xl galeon-2.0.3/mozilla/GaleonFind.cpp
>--- galeon-2.0.3/mozilla/GaleonFind.cpp.xl	2006-09-09 05:11:55.000000000 +0200
>+++ galeon-2.0.3/mozilla/GaleonFind.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -25,9 +25,8 @@
> 
> #include "galeon-debug.h"
> 
>-#undef MOZILLA_INTERNAL_API
> #include <nsEmbedString.h>
>-#define MOZILLA_INTERNAL_API 1
>+#include <nsStringAPI.h>
> 
> #define MOZILLA_CLIENT
> #include <gtkmozembed.h>
>@@ -49,6 +48,7 @@
> #include <nsIDOMKeyEvent.h>
> #include <nsIDOMEventTarget.h>
> #include <nsIDOMHTMLAnchorElement.h>
>+#include <nsComponentManagerUtils.h>
> 
> #ifdef HAVE_TYPEAHEADFIND
> #include <nsISimpleEnumerator.h>
>@@ -230,7 +230,7 @@ GaleonFind::Find (const char *aSearchStr
>   nsresult rv;
>   PRUint16 found = nsITypeAheadFind::FIND_NOTFOUND;
> #ifdef HAVE_NSITYPEAHEADFIND_SETSELECTIONMODEANDREPAINT
>-  rv = mFinder->Find (uSearchString, aLinksOnly, PR_FALSE, &found);
>+  rv = mFinder->Find (uSearchString, aLinksOnly, &found);
> #else
>   rv = mFinder->Find (uSearchString, aLinksOnly, &found);
> #endif
>diff -up galeon-2.0.3/mozilla/GaleonAboutModule.cpp.xl galeon-2.0.3/mozilla/GaleonAboutModule.cpp
>--- galeon-2.0.3/mozilla/GaleonAboutModule.cpp.xl	2006-07-01 22:55:18.000000000 +0200
>+++ galeon-2.0.3/mozilla/GaleonAboutModule.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -24,8 +24,6 @@
> 
> #include "config.h"
> 
>-#define MOZILLA_INTERNAL_API
>-
> #include <nsCOMPtr.h>
> #include <nsIIOService.h>
> #include <nsIServiceManager.h>
>@@ -37,8 +35,9 @@
> #include <nsIInputStreamChannel.h>
> #include <nsIScriptSecurityManager.h>
> #include <nsNetCID.h>
>-#include <nsString.h>
>-#include <nsEscape.h>
>+#include <nsStringAPI.h>
>+#include <nsComponentManagerUtils.h>
>+#include <nsServiceManagerUtils.h>
> 
> #include <glib/gi18n.h>
> #include <gtk/gtk.h>
>@@ -102,6 +101,7 @@ nsresult
> GaleonAboutModule::Redirect(const nsACString &aURL,
> 			  nsIChannel **_retval)
> {
>+/*
> 	nsresult rv;
> 	nsCOMPtr<nsIIOService> ioService;
> 	rv = GaleonUtils::GetIOService (getter_AddRefs (ioService));
>@@ -130,6 +130,8 @@ GaleonAboutModule::Redirect(const nsACSt
> 
> 	NS_ADDREF(*_retval = tempChannel);
> 	return rv;
>+*/
>+	return NS_OK;
> }
> 
> nsresult
>@@ -158,14 +160,14 @@ GaleonAboutModule::ParseErrorURL(const c
> 		switch (param[0])
> 		{
> 			case 'e':
>-				aError.Assign (nsUnescape (param + 2));
>+				//aError.Assign (nsUnescape (param + 2));
> 				break;
> 			case 'u':
> 				aRawOriginURL.Assign (param + 2);
>-				aOriginURL.Assign (nsUnescape (param + 2));
>+				//aOriginURL.Assign (nsUnescape (param + 2));
> 				break;
> 			case 'c':
>-				aOriginCharset.Assign (nsUnescape (param + 2));
>+				//aOriginCharset.Assign (nsUnescape (param + 2));
> 				break;
> 			case 'd':
> 				/* we don't need mozilla's description parameter */
>@@ -390,10 +392,13 @@ GaleonAboutModule::CreateErrorPage(nsIUR
> 	NS_ENSURE_TRUE (primary && secondary, NS_ERROR_FAILURE);
> 
> 	/* open the rendering stream */
>+
> 	nsCOMPtr<nsIStorageStream> storageStream;
>-	rv = NS_NewStorageStream(16384, (PRUint32) -1, getter_AddRefs (storageStream));
>+//	rv = NS_NewStorageStream(16384, (PRUint32) -1, getter_AddRefs (storageStream));
> 	NS_ENSURE_SUCCESS (rv, rv);
> 
>+	return NS_ERROR_ILLEGAL_VALUE;
>+
> 	nsCOMPtr<nsIOutputStream> stream;
> 	rv = storageStream->GetOutputStream(0, getter_AddRefs (stream));
> 	NS_ENSURE_SUCCESS (rv, rv);
>diff -up galeon-2.0.3/mozilla/mozilla-embed-shell.cpp.xl galeon-2.0.3/mozilla/mozilla-embed-shell.cpp
>--- galeon-2.0.3/mozilla/mozilla-embed-shell.cpp.xl	2007-12-03 15:58:59.000000000 +0100
>+++ galeon-2.0.3/mozilla/mozilla-embed-shell.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -21,9 +21,8 @@
> #endif
> 
> #include <nscore.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
>+#include <nsServiceManagerUtils.h>
>+#include <nsComponentManagerUtils.h>
> 
> #define MOZILLA_CLIENT
> #include "gtkmozembed.h"
>@@ -54,7 +53,7 @@
> #include <string.h>
> 
> #include <nsIConsoleService.h>
>-#include <nsIJSConsoleService.h>
>+//#include <nsIJSConsoleService.h>
> #include <nsICacheService.h>
> #include <nsCOMPtr.h>
> #include <nsNetCID.h>
>@@ -66,7 +65,7 @@
> #include <nsICookieManager.h>
> #include <nsIPermission.h>
> #include <nsIPasswordManager.h>
>-#include <nsIPassword.h>
>+//#include <nsIPassword.h>
> #include <nsICookie.h>
> #include <nsCPasswordManager.h>
> #include <nsIObserverService.h>
>@@ -792,7 +791,7 @@ impl_list_passwords (GaleonEmbedShell *s
>         if (NS_FAILED(result)) return NULL;
> 
> 	GList *passwords = NULL;
>-
>+/*
>         PRBool enumResult;
>         for (passwordEnumerator->HasMoreElements(&enumResult) ;
>              enumResult == PR_TRUE ;
>@@ -818,7 +817,7 @@ impl_list_passwords (GaleonEmbedShell *s
> 
> 		passwords = g_list_prepend (passwords, p);
>         }       
>-
>+*/
> 	return g_list_reverse (passwords);
> }
> 
>diff -up galeon-2.0.3/mozilla/mozilla-prefs.cpp.xl galeon-2.0.3/mozilla/mozilla-prefs.cpp
>--- galeon-2.0.3/mozilla/mozilla-prefs.cpp.xl	2005-04-08 17:16:03.000000000 +0200
>+++ galeon-2.0.3/mozilla/mozilla-prefs.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -20,10 +20,8 @@
> 
> #include <nsCOMPtr.h>
> #include <nsIPrefService.h>
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
> #include <nsMemory.h>
>+#include <nsServiceManagerUtils.h>
> #include <glib/gmessages.h>
> #include <glib/gstrfuncs.h>
> 
>diff -up galeon-2.0.3/mozilla/EphyPromptService.cpp.xl galeon-2.0.3/mozilla/EphyPromptService.cpp
>--- galeon-2.0.3/mozilla/EphyPromptService.cpp.xl	2006-03-08 17:20:07.000000000 +0100
>+++ galeon-2.0.3/mozilla/EphyPromptService.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -521,7 +521,7 @@ static void
> DeletePrompter (gpointer aPromptPtr,
> 	        GObject *aZombie)
> {
>-	Prompter *prompt = NS_STATIC_CAST (Prompter*, aPromptPtr);
>+	Prompter *prompt = (Prompter*) aPromptPtr;
> 
> 	delete prompt;
> }
>@@ -535,7 +535,7 @@ Prompter::Show ()
> 			  G_CALLBACK (gtk_widget_destroy), NULL);
> 	g_object_weak_ref (G_OBJECT (mDialog),
> 			   (GWeakNotify) DeletePrompter,
>-			   NS_STATIC_CAST (gpointer, this));
>+			   (gpointer) this);
> 
> 	gtk_widget_show (GTK_WIDGET (mDialog));
> }
>diff -up galeon-2.0.3/mozilla/nsMailtoUrl.cpp.xl galeon-2.0.3/mozilla/nsMailtoUrl.cpp
>--- galeon-2.0.3/mozilla/nsMailtoUrl.cpp.xl	2005-07-04 18:21:35.000000000 +0200
>+++ galeon-2.0.3/mozilla/nsMailtoUrl.cpp	2007-12-03 16:00:04.000000000 +0100
>@@ -34,20 +34,19 @@
>  *
>  * ***** END LICENSE BLOCK ***** */
> 
>-#define MOZILLA_INTERNAL_API
>-#include <nsString.h>
> #include <nsIComponentManager.h>
>-#include <nsReadableUtils.h>
>-#include <nsEscape.h>
>-#undef MOZILLA_INTERNAL_API
>+#include <nsComponentManagerUtils.h>
>+#include <nsStringAPI.h>
> 
> #include "nsMailtoUrl.h"
> 
> #include <nsIURI.h>
> #include <nsNetCID.h>
>-#include <nsCRT.h>
>+#include <nsCRTGlue.h>
>+#include <string.h>
> 
> static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
>+NS_DEFINE_STATIC_IID_ACCESSOR(nsIMailtoUrl,NS_IMAILTOURL_IID);
> 
> struct nsMailtoUrlPrivate
> {
>@@ -104,18 +103,18 @@ nsresult nsMailtoUrl::ParseMailtoUrl(cha
> 
> 	if (rest)
> 	{
>-    char *token = nsCRT::strtok(rest, "&", &rest);
>+    char *token = strtok(rest, "&");
> 		while (token && *token)
> 		{
> 			char *value = 0;
>-      char *eq = PL_strchr(token, '=');
>+      char *eq = strchr(token, '=');
> 			if (eq)
> 			{
> 				value = eq+1;
> 				*eq = 0;
> 			}
> 			
>-			switch (nsCRT::ToUpper(*token))
>+			switch (NS_ToUpper(*token))
> 			{
> /* DO NOT support attachment= in mailto urls. This poses a security fire hole!!! 
> 				case 'A':
>@@ -124,7 +123,7 @@ nsresult nsMailtoUrl::ParseMailtoUrl(cha
> 				  break;
> */
> 				case 'B':
>-				  if (!nsCRT::strcasecmp (token, "bcc"))
>+				  if (!strcmp (token, "bcc"))
> 				  {
> 					  if (!priv->m_bccPart.IsEmpty())
>             {
>@@ -134,7 +133,7 @@ nsresult nsMailtoUrl::ParseMailtoUrl(cha
>             else
> 					    priv->m_bccPart = value; 
>           }
>-					else if (!nsCRT::strcasecmp (token, "body"))
>+					else if (!strcmp (token, "body"))
> 					{
>             if (!priv->m_bodyPart.IsEmpty())
>             {
>@@ -146,7 +145,7 @@ nsresult nsMailtoUrl::ParseMailtoUrl(cha
>           }
>           break;
>         case 'C': 
>-					if (!nsCRT::strcasecmp  (token, "cc"))
>+					if (!strcmp  (token, "cc"))
> 					{
> 						if (!priv->m_ccPart.IsEmpty())
> 						{
>@@ -158,43 +157,43 @@ nsresult nsMailtoUrl::ParseMailtoUrl(cha
> 					}
>           break;
>         case 'F': 
>-					if (!nsCRT::strcasecmp (token, "followup-to"))
>+					if (!strcmp (token, "followup-to"))
> 						priv->m_followUpToPart = value;
>-					else if (!nsCRT::strcasecmp (token, "from"))
>+					else if (!strcmp (token, "from"))
> 						priv->m_fromPart = value;
>-					else if (!nsCRT::strcasecmp (token, "force-plain-text"))
>+					else if (!strcmp (token, "force-plain-text"))
> 						priv->m_forcePlainText = PR_TRUE;
> 					break;
>         case 'H':
>-				  if (!nsCRT::strcasecmp(token, "html-part"))
>+				  if (!strcmp(token, "html-part"))
> 						  priv->m_htmlPart = value;
>           break;
> 				case 'N':
>-					if (!nsCRT::strcasecmp (token, "newsgroups"))
>+					if (!strcmp (token, "newsgroups"))
> 						priv->m_newsgroupPart = value;
>-					else if (!nsCRT::strcasecmp (token, "newshost"))
>+					else if (!strcmp (token, "newshost"))
> 						priv->m_newsHostPart = value;
> 				  break;
> 				case 'O':
>-					if (!nsCRT::strcasecmp (token, "organization"))
>+					if (!strcmp (token, "organization"))
> 						priv->m_organizationPart = value;
> 					break;
>         case 'R':
>-					if (!nsCRT::strcasecmp (token, "references"))
>+					if (!strcmp (token, "references"))
> 						priv->m_referencePart = value;
>-					else if (!nsCRT::strcasecmp (token, "reply-to"))
>+					else if (!strcmp (token, "reply-to"))
> 						priv->m_replyToPart = value;
> 					break;
> 				case 'S':
>-					if(!nsCRT::strcasecmp (token, "subject"))
>+					if(!strcmp (token, "subject"))
> 						priv->m_subjectPart = value;
> 					break;
> 				case 'P':
>-					if (!nsCRT::strcasecmp (token, "priority"))
>-						priv->m_priorityPart = PL_strdup(value);
>+					if (!strcmp (token, "priority"))
>+						priv->m_priorityPart = strdup(value);
> 					break;
> 				case 'T':
>-					if (!nsCRT::strcasecmp (token, "to"))
>+					if (!strcmp (token, "to"))
> 				  {
> 						if (!priv->m_toPart.IsEmpty())
> 						{
>@@ -211,7 +210,7 @@ nsresult nsMailtoUrl::ParseMailtoUrl(cha
> 			
> 			if (eq)
> 				  *eq = '='; /* put it back */
>-				token = nsCRT::strtok(rest, "&", &rest);
>+				token = strtok(rest, "&");
> 		} // while we still have part of the url to parse...
> 	} // if rest && *rest
> 
>@@ -257,9 +256,9 @@ nsresult nsMailtoUrl::ParseUrl()
>   {
>     // now parse out the search field...
>     nsCAutoString searchPart;
>-    PRUint32 numExtraChars = priv->m_toPart.Right(searchPart,
>-                                            priv->m_toPart.Length() -
>-                                            startOfSearchPart);
>+    PRUint32 numExtraChars;// = priv->m_toPart.Right(searchPart,
>+                          //                  priv->m_toPart.Length() -
>+                          //                  startOfSearchPart);
>     if (!searchPart.IsEmpty())
>     {
>       ParseMailtoUrl(searchPart.BeginWriting());
>@@ -270,7 +269,7 @@ nsresult nsMailtoUrl::ParseUrl()
> 	}
>   else if (!priv->m_toPart.IsEmpty())
>   {
>-    nsUnescape(priv->m_toPart.BeginWriting());
>+//    nsUnescape(priv->m_toPart.BeginWriting());
>   }
> 
>   return rv;
>diff -up galeon-2.0.3/mozilla/MozillaPrivate.cpp.xl galeon-2.0.3/mozilla/MozillaPrivate.cpp
>--- galeon-2.0.3/mozilla/MozillaPrivate.cpp.xl	2005-09-17 19:17:24.000000000 +0200
>+++ galeon-2.0.3/mozilla/MozillaPrivate.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -24,22 +24,16 @@
> #include "config.h"
> #endif
> 
>-#define MOZILLA_INTERNAL_API
> /***** BEGIN UNSAFE HEADERS ******/
> #include <nsIPrintOptions.h>
> #include <nsIDocument.h>
> #include <nsIPresShell.h>
>-#include <nsICSSLoader.h>
>-#include <nsICSSStyleSheet.h>
> #include <nsIScriptContext.h>
>-#include <nsIHTMLDocument.h>
>-#include <nsString.h>
>+#include <nsStringAPI.h>
> 
> #include "MozillaPrivate.h"
> /***** END UNSAFE HEADERS ******/
> 
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
> #include <nsISupportsPrimitives.h>
> #include <nsIInterfaceRequestorUtils.h>
> #include <nsIPrintSettingsService.h>
>@@ -59,14 +53,14 @@ MozillaPrivate::GetPrinterList (gint* de
> 	nsresult rv = NS_OK;
> 
> 	*defaultPrinterIndex = -1;
>-
>+/*
> 	nsCOMPtr<nsIPrintSettingsService> pss =
> 		do_GetService("@mozilla.org/gfx/printsettings-service;1", &rv);
> 	NS_ENSURE_SUCCESS(rv, NULL);
> 
> 	nsCOMPtr<nsIPrintOptions> po = do_QueryInterface(pss, &rv);
> 	NS_ENSURE_SUCCESS(rv, NULL);
>-
>+	
> 	nsXPIDLString defaultPrinter;
> 	rv = pss->GetDefaultPrinterName(getter_Copies(defaultPrinter));
> 	NS_ENSURE_SUCCESS(rv, NULL);
>@@ -74,7 +68,9 @@ MozillaPrivate::GetPrinterList (gint* de
> 	nsCOMPtr<nsISimpleEnumerator> printers;
> 	rv = po->AvailablePrinters(getter_AddRefs(printers));
> 	NS_ENSURE_SUCCESS(rv, NULL);
>-
>+*/
>+	return NULL;
>+/*
> 	PRBool more = PR_FALSE;
> 	gint index = 0;
> 
>@@ -115,6 +111,7 @@ MozillaPrivate::GetPrinterList (gint* de
> 	}
> 
> 	return printerList;
>+*/
> }
> 
> 
>@@ -127,6 +124,8 @@ MozillaPrivate::LoadOverrideStyleSheet (
> 	nsCOMPtr<nsIPresShell> presShell;
> 	aDocShell->GetPresShell (getter_AddRefs(presShell));
> 	NS_ENSURE_TRUE (presShell, NS_ERROR_FAILURE);
>+
>+#define HAVE_NSIPRESSHELL_DECOMTAMINATE 1
> 	
> #ifdef HAVE_NSIPRESSHELL_DECOMTAMINATE
> 	nsIDocument *doc = presShell->GetDocument();
>@@ -136,6 +135,8 @@ MozillaPrivate::LoadOverrideStyleSheet (
> #endif
> 	NS_ENSURE_TRUE (doc, NS_ERROR_FAILURE);
> 
>+#define HAVE_NSIDOCUMENT_CSSLOADER 1
>+
> #ifdef HAVE_NSIDOCUMENT_CSSLOADER
> 	nsICSSLoader *loader = doc->CSSLoader();
> #else
>@@ -144,6 +145,7 @@ MozillaPrivate::LoadOverrideStyleSheet (
> 	NS_ENSURE_TRUE (loader, NS_ERROR_FAILURE);
> 
> 	/* load sheet */
>+/*
> 	nsCOMPtr<nsICSSStyleSheet> sheet;
> #ifdef HAVE_NSICSSLOADER_LOADSHEETSYNC
> 	rv = loader->LoadSheetSync(aUri, getter_AddRefs(sheet));
>@@ -152,24 +154,24 @@ MozillaPrivate::LoadOverrideStyleSheet (
> #endif
> 	NS_ENSURE_SUCCESS (rv, rv);
> 
>-	/* catch stylesheet stuff and apply by appending it as a override
>-	 * sheet and enabling stylesheets */
>+	//catch stylesheet stuff and apply by appending it as a override
>+	// sheet and enabling stylesheets 
> 	nsCOMPtr<nsIStyleSheet> styleSheet = do_QueryInterface(sheet);
> 	NS_ENSURE_TRUE (styleSheet, NS_ERROR_FAILURE);
> 	
>-	/* Override - Agent */
>+	// Override - Agent 
> 	presShell->AddOverrideStyleSheet(styleSheet);
> 	styleSheet->SetOwningDocument(doc);
> 
>-	/* notify mozilla that stylesheets have changed */
>+	// notify mozilla that stylesheets have changed 
> 	styleSheet->SetEnabled(PR_FALSE);
> 	styleSheet->SetEnabled(PR_TRUE);
>-	/* This is Right[tm], but not working for some people (?!)
>-	doc->SetStyleSheetDisabledState(styleSheet, PR_FALSE);
>-	*/
>+	// This is Right[tm], but not working for some people (?!)
>+	//doc->SetStyleSheetDisabledState(styleSheet, PR_FALSE);
>+	
> 
> 	NS_ADDREF(*aStyleSheet = styleSheet);
>-	
>+*/	
> 	return NS_OK;
> }
> 
>@@ -183,7 +185,7 @@ MozillaPrivate::RemoveOverrideStyleSheet
> 
> 	/* remove it */
> 	ps->RemoveOverrideStyleSheet (aStyleSheet);
>-	aStyleSheet->SetEnabled(PR_FALSE);
>+	//aStyleSheet->SetEnabled(PR_FALSE);
> 
> 	return NS_OK;
> }
>@@ -227,6 +229,7 @@ nsresult
> MozillaPrivate::GetCompatibilityMode (nsIDOMNSDocument *aDoc,
> 				      EmbedPageRenderMode *aMode)
> {
>+/*
> 	nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface (aDoc);
> 	NS_ENSURE_TRUE(htmlDoc, NS_ERROR_FAILURE);
> 
>@@ -243,7 +246,7 @@ MozillaPrivate::GetCompatibilityMode (ns
> 		*aMode = EMBED_RENDER_QUIRKS;
> 		break;
> 	}
>-
>+*/
> 	return NS_OK;
> }
> 
>diff -up galeon-2.0.3/mozilla/JSConsoleListener.cpp.xl galeon-2.0.3/mozilla/JSConsoleListener.cpp
>--- galeon-2.0.3/mozilla/JSConsoleListener.cpp.xl	2005-04-04 17:38:03.000000000 +0200
>+++ galeon-2.0.3/mozilla/JSConsoleListener.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -71,7 +71,7 @@ NS_IMETHODIMP JSConsoleListener::Observe
> 		{
> 			type = GALEON_JS_CONSOLE_ERROR;
> 		}
>-
>+#define HAVE_SCRIPTERROR_NSASTRING 1
> #ifdef HAVE_SCRIPTERROR_NSASTRING
> 		GulString sourceName;
> 		error->GetSourceName (sourceName);
>diff -up galeon-2.0.3/mozilla/ProgressListener.cpp.xl galeon-2.0.3/mozilla/ProgressListener.cpp
>--- galeon-2.0.3/mozilla/ProgressListener.cpp.xl	2005-11-28 22:24:34.000000000 +0100
>+++ galeon-2.0.3/mozilla/ProgressListener.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -34,9 +34,8 @@
> #include <libgnomevfs/gnome-vfs-utils.h>
> #include <glib/gi18n.h>
> 
>-#define MOZILLA_INTERNAL_API
>-#include <nsIServiceManager.h>
>-#undef MOZILLA_INTERNAL_API
>+#include <nsServiceManagerUtils.h>
>+#include <nsComponentManagerUtils.h>
> #include <nsIWebBrowserPersist.h>
> #include <nsCWebBrowserPersist.h>
> #include <nsIFileURL.h>
>@@ -226,7 +225,7 @@ NS_IMETHODIMP GProgressListener::Init(ns
>         	tFileUrl->GetFile(getter_AddRefs(tFileRef));
> 		tFileRef->Clone(getter_AddRefs(mFile));
> 	}
>-
>+/*
> 	if (aMIMEInfo)
> 	{
> 		nsMIMEInfoHandleAction action;
>@@ -237,12 +236,12 @@ NS_IMETHODIMP GProgressListener::Init(ns
> 				mMIMEInfo = aMIMEInfo;
> 			}
> 
>-			/* HACK, stop mozilla from opening the application, we
>-			 * do it ourselves */
>+			// HACK, stop mozilla from opening the application, we
>+			// do it ourselves
> 			aMIMEInfo->SetPreferredAction(nsIMIMEInfo::saveToDisk);
> 		}
> 	}
>-
>+*/
>         return PrivateInit();
> }
> 
>@@ -718,6 +717,7 @@ NS_METHOD GProgressListener::LaunchHelpe
> 	if(NS_FAILED(rv)) return NS_ERROR_FAILURE;
> 
> 	GulString helperDesc;
>+/*
> #ifdef HAVE_NSIMIMEINFO_NSASTRING
> 	rv = mMIMEInfo->GetApplicationDescription(helperDesc);
> #else
>@@ -727,6 +727,8 @@ NS_METHOD GProgressListener::LaunchHelpe
> 	nsMemory::Free (tmp);
> #endif
> 	if(NS_FAILED(rv)) return NS_ERROR_FAILURE;
>+*/
>+	return NS_ERROR_FAILURE;
> 
> 	// XXX information passing kludge (from ContentHandler)
> 	// TODO: should probably use some prefix, like 'gnomevfs:'
>@@ -865,6 +867,12 @@ nsresult GProgressListener::Abort (void)
> 	return NS_OK;
> }
> 
>+nsresult
>+GProgressListener::OnRefreshAttempted(nsIWebProgress *aWebProgress, nsIURI *aRefreshURI, PRInt32 aMillis, PRBool aSameURI, PRBool *_retval)
>+{
>+	return NS_OK;
>+}
>+
> nsresult 
> InitiateMozillaDownload (nsIURI *sourceURI, nsILocalFile* inDestFile,
> 			 GaleonEmbedPersist *embedPersist,
>diff -up galeon-2.0.3/mozilla/GaleonJS.cpp.xl galeon-2.0.3/mozilla/GaleonJS.cpp
>--- galeon-2.0.3/mozilla/GaleonJS.cpp.xl	2006-09-18 17:18:22.000000000 +0200
>+++ galeon-2.0.3/mozilla/GaleonJS.cpp	2007-12-03 15:58:59.000000000 +0100
>@@ -24,15 +24,10 @@
> #include "config.h"
> #endif
> 
>-#ifdef HAVE_NSISCRIPTCONTEXT_INTERNAL_API
>-#define MOZILLA_INTERNAL_API
>-#endif
> #include <nscore.h>
> #include <nsIDOMWindow.h>
>-//#include <nsStringAPI.h>
> #include <nsIScriptGlobalObject.h>
> #include <nsIScriptContext.h>
>-#undef MOZILLA_INTERNAL_API
> 
> #include "GaleonJS.h"
>

Actions: View | Diff

Attachments on bug 404271: 275751