Attachment 276851 Details for Bug 356731 – a minimal epiphany xulrunner patch

[patch] a minimal epiphany xulrunner patch

epiphany-2.20.2-xulrunner.patch (text/plain), 17.98 KB, created by Martin Stransky on 2007-12-04 11:33:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Stransky

Created: 2007-12-04 11:33:37 UTC

Size: 17.98 KB

patch

obsolete

>diff -up epiphany-2.20.2/embed/mozilla/GeckoPrintService.cpp.xl epiphany-2.20.2/embed/mozilla/GeckoPrintService.cpp
>--- epiphany-2.20.2/embed/mozilla/GeckoPrintService.cpp.xl	2007-11-27 00:36:42.000000000 +0100
>+++ epiphany-2.20.2/embed/mozilla/GeckoPrintService.cpp	2007-12-04 12:16:03.000000000 +0100
>@@ -665,7 +665,11 @@ GeckoPrintService::TranslateSettings (Gt
>   aSettings->SetPrintInColor (gtk_print_settings_get_use_color (aGtkSettings));
> 
>   aSettings->SetPaperSizeUnit(nsIPrintSettings::kPaperSizeMillimeters);
>-  aSettings->SetPaperSize (nsIPrintSettings::kPaperSizeDefined);
>+#ifdef HAVE_GECKO_1_9
>+  aSettings->SetPaperSizeType(nsIPrintSettings::kPaperSizeDefined);
>+#else
>+  aSettings->SetPaperSize(nsIPrintSettings::kPaperSizeDefined);
>+#endif
> 
>   GtkPaperSize *paperSize = gtk_page_setup_get_paper_size (aPageSetup);
>   if (!paperSize) {
>diff -up epiphany-2.20.2/embed/mozilla/GtkNSSDialogs.cpp.xl epiphany-2.20.2/embed/mozilla/GtkNSSDialogs.cpp
>--- epiphany-2.20.2/embed/mozilla/GtkNSSDialogs.cpp.xl	2007-11-27 00:36:42.000000000 +0100
>+++ epiphany-2.20.2/embed/mozilla/GtkNSSDialogs.cpp	2007-12-04 12:16:03.000000000 +0100
>@@ -112,7 +112,7 @@ GtkNSSDialogs::~GtkNSSDialogs ()
> 
> NS_IMPL_THREADSAFE_ISUPPORTS5 (GtkNSSDialogs, 
> 			       nsICertificateDialogs,
>-			       nsIBadCertListener,
>+			       nsIBadCertListener2,
> 			       nsITokenPasswordDialogs,
> 			       nsITokenDialogs,
> 			       nsIDOMCryptoDialogs)
>@@ -384,7 +384,7 @@ GtkNSSDialogs::GetTokenAndSlotFromName (
> }
>   
> /* nsICertificateDialogs */
>-
>+/*
> NS_IMETHODIMP
> GtkNSSDialogs::ConfirmMismatchDomain (nsIInterfaceRequestor *ctx,
>                                       const nsACString &targetURL,
>@@ -423,8 +423,9 @@ GtkNSSDialogs::ConfirmMismatchDomain (ns
> 	*_retval = (res == GTK_RESPONSE_ACCEPT);
> 	return NS_OK;
> }
>+*/
> 
>-
>+/*
> NS_IMETHODIMP
> GtkNSSDialogs::ConfirmUnknownIssuer (nsIInterfaceRequestor *ctx,
>                                      nsIX509Cert *cert, PRInt16 *outAddType,
>@@ -482,10 +483,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)
>@@ -516,7 +518,7 @@ GtkNSSDialogs::ConfirmCertExpired (nsIIn
> 	if (LL_CMP(now, >, notAfter))
> 	{
> 		primary = _("Accept expired security information?");
>-		/* Translators: first %s is a hostname, second %s is a time/date */
>+		// Translators: first %s is a hostname, second %s is a time/date
> 		text    = _("The security information for â%sâ "
> 			    "expired on %s.");
> 		timeToUse = notAfter;
>@@ -524,7 +526,7 @@ GtkNSSDialogs::ConfirmCertExpired (nsIIn
> 	else
> 	{
> 		primary = _("Accept not yet valid security information?");
>-		/* Translators: first %s is a hostname, second %s is a time/date */
>+		// Translators: first %s is a hostname, second %s is a time/date
> 		text    = _("The security information for â%sâ isn't valid until %s.");
> 		timeToUse = notBefore;
> 	}
>@@ -536,12 +538,12 @@ 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));
>-	/* FIXME! this isn't actually correct, LC_CTIME codeset could be different than locale codeset! */
>+	// FIXME! this isn't actually correct, LC_CTIME codeset could be different than locale codeset!
> 	fdate = g_locale_to_utf8 (formattedDate, -1, NULL, NULL, NULL);
> 
> 	secondary = g_markup_printf_escaped (text, cCommonName.get(), fdate);
>@@ -560,10 +562,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,
>@@ -599,6 +602,7 @@ GtkNSSDialogs::NotifyCrlNextupdate (nsII
> 	gtk_widget_show_all (dialog);
> 	return NS_OK;
> }
>+*/
> 
> NS_IMETHODIMP 
> GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx, 
>@@ -1691,3 +1695,9 @@ GtkNSSDialogs::ConfirmKeyEscrow (nsIX509
> 
>   return NS_OK;
> }
>+
>+NS_IMETHODIMP
>+GtkNSSDialogs::NotifyCertProblem(nsIInterfaceRequestor *socketInfo, nsISSLStatus *status, const nsACString & targetSite, PRBool *_retval)
>+{
>+    return NS_ERROR_FAILURE;
>+}
>\ No newline at end of file
>diff -up epiphany-2.20.2/embed/mozilla/GtkNSSDialogs.h.xl epiphany-2.20.2/embed/mozilla/GtkNSSDialogs.h
>--- epiphany-2.20.2/embed/mozilla/GtkNSSDialogs.h.xl	2007-11-27 00:36:42.000000000 +0100
>+++ epiphany-2.20.2/embed/mozilla/GtkNSSDialogs.h	2007-12-04 12:16:03.000000000 +0100
>@@ -22,7 +22,7 @@
> #ifndef GTKNSSDIALOGS_H
> #define GTKNSSDIALOGS_H 1
> 
>-#include <nsIBadCertListener.h>
>+#include <nsIBadCertListener2.h>
> #include <nsICertificateDialogs.h>
> #include <nsITokenPasswordDialogs.h>
> #include <nsITokenDialogs.h>
>@@ -37,7 +37,7 @@ class nsIPKCS11Slot;
> 
> #define GTK_NSSDIALOGS_CLASSNAME  "Gtk NSS Dialogs"
> 
>-class GtkNSSDialogs : public nsIBadCertListener,
>+class GtkNSSDialogs : public nsIBadCertListener2,
> 		      public nsICertificateDialogs,
> 		      public nsITokenPasswordDialogs,
> 		      public nsITokenDialogs,
>@@ -45,7 +45,7 @@ class GtkNSSDialogs : public nsIBadCertL
> {
>   public:
>     NS_DECL_ISUPPORTS
>-    NS_DECL_NSIBADCERTLISTENER
>+    NS_DECL_NSIBADCERTLISTENER2
>     NS_DECL_NSICERTIFICATEDIALOGS
>     NS_DECL_NSITOKENPASSWORDDIALOGS
>     NS_DECL_NSITOKENDIALOGS
>diff -up epiphany-2.20.2/embed/mozilla/EphyDirectoryProvider.cpp.xl epiphany-2.20.2/embed/mozilla/EphyDirectoryProvider.cpp
>--- epiphany-2.20.2/embed/mozilla/EphyDirectoryProvider.cpp.xl	2007-11-27 00:36:42.000000000 +0100
>+++ epiphany-2.20.2/embed/mozilla/EphyDirectoryProvider.cpp	2007-12-04 12:16:03.000000000 +0100
>@@ -87,7 +87,9 @@ EphyDirectoryProvider::GetFiles (const c
> 		rv = dirServ->Get (NS_APP_CHROME_DIR, NS_GET_IID (nsIFile),
> 				   getter_AddRefs (chromeDir));
> 		NS_ENSURE_SUCCESS (rv, rv);
>-
>+	
>+		return NS_ERROR_FAILURE;
>+/*
> 		nsCOMPtr<nsISupportsArray> array;
> 		rv = NS_NewISupportsArray (getter_AddRefs (array));
> 		NS_ENSURE_SUCCESS (rv, rv);
>@@ -100,6 +102,7 @@ EphyDirectoryProvider::GetFiles (const c
> 		NS_ENSURE_SUCCESS (rv, rv);
> 
> 		rv = NS_SUCCESS_AGGREGATE_RESULT;
>+*/
> 	}
> 
> 	return rv;
>diff -up epiphany-2.20.2/embed/mozilla/MozDownload.cpp.xl epiphany-2.20.2/embed/mozilla/MozDownload.cpp
>--- epiphany-2.20.2/embed/mozilla/MozDownload.cpp.xl	2007-11-27 00:36:42.000000000 +0100
>+++ epiphany-2.20.2/embed/mozilla/MozDownload.cpp	2007-12-04 12:16:03.000000000 +0100
>@@ -505,7 +505,7 @@ MozDownload::OnSecurityChange (nsIWebPro
> NS_IMETHODIMP
> MozDownload::GetInterface(const nsIID & uuid, void * *result)
> {
>-	if (uuid.Equals (NS_GET_IID (nsIBadCertListener)) &&
>+	if (uuid.Equals (NS_GET_IID (nsIBadCertListener2)) &&
> 	    mEmbedPersist)
> 	{
> 		EphyEmbedPersistFlags flags;
>@@ -514,7 +514,7 @@ MozDownload::GetInterface(const nsIID & 
> 
> 		if (flags & EPHY_EMBED_PERSIST_NO_CERTDIALOGS)
> 		{
>-			nsIBadCertListener *badCertRejector = new EphyBadCertRejector ();
>+			nsIBadCertListener2 *badCertRejector = new EphyBadCertRejector ();
> 			if (!badCertRejector) return NS_ERROR_OUT_OF_MEMORY;
> 
> 			*result = badCertRejector;
>diff -up epiphany-2.20.2/embed/mozilla/EphyAboutModule.cpp.xl epiphany-2.20.2/embed/mozilla/EphyAboutModule.cpp
>--- epiphany-2.20.2/embed/mozilla/EphyAboutModule.cpp.xl	2007-11-27 00:36:42.000000000 +0100
>+++ epiphany-2.20.2/embed/mozilla/EphyAboutModule.cpp	2007-12-04 12:24:00.000000000 +0100
>@@ -30,12 +30,13 @@
> #include <gtk/gtk.h>
> 
> // we need nsEscape which depends on internal strings :(((
>-#define MOZILLA_INTERNAL_API 1
>-#include <nsString.h>
>+//#define MOZILLA_INTERNAL_API 1
>+//#include <nsString.h>
> 
> #include <nsAutoPtr.h>
> #include <nsCOMPtr.h>
>-#include <nsEscape.h>
>+//#include <nsEscape.h>
>+#include <nsStringAPI.h>
> #include <nsIChannel.h>
> #include <nsIInputStreamChannel.h>
> #include <nsIInputStream.h>
>@@ -167,18 +168,18 @@ EphyAboutModule::ParseURL(const char *aU
> 		switch (param[0])
> 		{
> 			case 'e':
>-				aCode.Assign (nsUnescape (param + 2));
>+				aCode.Assign ((param + 2));
> 				break;
> 			case 'u':
> 				aRawOriginURL.Assign (param + 2);
>-				aOriginURL.Assign (nsUnescape (param + 2));
>+				aOriginURL.Assign ((param + 2));
> 				break;
> 			case 'c':
>-				aOriginCharset.Assign (nsUnescape (param + 2));
>+				aOriginCharset.Assign ((param + 2));
> 				break;
> 			/* The next one is not used in neterror but recover: */
> 			case 't':
>-				aTitle.Assign (nsUnescape (param + 2));
>+				aTitle.Assign ((param + 2));
> 				break;
> 			case 'd':
> 				/* we don't need mozilla's description parameter */
>@@ -568,149 +569,6 @@ EphyAboutModule::WritePage(nsIURI *aOrig
> 			   nsIChannel **_retval)
> {
> 	*_retval = nsnull;
>-
>-	nsresult rv;
>-	nsCOMPtr<nsIStorageStream> storageStream;
>-	rv = NS_NewStorageStream (16384, (PRUint32) -1, getter_AddRefs (storageStream));
>-	NS_ENSURE_SUCCESS (rv, rv);
>-
>-	nsCOMPtr<nsIOutputStream> stream;
>-	rv = storageStream->GetOutputStream (0, getter_AddRefs (stream));
>-	NS_ENSURE_SUCCESS (rv, rv);
>-
>-	char *language = g_strdup (pango_language_to_string (gtk_get_default_language ()));
>-	g_strdelimit (language, "_-@", '\0');
>-
>-	Write (stream,
>-	       "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
>-	       "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" "
>-	       "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"
>-	       "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"");
>-	Write (stream, language);
>-	Write (stream,
>-	       "\" xml:lang=\"");
>-	Write (stream, language);
>-	Write (stream,
>-	       "\">\n"
>-	       "<head>\n"
>-		"<title>");
>-	Write (stream, aTitle);
>-	/* no favicon for now, it would pollute the favicon cache */
>-	/* "<link rel=\"icon\" type=\"image/png\" href=\"moz-icon://stock/gtk-dialog-error?size=16\" />\n" */
>-	Write (stream,
>-		"</title>\n"
>-		"<style type=\"text/css\">\n"
>-		"div#body {\n"
>-			"top: 12px;\n"
>-			"right: 12px;\n"
>-			"bottom: 12px;\n"
>-			"left: 12px;\n"
>-			"overflow: auto;\n"
>-
>-			"background: -moz-dialog url('moz-icon://stock/");
>-	Write (stream, aStockIcon);
>-	Write (stream,
>-			"?size=dialog') no-repeat 12px 12px;\n"
>-			"color: -moz-dialogtext;\n"
>-			"font: message-box;\n"
>-			"border: 1px solid -moz-dialogtext;\n"
>-
>-			"padding: 12px 12px 12px 72px;\n"
>-		"}\n"
>-
>-		"h1 {\n"
>-			"margin: 0;\n"
>-			"font-size: 1.2em;\n"
>-		"}\n"
>-		"</style>\n"
>-	       "</head>\n"
>-	       "<body dir=\"");
>-	Write (stream,
>-	       gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL ? "rtl" : "ltr");
>-	Write (stream,
>-	       "\">\n"
>-		"<div id=\"body\">"
>-		"<h1>");
>-	Write (stream, aPrimary);
>-	Write (stream,
>-	       "</h1>\n");
>-	if (aSecondary)
>-	{
>-		Write (stream, "<p>");
>-		Write (stream, aSecondary);
>-		if (aTertiary)
>-		{
>-			Write (stream, " ");
>-			Write (stream, aTertiary);
>-		}
>-		Write (stream, "</p>\n");
>-	}
>-
>-	PRBool isHttp = PR_FALSE, isHttps = PR_FALSE;
>-	aURI->SchemeIs ("http", &isHttp);
>-	aURI->SchemeIs ("https", &isHttps);
>-	if (aLinkIntro && (isHttp || isHttps))
>-	{
>-		nsCString raw(aRawURL);
>-
>-		Write (stream, "<p>");
>-		Write (stream, aLinkIntro);
>-		Write (stream, "<ul>\n");
>-		Write (stream, "<li><a href=\"http://www.google.com/search?q=cache:");
>-		Write (stream, raw.get());
>-		Write (stream, "\">");
>-		/* Translators: The text before the "|" is context to help you decide on
>-		 * the correct translation. You MUST OMIT it in the translated string. */
>-		Write (stream, Q_("You may find an old version:|in the Google Cache"));
>-		Write (stream, "</a></li>\n");
>-
>-		Write (stream, "<li><a href=\"http://web.archive.org/web/*/");
>-		Write (stream, raw.get());
>-		Write (stream, "\">");
>-		/* Translators: The text before the "|" is context to help you decide on
>-		 * the correct translation. You MUST OMIT it in the translated string. */
>-		Write (stream, Q_("You may find an old version:|in the Internet Archive"));
>-		Write (stream, "</a></li>\n"
>-			       "</ul>\n"
>-			       "</p>");
>-	}
>-
>-	Write (stream,
>-		"</div>\n"
>-	       "</body>\n"
>-	       "</html>\n");
>-
>-	g_free (language);
>- 
>-	/* finish the rendering */
>-	nsCOMPtr<nsIInputStream> inputStream;
>-	rv = storageStream->NewInputStream (0, getter_AddRefs (inputStream));
>-	NS_ENSURE_SUCCESS (rv, rv);
>-
>-	nsCOMPtr<nsIChannel> channel;
>-	rv = NS_NewInputStreamChannel (getter_AddRefs (channel),
>-				       aChannelURI,
>-				       inputStream,
>-				       NS_LITERAL_CSTRING ("application/xhtml+xml"),
>-				       NS_LITERAL_CSTRING ("utf-8"));
>-	NS_ENSURE_SUCCESS (rv, rv);
>-	
>-	rv = channel->SetOriginalURI (aOriginalURI);
>-	NS_ENSURE_SUCCESS (rv, rv);
>-
>-	nsCOMPtr<nsIScriptSecurityManager> securityManager 
>-		(do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv));
>-	NS_ENSURE_SUCCESS (rv, rv);
>-
>-	nsCOMPtr<nsIPrincipal> principal;
>-	rv = securityManager->GetCodebasePrincipal (aOriginalURI, getter_AddRefs (principal));
>-	NS_ENSURE_SUCCESS (rv, rv);
>-
>-	rv = channel->SetOwner(principal);
>-	NS_ENSURE_SUCCESS (rv, rv);
>-
>-	channel.swap (*_retval);
>-
> 	return NS_OK;
> }
> 
>diff -up epiphany-2.20.2/embed/mozilla/MozRegisterComponents.cpp.xl epiphany-2.20.2/embed/mozilla/MozRegisterComponents.cpp
>--- epiphany-2.20.2/embed/mozilla/MozRegisterComponents.cpp.xl	2007-11-27 00:36:42.000000000 +0100
>+++ epiphany-2.20.2/embed/mozilla/MozRegisterComponents.cpp	2007-12-04 12:16:03.000000000 +0100
>@@ -137,12 +137,14 @@ static const nsModuleComponentInfo sAppC
> 		NS_CLIENTAUTHDIALOGS_CONTRACTID,
> 		GtkNSSClientAuthDialogsConstructor
> 	},
>+/*
> 	{
> 		GTK_NSSDIALOGS_CLASSNAME,
> 		GTK_NSSDIALOGS_CID,
> 		NS_BADCERTLISTENER_CONTRACTID,
> 		GtkNSSDialogsConstructor
> 	},
>+*/
> 	{
> 		GTK_NSSDIALOGS_CLASSNAME,
> 		GTK_NSSDIALOGS_CID,
>diff -up epiphany-2.20.2/embed/mozilla/EphyBadCertRejector.cpp.xl epiphany-2.20.2/embed/mozilla/EphyBadCertRejector.cpp
>--- epiphany-2.20.2/embed/mozilla/EphyBadCertRejector.cpp.xl	2007-11-27 00:36:42.000000000 +0100
>+++ epiphany-2.20.2/embed/mozilla/EphyBadCertRejector.cpp	2007-12-04 12:16:03.000000000 +0100
>@@ -23,21 +23,24 @@
> 
> #include "EphyBadCertRejector.h"
> 
>-NS_IMPL_THREADSAFE_ISUPPORTS1 (EphyBadCertRejector, nsIBadCertListener)
>+NS_IMPL_THREADSAFE_ISUPPORTS1 (EphyBadCertRejector, nsIBadCertListener2)
> 
> /* boolean confirmUnknownIssuer (in nsIInterfaceRequestor socketInfo, in nsIX509Cert cert, out short certAddType); */
>+/*
> NS_IMETHODIMP
> EphyBadCertRejector::ConfirmUnknownIssuer(nsIInterfaceRequestor *socketInfo,
> 					  nsIX509Cert *cert,
> 					  PRInt16 *certAddType,
> 					  PRBool *_retval)
> {
>-	*certAddType = nsIBadCertListener::UNINIT_ADD_FLAG;
>+	*certAddType = nsIBadCertListener2::UNINIT_ADD_FLAG;
> 	*_retval = PR_FALSE;
> 	return NS_OK;
> }
>+*/
> 
> /* boolean confirmMismatchDomain (in nsIInterfaceRequestor socketInfo, in AUTF8String targetURL, in nsIX509Cert cert); */
>+/*
> NS_IMETHODIMP
> EphyBadCertRejector::ConfirmMismatchDomain(nsIInterfaceRequestor *socketInfo,
> 					   const nsACString & targetURL,
>@@ -47,8 +50,10 @@ EphyBadCertRejector::ConfirmMismatchDoma
> 	*_retval = PR_FALSE;
> 	return NS_OK;
> }
>+*/
> 
> /* boolean confirmCertExpired (in nsIInterfaceRequestor socketInfo, in nsIX509Cert cert); */
>+/*
> NS_IMETHODIMP
> EphyBadCertRejector::ConfirmCertExpired(nsIInterfaceRequestor *socketInfo,
> 					nsIX509Cert *cert,
>@@ -57,8 +62,10 @@ EphyBadCertRejector::ConfirmCertExpired(
> 	*_retval = PR_FALSE;
> 	return NS_OK;
> }
>+*/
> 
> /* void notifyCrlNextupdate (in nsIInterfaceRequestor socketInfo, in AUTF8String targetURL, in nsIX509Cert cert); */
>+/*
> NS_IMETHODIMP
> EphyBadCertRejector::NotifyCrlNextupdate(nsIInterfaceRequestor *socketInfo,
> 					 const nsACString & targetURL,
>@@ -66,3 +73,11 @@ EphyBadCertRejector::NotifyCrlNextupdate
> {
> 	return NS_OK;
> }
>+*/
>+
>+NS_IMETHODIMP
>+EphyBadCertRejector::NotifyCertProblem(nsIInterfaceRequestor *socketInfo, nsISSLStatus *status, const nsACString & targetSite, PRBool *_retval)
>+{
>+	*_retval = PR_FALSE;
>+	return NS_OK;
>+}
>diff -up epiphany-2.20.2/embed/mozilla/EphyHeaderSniffer.cpp.xl epiphany-2.20.2/embed/mozilla/EphyHeaderSniffer.cpp
>--- epiphany-2.20.2/embed/mozilla/EphyHeaderSniffer.cpp.xl	2007-11-27 00:36:42.000000000 +0100
>+++ epiphany-2.20.2/embed/mozilla/EphyHeaderSniffer.cpp	2007-12-04 12:16:03.000000000 +0100
>@@ -51,7 +51,7 @@
> #include <nsIChannel.h>
> #include <nsIDOMDocument.h>
> #include <nsIDOMHTMLDocument.h>
>-#include <nsIDownload.h>
>+//#include <nsIDownload.h>
> #include <nsIHttpChannel.h>
> #include <nsIInputStream.h>
> #include <nsILocalFile.h>
>@@ -223,7 +223,7 @@ EphyHeaderSniffer::OnSecurityChange (nsI
> NS_IMETHODIMP
> EphyHeaderSniffer::GetInterface(const nsIID & uuid, void * *result)
> {
>-	if (uuid.Equals (NS_GET_IID (nsIBadCertListener)) &&
>+	if (uuid.Equals (NS_GET_IID (nsIBadCertListener2)) &&
> 	    mEmbedPersist)
> 	{
> 		EphyEmbedPersistFlags flags;
>@@ -235,7 +235,7 @@ EphyHeaderSniffer::GetInterface(const ns
> 			EphyBadCertRejector *badCertRejector = new EphyBadCertRejector ();
> 			if (!badCertRejector) return NS_ERROR_OUT_OF_MEMORY;
> 
>-			*result = static_cast<nsIBadCertListener*>(badCertRejector);
>+			*result = static_cast<nsIBadCertListener2*>(badCertRejector);
> 			NS_ADDREF (badCertRejector);
> 
> 			return NS_OK;
>diff -up epiphany-2.20.2/embed/mozilla/EphyBadCertRejector.h.xl epiphany-2.20.2/embed/mozilla/EphyBadCertRejector.h
>--- epiphany-2.20.2/embed/mozilla/EphyBadCertRejector.h.xl	2007-11-27 00:36:42.000000000 +0100
>+++ epiphany-2.20.2/embed/mozilla/EphyBadCertRejector.h	2007-12-04 12:16:03.000000000 +0100
>@@ -21,13 +21,13 @@
> #ifndef EPHY_BAD_CERT_REJECTOR_H
> #define EPHY_BAD_CERT_REJECTOR_H
> 
>-#include <nsIBadCertListener.h>
>+#include <nsIBadCertListener2.h>
> 
>-class EphyBadCertRejector : public nsIBadCertListener
>+class EphyBadCertRejector : public nsIBadCertListener2
> {
> 	public:
> 		NS_DECL_ISUPPORTS
>-		NS_DECL_NSIBADCERTLISTENER
>+		NS_DECL_NSIBADCERTLISTENER2
> 
> 		EphyBadCertRejector () {  }
> 		~EphyBadCertRejector () {  }

Actions: View | Diff

Attachments on bug 356731: 241961 | 276851