rpms/galeon/devel galeon-2.0.3-xulrunner.patch, 1.1, 1.2 galeon.spec, 1.44, 1.45
Denis Leroy (denis)
fedora-extras-commits at redhat.com
Mon Jan 7 12:52:07 UTC 2008
Author: denis
Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25353
Modified Files:
galeon-2.0.3-xulrunner.patch galeon.spec
Log Message:
Updated xul-runner patch to fix compile/crash issues
galeon-2.0.3-xulrunner.patch:
Index: galeon-2.0.3-xulrunner.patch
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon-2.0.3-xulrunner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- galeon-2.0.3-xulrunner.patch 14 Dec 2007 00:49:02 -0000 1.1
+++ galeon-2.0.3-xulrunner.patch 7 Jan 2008 12:51:55 -0000 1.2
@@ -1,6 +1,6 @@
-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
+diff -ur galeon-2.0.4.orig/mozilla/FilePicker.cpp galeon-2.0.4/mozilla/FilePicker.cpp
+--- galeon-2.0.4.orig/mozilla/FilePicker.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/FilePicker.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -27,14 +27,12 @@
#include <nsCOMPtr.h>
@@ -17,9 +17,9 @@
#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
+diff -ur galeon-2.0.4.orig/mozilla/mozilla-embed-persist.cpp galeon-2.0.4/mozilla/mozilla-embed-persist.cpp
+--- galeon-2.0.4.orig/mozilla/mozilla-embed-persist.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/mozilla-embed-persist.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -21,9 +21,6 @@
#endif
@@ -38,21 +38,9 @@
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
+diff -ur galeon-2.0.4.orig/mozilla/GtkNSSSecurityWarningDialogs.cpp galeon-2.0.4/mozilla/GtkNSSSecurityWarningDialogs.cpp
+--- galeon-2.0.4.orig/mozilla/GtkNSSSecurityWarningDialogs.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/GtkNSSSecurityWarningDialogs.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -51,9 +51,7 @@
#include <nsCOMPtr.h>
#include <nsIPrefBranch.h>
@@ -64,9 +52,9 @@
#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
+diff -ur galeon-2.0.4.orig/mozilla/EventContext.cpp galeon-2.0.4/mozilla/EventContext.cpp
+--- galeon-2.0.4.orig/mozilla/EventContext.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/EventContext.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -20,9 +20,6 @@
#endif
@@ -85,9 +73,9 @@
#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
+diff -ur galeon-2.0.4.orig/mozilla/GtkNSSDialogs.cpp galeon-2.0.4/mozilla/GtkNSSDialogs.cpp
+--- galeon-2.0.4.orig/mozilla/GtkNSSDialogs.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/GtkNSSDialogs.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -35,9 +35,6 @@
#include <nsCOMPtr.h>
@@ -107,7 +95,7 @@
#include <gconf/gconf-client.h>
#include <gtk/gtkdialog.h>
#include <gtk/gtkstock.h>
-@@ -104,7 +103,7 @@ GtkNSSDialogs::~GtkNSSDialogs ()
+@@ -104,7 +103,7 @@
NS_IMPL_ISUPPORTS2 (GtkNSSDialogs,
nsICertificateDialogs,
@@ -116,7 +104,7 @@
/**
* Call the mozilla service to display a certificate
-@@ -287,7 +286,7 @@ display_cert_warning_box (nsIInterfaceRe
+@@ -287,7 +286,7 @@
return res;
}
@@ -125,7 +113,7 @@
NS_IMETHODIMP
GtkNSSDialogs::ConfirmMismatchDomain (nsIInterfaceRequestor *ctx,
const nsACString &targetURL,
-@@ -333,8 +332,8 @@ GtkNSSDialogs::ConfirmMismatchDomain (ns
+@@ -333,8 +332,8 @@
*_retval = (res == GTK_RESPONSE_ACCEPT);
return NS_OK;
}
@@ -136,7 +124,7 @@
NS_IMETHODIMP
GtkNSSDialogs::ConfirmUnknownIssuer (nsIInterfaceRequestor *ctx,
nsIX509Cert *cert, PRInt16 *outAddType,
-@@ -397,10 +396,11 @@ GtkNSSDialogs::ConfirmUnknownIssuer (nsI
+@@ -397,10 +396,11 @@
return NS_OK;
}
@@ -149,7 +137,7 @@
NS_IMETHODIMP
GtkNSSDialogs::ConfirmCertExpired (nsIInterfaceRequestor *ctx,
nsIX509Cert *cert, PRBool *_retval)
-@@ -451,9 +451,9 @@ GtkNSSDialogs::ConfirmCertExpired (nsIIn
+@@ -451,9 +451,9 @@
LL_DIV (normalizedTime, timeToUse, PR_USEC_PER_SEC);
LL_L2UI (t, normalizedTime);
@@ -162,7 +150,7 @@
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
+@@ -477,9 +477,11 @@
return NS_OK;
}
@@ -174,7 +162,7 @@
NS_IMETHODIMP
GtkNSSDialogs::NotifyCrlNextupdate (nsIInterfaceRequestor *ctx,
const nsACString & targetURL, nsIX509Cert *cert)
-@@ -539,6 +541,7 @@ GtkNSSDialogs::NotifyCrlNextupdate (nsII
+@@ -539,6 +541,7 @@
gtk_widget_show_all (dialog);
return NS_OK;
}
@@ -182,7 +170,7 @@
NS_IMETHODIMP
GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx,
-@@ -679,6 +682,12 @@ GtkNSSDialogs::NotifyCACertExists (nsIIn
+@@ -679,6 +682,12 @@
return NS_OK;
}
@@ -195,9 +183,9 @@
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
+diff -ur galeon-2.0.4.orig/mozilla/JSConsoleService.cpp galeon-2.0.4/mozilla/JSConsoleService.cpp
+--- galeon-2.0.4.orig/mozilla/JSConsoleService.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/JSConsoleService.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -18,7 +18,7 @@
#include "JSConsoleService.h"
@@ -207,14 +195,14 @@
NS_IMPL_ISUPPORTS1(JSConsoleService, nsIJSConsoleService)
JSConsoleService::JSConsoleService()
-@@ -43,3 +43,4 @@ JSConsoleService::Open (nsIDOMWindow *in
+@@ -43,3 +43,4 @@
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
+diff -ur galeon-2.0.4.orig/mozilla/MyportalProtocolHandler.cpp galeon-2.0.4/mozilla/MyportalProtocolHandler.cpp
+--- galeon-2.0.4.orig/mozilla/MyportalProtocolHandler.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/MyportalProtocolHandler.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -23,9 +23,7 @@
#endif
@@ -235,7 +223,7 @@
#include <nsNetCID.h>
#include <libgnomevfs/gnome-vfs-utils.h>
-@@ -413,12 +409,14 @@ GMyportalProtocolHandler::CreateMyportal
+@@ -413,12 +409,14 @@
{
nsresult rv;
@@ -251,7 +239,7 @@
nsCOMPtr<nsIStorageStream> sStream;
rv = NS_NewStorageStream(16384, (PRUint32)-1, getter_AddRefs(sStream));
-@@ -427,7 +425,7 @@ GMyportalProtocolHandler::CreateMyportal
+@@ -427,7 +425,7 @@
rv = sStream->GetOutputStream(0, getter_AddRefs(mStream));
NS_ENSURE_SUCCESS (rv, rv);
@@ -260,7 +248,7 @@
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
+@@ -443,12 +441,12 @@
Write ("<title>");
gchar *tmp = gnome_vfs_unescape_string (path, "");
@@ -276,7 +264,7 @@
gchar *str = g_strdup_printf (_("My Portal: %s"), q);
WriteHTMLEscape (str);
g_free (str);
-@@ -473,7 +471,7 @@ GMyportalProtocolHandler::CreateMyportal
+@@ -473,7 +471,7 @@
mStream = nsnull;
@@ -285,7 +273,7 @@
nsCOMPtr<nsIInputStream> iStream;
rv = sStream->NewInputStream(0, getter_AddRefs(iStream));
NS_ENSURE_SUCCESS (rv, rv);
-@@ -494,6 +492,7 @@ GMyportalProtocolHandler::CreateMyportal
+@@ -494,6 +492,7 @@
NS_ADDREF(*result = channel);
return rv;
@@ -293,9 +281,9 @@
}
////////////////////////////////////////////////////////////////////////////////
-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
+diff -ur galeon-2.0.4.orig/mozilla/ExternalProtocolService.cpp galeon-2.0.4/mozilla/ExternalProtocolService.cpp
+--- galeon-2.0.4.orig/mozilla/ExternalProtocolService.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/ExternalProtocolService.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -19,14 +19,15 @@
#include "config.h"
#endif
@@ -315,7 +303,7 @@
#include <nsMemory.h>
#include "AutoJSContextStack.h"
-@@ -100,18 +101,6 @@ NS_IMETHODIMP GExternalProtocolService::
+@@ -100,18 +101,6 @@
return NS_OK;
}
@@ -334,7 +322,7 @@
/* void loadUrl (in nsIURI aURL); */
NS_IMETHODIMP GExternalProtocolService::LoadUrl(nsIURI *aURL)
{
-@@ -193,6 +182,16 @@ NS_IMETHODIMP GExternalProtocolService::
+@@ -193,6 +182,16 @@
return NS_ERROR_FAILURE;
}
@@ -351,9 +339,9 @@
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
+diff -ur galeon-2.0.4.orig/mozilla/ContentHandler.cpp galeon-2.0.4/mozilla/ContentHandler.cpp
+--- galeon-2.0.4.orig/mozilla/ContentHandler.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/ContentHandler.cpp 2007-12-20 20:51:43.000000000 +0100
@@ -159,9 +159,7 @@
#include <nsIPromptService.h>
#include <nsIWebProgressListener.h>
@@ -365,7 +353,7 @@
#include <nsIInterfaceRequestorUtils.h>
#include <nsIURI.h>
#include <nsIURL.h>
-@@ -500,13 +498,14 @@ NS_METHOD GContentHandler::SynchroniseMI
+@@ -500,13 +498,14 @@
* 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);
@@ -381,7 +369,7 @@
g_free (info);
if(NS_FAILED(rv)) return NS_ERROR_FAILURE;
-@@ -957,6 +956,13 @@ NS_IMETHODIMP MiniProgressListener::OnSe
+@@ -957,6 +956,13 @@
return NS_ERROR_NOT_IMPLEMENTED;
}
@@ -395,9 +383,24 @@
#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
+@@ -966,14 +972,6 @@
+ return NS_ERROR_NOT_IMPLEMENTED;
+ }
+
+-#ifdef HAVE_NSIWEBPROGRESSLISTENER2_ONREFRESHATTEMPTED
+-NS_IMETHODIMP MiniProgressListener::OnRefreshAttempted(nsIWebProgress *aWebProgress,
+- nsIURI *aRefreshURI, PRInt32 aMillis,
+- PRBool aSameURI, PRBool *_retval)
+-{
+- return NS_ERROR_NOT_IMPLEMENTED;
+-}
+-#endif
+
+ #endif
+
+diff -ur galeon-2.0.4.orig/mozilla/GtkNSSDialogs.h galeon-2.0.4/mozilla/GtkNSSDialogs.h
+--- galeon-2.0.4.orig/mozilla/GtkNSSDialogs.h 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/GtkNSSDialogs.h 2007-12-20 20:45:13.000000000 +0100
@@ -9,7 +9,7 @@
#define GTKNSSDIALOGS_H 1
@@ -422,9 +425,9 @@
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
+diff -ur galeon-2.0.4.orig/mozilla/HeaderSniffer.cpp galeon-2.0.4/mozilla/HeaderSniffer.cpp
+--- galeon-2.0.4.orig/mozilla/HeaderSniffer.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/HeaderSniffer.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -55,9 +55,6 @@
#include "prefs-strings.h"
#include "hig-alert.h"
@@ -452,9 +455,9 @@
#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
+diff -ur galeon-2.0.4.orig/mozilla/GaleonUtils.cpp galeon-2.0.4/mozilla/GaleonUtils.cpp
+--- galeon-2.0.4.orig/mozilla/GaleonUtils.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/GaleonUtils.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -20,9 +20,7 @@
#include "config.h"
@@ -466,7 +469,7 @@
#include "GaleonUtils.h"
#include "GulString.h"
-@@ -306,7 +304,7 @@ GaleonUtils::EmbedPrintInfoToPrintSettin
+@@ -306,7 +304,7 @@
}
/* native paper size formats. Our dialog does not support custom yet */
@@ -475,9 +478,9 @@
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
+diff -ur galeon-2.0.4.orig/mozilla/EphyDirectoryProvider.cpp galeon-2.0.4/mozilla/EphyDirectoryProvider.cpp
+--- galeon-2.0.4.orig/mozilla/EphyDirectoryProvider.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/EphyDirectoryProvider.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -34,9 +34,8 @@
#include <nsIDirectoryService.h>
#include <nsISupportsArray.h>
@@ -490,7 +493,7 @@
#ifndef HAVE_NSDEPENDENTSTRING
typedef nsEmbedString nsDependentString;
-@@ -90,17 +89,19 @@ EphyDirectoryProvider::GetFiles (const c
+@@ -90,17 +89,19 @@
NS_ENSURE_SUCCESS (rv, rv);
nsCOMPtr<nsISupportsArray> array;
@@ -515,9 +518,9 @@
}
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
+diff -ur galeon-2.0.4.orig/mozilla/GaleonWrapper.cpp galeon-2.0.4/mozilla/GaleonWrapper.cpp
+--- galeon-2.0.4.orig/mozilla/GaleonWrapper.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/GaleonWrapper.cpp 2007-12-20 20:52:39.000000000 +0100
@@ -21,9 +21,7 @@
#endif
@@ -529,7 +532,7 @@
#include "galeon-embed.h"
#include "galeon-debug.h"
-@@ -1240,7 +1238,7 @@ nsresult GaleonWrapper::GetPagePropertie
+@@ -1240,7 +1238,7 @@
doc->GetLastModified(value);
nsTime last_modified (GulCString(value).get(), PR_TRUE);
LL_DIV (props->modification_time,
@@ -538,27 +541,9 @@
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
+diff -ur galeon-2.0.4.orig/mozilla/AutoJSContextStack.cpp galeon-2.0.4/mozilla/AutoJSContextStack.cpp
+--- galeon-2.0.4.orig/mozilla/AutoJSContextStack.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/AutoJSContextStack.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -20,10 +20,7 @@
#include "config.h"
@@ -571,9 +556,9 @@
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
+diff -ur galeon-2.0.4.orig/mozilla/JSConsoleService.h galeon-2.0.4/mozilla/JSConsoleService.h
+--- galeon-2.0.4.orig/mozilla/JSConsoleService.h 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/JSConsoleService.h 2007-12-20 20:45:13.000000000 +0100
@@ -26,7 +26,7 @@
{ 0x35807600, 0x35bd, 0x11d5, {0xbb, 0x6f, 0xb9, 0xf2, 0xe9, 0xfe, 0xe0, 0x3c}}
#define NS_JSCONSOLESERVICE_CONTRACTID \
@@ -583,7 +568,7 @@
#include <nsIJSConsoleService.h>
class JSConsoleService: public nsIJSConsoleService
-@@ -40,6 +40,6 @@ public:
+@@ -40,6 +40,6 @@
NS_DECL_ISUPPORTS
};
@@ -591,43 +576,10 @@
+*/
#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
+diff -ur galeon-2.0.4.orig/mozilla/MozRegisterComponents.cpp galeon-2.0.4/mozilla/MozRegisterComponents.cpp
+--- galeon-2.0.4.orig/mozilla/MozRegisterComponents.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/MozRegisterComponents.cpp 2007-12-20 20:45:13.000000000 +0100
+@@ -177,12 +177,6 @@
{
GTK_NSSDIALOGS_CLASSNAME,
GTK_NSSDIALOGS_CID,
@@ -652,9 +604,9 @@
/**
* 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
+diff -ur galeon-2.0.4.orig/mozilla/mozilla-embed.cpp galeon-2.0.4/mozilla/mozilla-embed.cpp
+--- galeon-2.0.4.orig/mozilla/mozilla-embed.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/mozilla-embed.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -21,9 +21,6 @@
#endif
@@ -673,7 +625,7 @@
#include <math.h>
-@@ -1810,7 +1808,7 @@ impl_remove_user_stylesheet(GaleonEmbed
+@@ -1810,7 +1808,7 @@
{
if (!sheet) return;
@@ -682,7 +634,7 @@
g_return_if_fail(mess != NULL);
GaleonWrapper *wrapper = MOZILLA_EMBED(embed)->priv->wrapper;
-@@ -1830,7 +1828,7 @@ galeon_embed_stylesheet_new (EmbedStyleS
+@@ -1830,7 +1828,7 @@
void
galeon_embed_stylesheet_free (EmbedStyleSheet *sheet)
{
@@ -691,9 +643,9 @@
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
+diff -ur galeon-2.0.4.orig/mozilla/GaleonFind.cpp galeon-2.0.4/mozilla/GaleonFind.cpp
+--- galeon-2.0.4.orig/mozilla/GaleonFind.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/GaleonFind.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -25,9 +25,8 @@
#include "galeon-debug.h"
@@ -713,18 +665,9 @@
#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
+diff -ur galeon-2.0.4.orig/mozilla/GaleonAboutModule.cpp galeon-2.0.4/mozilla/GaleonAboutModule.cpp
+--- galeon-2.0.4.orig/mozilla/GaleonAboutModule.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/GaleonAboutModule.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -24,8 +24,6 @@
#include "config.h"
@@ -746,7 +689,7 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-@@ -102,6 +101,7 @@ nsresult
+@@ -102,6 +101,7 @@
GaleonAboutModule::Redirect(const nsACString &aURL,
nsIChannel **_retval)
{
@@ -754,7 +697,7 @@
nsresult rv;
nsCOMPtr<nsIIOService> ioService;
rv = GaleonUtils::GetIOService (getter_AddRefs (ioService));
-@@ -130,6 +130,8 @@ GaleonAboutModule::Redirect(const nsACSt
+@@ -130,6 +130,8 @@
NS_ADDREF(*_retval = tempChannel);
return rv;
@@ -763,7 +706,7 @@
}
nsresult
-@@ -158,14 +160,14 @@ GaleonAboutModule::ParseErrorURL(const c
+@@ -158,14 +160,14 @@
switch (param[0])
{
case 'e':
@@ -781,7 +724,7 @@
break;
case 'd':
/* we don't need mozilla's description parameter */
-@@ -390,10 +392,13 @@ GaleonAboutModule::CreateErrorPage(nsIUR
+@@ -390,10 +392,13 @@
NS_ENSURE_TRUE (primary && secondary, NS_ERROR_FAILURE);
/* open the rendering stream */
@@ -796,9 +739,9 @@
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
+diff -ur galeon-2.0.4.orig/mozilla/mozilla-embed-shell.cpp galeon-2.0.4/mozilla/mozilla-embed-shell.cpp
+--- galeon-2.0.4.orig/mozilla/mozilla-embed-shell.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/mozilla-embed-shell.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -21,9 +21,8 @@
#endif
@@ -811,16 +754,7 @@
#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 @@
+@@ -65,7 +64,7 @@
#include <nsICookieManager.h>
#include <nsIPermission.h>
#include <nsIPasswordManager.h>
@@ -829,7 +763,7 @@
#include <nsICookie.h>
#include <nsCPasswordManager.h>
#include <nsIObserverService.h>
-@@ -792,7 +791,7 @@ impl_list_passwords (GaleonEmbedShell *s
+@@ -770,7 +769,7 @@
if (NS_FAILED(result)) return NULL;
GList *passwords = NULL;
@@ -838,7 +772,7 @@
PRBool enumResult;
for (passwordEnumerator->HasMoreElements(&enumResult) ;
enumResult == PR_TRUE ;
-@@ -818,7 +817,7 @@ impl_list_passwords (GaleonEmbedShell *s
+@@ -796,7 +795,7 @@
passwords = g_list_prepend (passwords, p);
}
@@ -847,9 +781,9 @@
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
+diff -ur galeon-2.0.4.orig/mozilla/mozilla-prefs.cpp galeon-2.0.4/mozilla/mozilla-prefs.cpp
+--- galeon-2.0.4.orig/mozilla/mozilla-prefs.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/mozilla-prefs.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -20,10 +20,8 @@
#include <nsCOMPtr.h>
@@ -862,10 +796,10 @@
#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
+diff -ur galeon-2.0.4.orig/mozilla/EphyPromptService.cpp galeon-2.0.4/mozilla/EphyPromptService.cpp
+--- galeon-2.0.4.orig/mozilla/EphyPromptService.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/EphyPromptService.cpp 2007-12-20 20:45:13.000000000 +0100
+@@ -521,7 +521,7 @@
DeletePrompter (gpointer aPromptPtr,
GObject *aZombie)
{
@@ -874,7 +808,7 @@
delete prompt;
}
-@@ -535,7 +535,7 @@ Prompter::Show ()
+@@ -535,7 +535,7 @@
G_CALLBACK (gtk_widget_destroy), NULL);
g_object_weak_ref (G_OBJECT (mDialog),
(GWeakNotify) DeletePrompter,
@@ -883,10 +817,10 @@
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 @@
+diff -ur galeon-2.0.4.orig/mozilla/nsMailtoUrl.cpp galeon-2.0.4/mozilla/nsMailtoUrl.cpp
+--- galeon-2.0.4.orig/mozilla/nsMailtoUrl.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/nsMailtoUrl.cpp 2007-12-20 20:51:18.000000000 +0100
+@@ -34,18 +34,16 @@
*
* ***** END LICENSE BLOCK ***** */
@@ -908,11 +842,8 @@
+#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
+@@ -104,18 +102,18 @@
if (rest)
{
@@ -934,7 +865,7 @@
{
/* DO NOT support attachment= in mailto urls. This poses a security fire hole!!!
case 'A':
-@@ -124,7 +123,7 @@ nsresult nsMailtoUrl::ParseMailtoUrl(cha
+@@ -124,7 +122,7 @@
break;
*/
case 'B':
@@ -943,7 +874,7 @@
{
if (!priv->m_bccPart.IsEmpty())
{
-@@ -134,7 +133,7 @@ nsresult nsMailtoUrl::ParseMailtoUrl(cha
+@@ -134,7 +132,7 @@
else
priv->m_bccPart = value;
}
@@ -952,7 +883,7 @@
{
if (!priv->m_bodyPart.IsEmpty())
{
-@@ -146,7 +145,7 @@ nsresult nsMailtoUrl::ParseMailtoUrl(cha
+@@ -146,7 +144,7 @@
}
break;
case 'C':
@@ -961,7 +892,7 @@
{
if (!priv->m_ccPart.IsEmpty())
{
-@@ -158,43 +157,43 @@ nsresult nsMailtoUrl::ParseMailtoUrl(cha
+@@ -158,43 +156,43 @@
}
break;
case 'F':
@@ -1018,7 +949,7 @@
{
if (!priv->m_toPart.IsEmpty())
{
-@@ -211,7 +210,7 @@ nsresult nsMailtoUrl::ParseMailtoUrl(cha
+@@ -211,7 +209,7 @@
if (eq)
*eq = '='; /* put it back */
@@ -1027,7 +958,7 @@
} // while we still have part of the url to parse...
} // if rest && *rest
-@@ -257,9 +256,9 @@ nsresult nsMailtoUrl::ParseUrl()
+@@ -257,9 +255,9 @@
{
// now parse out the search field...
nsCAutoString searchPart;
@@ -1040,7 +971,7 @@
if (!searchPart.IsEmpty())
{
ParseMailtoUrl(searchPart.BeginWriting());
-@@ -270,7 +269,7 @@ nsresult nsMailtoUrl::ParseUrl()
+@@ -270,7 +268,7 @@
}
else if (!priv->m_toPart.IsEmpty())
{
@@ -1049,9 +980,9 @@
}
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
+diff -ur galeon-2.0.4.orig/mozilla/MozillaPrivate.cpp galeon-2.0.4/mozilla/MozillaPrivate.cpp
+--- galeon-2.0.4.orig/mozilla/MozillaPrivate.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/MozillaPrivate.cpp 2007-12-20 20:54:26.000000000 +0100
@@ -24,22 +24,16 @@
#include "config.h"
#endif
@@ -1076,7 +1007,7 @@
#include <nsISupportsPrimitives.h>
#include <nsIInterfaceRequestorUtils.h>
#include <nsIPrintSettingsService.h>
-@@ -59,14 +53,14 @@ MozillaPrivate::GetPrinterList (gint* de
+@@ -59,14 +53,14 @@
nsresult rv = NS_OK;
*defaultPrinterIndex = -1;
@@ -1093,7 +1024,7 @@
nsXPIDLString defaultPrinter;
rv = pss->GetDefaultPrinterName(getter_Copies(defaultPrinter));
NS_ENSURE_SUCCESS(rv, NULL);
-@@ -74,7 +68,9 @@ MozillaPrivate::GetPrinterList (gint* de
+@@ -74,7 +68,9 @@
nsCOMPtr<nsISimpleEnumerator> printers;
rv = po->AvailablePrinters(getter_AddRefs(printers));
NS_ENSURE_SUCCESS(rv, NULL);
@@ -1104,7 +1035,7 @@
PRBool more = PR_FALSE;
gint index = 0;
-@@ -115,6 +111,7 @@ MozillaPrivate::GetPrinterList (gint* de
+@@ -115,6 +111,7 @@
}
return printerList;
@@ -1112,7 +1043,7 @@
}
-@@ -127,6 +124,8 @@ MozillaPrivate::LoadOverrideStyleSheet (
+@@ -127,6 +124,8 @@
nsCOMPtr<nsIPresShell> presShell;
aDocShell->GetPresShell (getter_AddRefs(presShell));
NS_ENSURE_TRUE (presShell, NS_ERROR_FAILURE);
@@ -1121,7 +1052,7 @@
#ifdef HAVE_NSIPRESSHELL_DECOMTAMINATE
nsIDocument *doc = presShell->GetDocument();
-@@ -136,6 +135,8 @@ MozillaPrivate::LoadOverrideStyleSheet (
+@@ -136,6 +135,8 @@
#endif
NS_ENSURE_TRUE (doc, NS_ERROR_FAILURE);
@@ -1130,7 +1061,7 @@
#ifdef HAVE_NSIDOCUMENT_CSSLOADER
nsICSSLoader *loader = doc->CSSLoader();
#else
-@@ -144,6 +145,7 @@ MozillaPrivate::LoadOverrideStyleSheet (
+@@ -144,6 +145,7 @@
NS_ENSURE_TRUE (loader, NS_ERROR_FAILURE);
/* load sheet */
@@ -1138,7 +1069,7 @@
nsCOMPtr<nsICSSStyleSheet> sheet;
#ifdef HAVE_NSICSSLOADER_LOADSHEETSYNC
rv = loader->LoadSheetSync(aUri, getter_AddRefs(sheet));
-@@ -152,24 +154,24 @@ MozillaPrivate::LoadOverrideStyleSheet (
+@@ -152,24 +154,24 @@
#endif
NS_ENSURE_SUCCESS (rv, rv);
@@ -1171,7 +1102,7 @@
return NS_OK;
}
-@@ -183,7 +185,7 @@ MozillaPrivate::RemoveOverrideStyleSheet
+@@ -183,7 +185,7 @@
/* remove it */
ps->RemoveOverrideStyleSheet (aStyleSheet);
@@ -1180,27 +1111,34 @@
return NS_OK;
}
-@@ -227,6 +229,7 @@ nsresult
+@@ -227,11 +229,11 @@
MozillaPrivate::GetCompatibilityMode (nsIDOMNSDocument *aDoc,
EmbedPageRenderMode *aMode)
{
-+/*
- nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface (aDoc);
+-#ifdef HAVE_NSIDOCUMENT_GETCOMPATIBILITYMODE
++ // #ifdef HAVE_NSIDOCUMENT_GETCOMPATIBILITYMODE
+ nsCOMPtr<nsIDocument> htmlDoc = do_QueryInterface (aDoc);
+-#else
+- nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface (aDoc);
+-#endif
++ //#else
++ // nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface (aDoc);
++ //#endif
NS_ENSURE_TRUE(htmlDoc, NS_ERROR_FAILURE);
-@@ -243,7 +246,7 @@ MozillaPrivate::GetCompatibilityMode (ns
+ nsCompatibility compat = htmlDoc->GetCompatibilityMode();
+@@ -247,7 +249,6 @@
*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
+diff -ur galeon-2.0.4.orig/mozilla/JSConsoleListener.cpp galeon-2.0.4/mozilla/JSConsoleListener.cpp
+--- galeon-2.0.4.orig/mozilla/JSConsoleListener.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/JSConsoleListener.cpp 2007-12-20 20:45:13.000000000 +0100
+@@ -71,7 +71,7 @@
{
type = GALEON_JS_CONSOLE_ERROR;
}
@@ -1209,9 +1147,9 @@
#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
+diff -ur galeon-2.0.4.orig/mozilla/ProgressListener.cpp galeon-2.0.4/mozilla/ProgressListener.cpp
+--- galeon-2.0.4.orig/mozilla/ProgressListener.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/ProgressListener.cpp 2007-12-20 20:55:17.000000000 +0100
@@ -34,9 +34,8 @@
#include <libgnomevfs/gnome-vfs-utils.h>
#include <glib/gi18n.h>
@@ -1224,7 +1162,7 @@
#include <nsIWebBrowserPersist.h>
#include <nsCWebBrowserPersist.h>
#include <nsIFileURL.h>
-@@ -226,7 +225,7 @@ NS_IMETHODIMP GProgressListener::Init(ns
+@@ -226,7 +225,7 @@
tFileUrl->GetFile(getter_AddRefs(tFileRef));
tFileRef->Clone(getter_AddRefs(mFile));
}
@@ -1233,7 +1171,7 @@
if (aMIMEInfo)
{
nsMIMEInfoHandleAction action;
-@@ -237,12 +236,12 @@ NS_IMETHODIMP GProgressListener::Init(ns
+@@ -237,12 +236,12 @@
mMIMEInfo = aMIMEInfo;
}
@@ -1249,7 +1187,25 @@
return PrivateInit();
}
-@@ -718,6 +717,7 @@ NS_METHOD GProgressListener::LaunchHelpe
+@@ -664,17 +663,6 @@
+ return NS_OK;
+ }
+
+-#ifdef HAVE_NSIWEBPROGRESSLISTENER2_ONREFRESHATTEMPTED
+-/* boolean onRefreshAttempted (in nsIWebProgress aWebProgress, in nsIURI aRefreshURI, in long aMillis, in boolean aSameURI); */
+-NS_IMETHODIMP GProgressListener::
+- OnRefreshAttempted(nsIWebProgress *aWebProgress,
+- nsIURI *aRefreshURI, PRInt32 aMillis,
+- PRBool aSameURI, PRBool *_retval)
+-{
+- *_retval = PR_TRUE;
+- return NS_OK;
+-}
+-#endif
+
+ //---------------------------------------------------------------------------
+ NS_METHOD GProgressListener::SetRequest (nsIRequest *aRequest)
+@@ -730,6 +718,7 @@
if(NS_FAILED(rv)) return NS_ERROR_FAILURE;
GulString helperDesc;
@@ -1257,7 +1213,7 @@
#ifdef HAVE_NSIMIMEINFO_NSASTRING
rv = mMIMEInfo->GetApplicationDescription(helperDesc);
#else
-@@ -727,6 +727,8 @@ NS_METHOD GProgressListener::LaunchHelpe
+@@ -739,6 +728,8 @@
nsMemory::Free (tmp);
#endif
if(NS_FAILED(rv)) return NS_ERROR_FAILURE;
@@ -1266,7 +1222,7 @@
// XXX information passing kludge (from ContentHandler)
// TODO: should probably use some prefix, like 'gnomevfs:'
-@@ -865,6 +867,12 @@ nsresult GProgressListener::Abort (void)
+@@ -877,6 +868,12 @@
return NS_OK;
}
@@ -1279,9 +1235,9 @@
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
+diff -ur galeon-2.0.4.orig/mozilla/GaleonJS.cpp galeon-2.0.4/mozilla/GaleonJS.cpp
+--- galeon-2.0.4.orig/mozilla/GaleonJS.cpp 2007-12-15 07:10:37.000000000 +0100
++++ galeon-2.0.4/mozilla/GaleonJS.cpp 2007-12-20 20:45:13.000000000 +0100
@@ -24,15 +24,10 @@
#include "config.h"
#endif
Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- galeon.spec 6 Jan 2008 09:31:30 -0000 1.44
+++ galeon.spec 7 Jan 2008 12:51:55 -0000 1.45
@@ -3,7 +3,7 @@
Summary: GNOME2 Web browser based on Mozilla
Name: galeon
Version: 2.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Internet
URL: http://galeon.sourceforge.net/
@@ -117,6 +117,9 @@
%changelog
+* Mon Jan 7 2008 Denis Leroy <denis at poolshark.org> - 2.0.4-2
+- Updated xul-runner patch to fix compile/crash issues
+
* Sun Jan 6 2008 Denis Leroy <denis at poolshark.org> - 2.0.4-1
- Update to upstream 2.0.4
- Some patches upstreamed
More information about the fedora-extras-commits
mailing list