Remove support for mozilla 1.8a2 too. Adapt to mozilla API change;

2004-08-27  Christian Persch  <chpe@cvs.gnome.org>

	* configure.in:
	* embed/mozilla/ContentHandler.cpp:
	* embed/mozilla/EphyBrowser.cpp:
	* embed/mozilla/EphyContentPolicy.cpp:
	* embed/mozilla/FilePicker.cpp:
	* embed/mozilla/GlobalHistory.cpp:
	* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
	* embed/mozilla/MozDownload.cpp:
	* embed/mozilla/mozilla-embed-single.cpp:

	Remove support for mozilla 1.8a2 too.
	Adapt to mozilla API change; re-number mozilla snapshots.

10 files changed, 57 insertions, 42 deletions

diff --git a/ChangeLog b/ChangeLog
index 6a935bda7..c3fd82c6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-08-27  Christian Persch  <chpe@cvs.gnome.org>
+
+	* configure.in:
+	* embed/mozilla/ContentHandler.cpp:
+	* embed/mozilla/EphyBrowser.cpp:
+	* embed/mozilla/EphyContentPolicy.cpp:
+	* embed/mozilla/FilePicker.cpp:
+	* embed/mozilla/GlobalHistory.cpp:
+	* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
+	* embed/mozilla/MozDownload.cpp:
+	* embed/mozilla/mozilla-embed-single.cpp:
+
+	Remove support for mozilla 1.8a2 too.
+	Adapt to mozilla API change; re-number mozilla snapshots.
+
 2004-08-25  Christian Persch  <chpe@cvs.gnome.org>
 
 	* src/ephy-window.c: (update_actions_sensitivity):
diff --git a/configure.in b/configure.in
index 9492189c0..eecbc358b 100644
--- a/configure.in
+++ b/configure.in
@@ -77,6 +77,7 @@ if test "x$enable_nautilus_view" = "xyes"; then
   PKG_CHECK_MODULES(NAUTILUS_DEPENDENCY, libnautilus >= $LIBNAUTILUS_REQUIRED, \
   		    [AC_DEFINE(ENABLE_NAUTILUS_VIEW, 1, [Define if the nautilus view has to be built])], \
 		    [enable_nautilus_view=no])
+  AC_MSG_NOTICE([WARNING: nautilus view is deprecated and unsupported])
 fi
 AC_SUBST(NAUTILUS_DEPENDENCY_CFLAGS)
 AC_SUBST(NAUTILUS_DEPENDENCY_LIBS)
@@ -185,8 +186,8 @@ MOZILLA_VERSION="`$PKG_CONFIG --modversion mozilla-gtkmozembed`"
 dnl allow user to override the autodetected mozilla version
 dnl     - without arguments for cvs head
 AC_ARG_WITH(mozilla-snapshot,
-  AC_HELP_STRING([--with-mozilla-snapshot@<:@=1.4|1.4.1|1.4.2|1.5|1.5.1|1.6|1.7|1.7.1|1.7.2|1.8a2|trunk@:>@],
-		 [Whether to try building against mozilla 1.4|1.4.1|1.4.2|1.5|1.5.1|1.6|1.7|1.7.1|1.7.2|1.8a2|trunk
+  AC_HELP_STRING([--with-mozilla-snapshot@<:@=1.4|1.4.1|1.4.2|1.5|1.5.1|1.6|1.7|1.7.1|1.7.2|1.7.3|1.8a3|trunk@:>@],
+		 [Whether to try building against mozilla 1.4|1.4.1|1.4.2|1.5|1.5.1|1.6|1.7|1.7.1|1.7.2|1.7.3|1.8a3|trunk
 		  @<:@guessed@:>@]),
   [autodetect=" (guessed: $MOZILLA_VERSION)"; MOZILLA_VERSION="$withval"])
 
@@ -197,18 +198,17 @@ case "$MOZILLA_VERSION" in
 1.4.1) MOZILLA_SNAPSHOT=9 ;;
 1.4.2) MOZILLA_SNAPSHOT=9 ;;
 1.4.3) MOZILLA_SNAPSHOT=9 ;;
+1.4.4) MOZILLA_SNAPSHOT=9 ;;
   1.5) MOZILLA_SNAPSHOT=11 ;;
 1.5.1) MOZILLA_SNAPSHOT=11 ;;
   1.6) MOZILLA_SNAPSHOT=13 ;;
   1.7) MOZILLA_SNAPSHOT=17 ;;
 1.7.1) MOZILLA_SNAPSHOT=17 ;;
 1.7.2) MOZILLA_SNAPSHOT=17 ;;
-1.7.3) MOZILLA_SNAPSHOT=17 ;;
-1.7.4) MOZILLA_SNAPSHOT=17 ;;
-1.7.5) MOZILLA_SNAPSHOT=17 ;;
-branch1.7) MOZILLA_SNAPSHOT=17 ;;
-1.8a1) MOZILLA_SNAPSHOT=18 ;;
-1.8a2) MOZILLA_SNAPSHOT=19 ;;
+1.7.3) MOZILLA_SNAPSHOT=18 ;;
+1.7.4) MOZILLA_SNAPSHOT=18 ;;
+1.7.5) MOZILLA_SNAPSHOT=18 ;;
+branch1.7) MOZILLA_SNAPSHOT=18 ;;
 1.8a3) MOZILLA_SNAPSHOT=20 ;;
 1.8a4) MOZILLA_SNAPSHOT=21 ;;
  1.8b) MOZILLA_SNAPSHOT=21 ;;
@@ -219,7 +219,7 @@ trunk) MOZILLA_SNAPSHOT=21 ;;
     *) AC_ERROR([
 *****************************************************************************
 Epiphany can be built using Mozilla 1.4, 1.4.1, 1.4.2, 1.5, 1.5.1, 1.6,  1.7,
-1.7.1, 1.7.2, 1.8a2, 1.8a3, or trunk, but the version available is $MOZILLA_VERSION.  
+1.7.1, 1.7.2, 1.7.3, 1.8a3, or trunk, but the version available is $MOZILLA_VERSION.  
 *****************************************************************************])
 esac
 
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index d0daa481e..be85ac1b0 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -58,7 +58,7 @@ class GContentHandler;
 
 NS_IMPL_ISUPPORTS1(GContentHandler, nsIHelperAppLauncherDialog)
 
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 GContentHandler::GContentHandler() : mMimeType(nsnull)
 {
 	LOG ("GContentHandler ctor (%p)", this)
@@ -74,7 +74,7 @@ GContentHandler::~GContentHandler()
 {
 	LOG ("GContentHandler dtor (%p)", this)
 
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 	nsMemory::Free (mMimeType);
 #endif
 }
@@ -103,7 +103,7 @@ NS_IMETHODIMP GContentHandler::Show(nsIHelperAppLauncher *aLauncher,
 	NS_ENSURE_SUCCESS (rv, rv);
 
 	single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (embed_shell));
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 	g_signal_emit_by_name (single, "handle_content", mMimeType,
 			       mUrl.get(), &handled);
 #else
@@ -251,7 +251,7 @@ NS_METHOD GContentHandler::Init (void)
 	mLauncher->GetMIMEInfo (getter_AddRefs(MIMEInfo));
 	NS_ENSURE_TRUE (MIMEInfo, NS_ERROR_FAILURE);
 
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 	rv = MIMEInfo->GetMIMEType (&mMimeType);
 #else
 	rv = MIMEInfo->GetMIMEType (mMimeType);
@@ -376,14 +376,14 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
 
 	auto_downloads = eel_gconf_get_boolean (CONF_AUTO_DOWNLOADS);
 
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 	mHelperApp = gnome_vfs_mime_get_default_application (mMimeType);
 #else
 	mHelperApp = gnome_vfs_mime_get_default_application (mMimeType.get());
 #endif
 	CheckAppSupportScheme ();
 
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 	mPermission = ephy_embed_shell_check_mime (embed_shell, mMimeType);
 #else
 	mPermission = ephy_embed_shell_check_mime (embed_shell, mMimeType.get());
@@ -417,7 +417,7 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
 		/* HACK we use the application description to ask
 		   MozDownload to open the file when download
 		   is finished */
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 		mimeInfo->SetApplicationDescription
 			(NS_LITERAL_STRING ("gnome-default").get());
 #else
@@ -427,7 +427,7 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
 	}
 	else
 	{
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 		mimeInfo->SetApplicationDescription (nsnull);
 #else
 		mimeInfo->SetApplicationDescription (NS_LITERAL_STRING (""));
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index bc843aa0d..28b78d763 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -90,7 +90,7 @@
 #include "MozillaPrivate.h"
 #include "print-dialog.h"
 
-#if (MOZILLA_SNAPSHOT == 17) || (MOZILLA_SNAPSHOT >= 19)
+#if MOZILLA_SNAPSHOT >= 17
 #include "nsIDOMWindow2.h"
 #endif
 
@@ -258,7 +258,7 @@ EphyBrowser::GetListener (void)
   	nsCOMPtr<nsIDOMWindow> domWindowExternal;
   	mWebBrowser->GetContentDOMWindow(getter_AddRefs(domWindowExternal));
 
-#if (MOZILLA_SNAPSHOT == 17) || (MOZILLA_SNAPSHOT >= 19)
+#if MOZILLA_SNAPSHOT >= 17
 	nsCOMPtr<nsIDOMWindow2> domWindow (do_QueryInterface (domWindowExternal));
 	NS_ENSURE_TRUE (domWindow, NS_ERROR_FAILURE);
 
diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp
index 9a2a6ad01..dad52c0b8 100644
--- a/embed/mozilla/EphyContentPolicy.cpp
+++ b/embed/mozilla/EphyContentPolicy.cpp
@@ -57,7 +57,7 @@ EphyContentPolicy::~EphyContentPolicy()
 	g_slist_free (mSafeProtocols);
 }
 
-#if MOZILLA_SNAPSHOT >= 18
+#if MOZILLA_SNAPSHOT >= 20
 NS_IMETHODIMP
 EphyContentPolicy::ShouldLoad(PRUint32 aContentType,
 			      nsIURI *aContentLocation,
@@ -164,4 +164,4 @@ NS_IMETHODIMP EphyContentPolicy::ShouldProcess(PRInt32 contentType,
 	*_retval = PR_TRUE;
 	return NS_OK;
 }
-#endif /* MOZILLA_SNAPSHOT >= 18 */
+#endif /* MOZILLA_SNAPSHOT >= 20 */
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index 595ebe003..1650ebe0c 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -38,7 +38,7 @@
 #include <nsString.h>
 #include <nsReadableUtils.h>
 
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 #include <nsIDOMWindowInternal.h>
 #endif
 
@@ -80,7 +80,7 @@ GFilePicker::~GFilePicker()
 }
 
 /* void init (in nsIDOMWindow parent, in AString title, in short mode); */
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 NS_IMETHODIMP GFilePicker::Init(nsIDOMWindowInternal *parent, const PRUnichar *title, PRInt16 mode)
 #else
 NS_IMETHODIMP GFilePicker::Init(nsIDOMWindow *parent, const nsAString& title, PRInt16 mode)
@@ -161,7 +161,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 
 	if (filterMask & nsIFilePicker::filterAll)
 	{
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 		AppendFilter (NS_ConvertUTF8toUCS2 (_("All files")).get(),
 			      NS_LITERAL_STRING ("*").get());
 #else
@@ -171,7 +171,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 	}
 	if (filterMask & nsIFilePicker::filterHTML)
 	{
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 		AppendFilter (NS_ConvertUTF8toUCS2 (_("HTML files")).get(),
 			      NS_LITERAL_STRING ("*.html; *.htm; *.shtml; *.xhtml").get());
 #else
@@ -181,7 +181,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 	}
 	if (filterMask & nsIFilePicker::filterText)
 	{
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 		AppendFilter (NS_ConvertUTF8toUCS2 (_("Text files")).get(),
 			      NS_LITERAL_STRING ("*.txt; *.text").get());
 #else
@@ -191,7 +191,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 	}
 	if (filterMask & nsIFilePicker::filterImages)
 	{
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 		AppendFilter (NS_ConvertUTF8toUCS2 (_("Image files")).get(),
 			      NS_LITERAL_STRING ("*.png; *.gif; *.jpeg; *.jpg").get());
 #else
@@ -201,7 +201,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 	}
 	if (filterMask & nsIFilePicker::filterXML)
 	{
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 		AppendFilter (NS_ConvertUTF8toUCS2 (_("XML files")).get(),
 			      NS_LITERAL_STRING ("*.xml").get());
 #else
@@ -211,7 +211,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 	}
 	if (filterMask & nsIFilePicker::filterXUL)
 	{
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 		AppendFilter (NS_ConvertUTF8toUCS2 (_("XUL files")).get(),
 			      NS_LITERAL_STRING ("*.xul").get());
 #else
@@ -224,7 +224,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 }
 
 /* void appendFilter (in AString title, in AString filter); */
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 NS_IMETHODIMP GFilePicker::AppendFilter(const PRUnichar *title, const PRUnichar *filter)
 #else
 NS_IMETHODIMP GFilePicker::AppendFilter(const nsAString& title, const nsAString& filter)
@@ -264,7 +264,7 @@ NS_IMETHODIMP GFilePicker::AppendFilter(const nsAString& title, const nsAString&
 }
 
 /* attribute AString defaultString; */
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 NS_IMETHODIMP GFilePicker::GetDefaultString(PRUnichar **aDefaultString)
 #else
 NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString)
@@ -272,7 +272,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString)
 {
 	LOG ("GFilePicker::GetDefaultString")
 
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 	*aDefaultString = ToNewUnicode (mDefaultString);
 #else
 	aDefaultString = mDefaultString;
@@ -281,7 +281,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString)
 	return NS_OK;
 }
 
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 NS_IMETHODIMP GFilePicker::SetDefaultString(const PRUnichar *aDefaultString)
 #else
 NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString& aDefaultString)
@@ -310,7 +310,7 @@ NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString& aDefaultString)
 }
 
 /* attribute AString defaultExtension; */
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 NS_IMETHODIMP GFilePicker::GetDefaultExtension(PRUnichar **aDefaultExtension)
 #else
 NS_IMETHODIMP GFilePicker::GetDefaultExtension(nsAString& aDefaultExtension)
@@ -321,7 +321,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultExtension(nsAString& aDefaultExtension)
 	return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 NS_IMETHODIMP GFilePicker::SetDefaultExtension(const PRUnichar *aDefaultExtension)
 #else
 NS_IMETHODIMP GFilePicker::SetDefaultExtension(const nsAString& aDefaultExtension)
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index c8538de51..e0672df42 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -186,7 +186,7 @@ NS_IMETHODIMP MozGlobalHistory::HidePage(const char *aURL)
 }
 #endif /* MOZILLA_SNAPSHOT > 13 */
 
-#if MOZILLA_SNAPSHOT >= 20
+#if MOZILLA_SNAPSHOT >= 18
 /* void removePage (in nsIURI aURL); */
 NS_IMETHODIMP MozGlobalHistory::RemovePage(nsIURI *aURI)
 {
@@ -248,7 +248,7 @@ NS_IMETHODIMP MozGlobalHistory::GetCount(PRUint32 *aCount)
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-#if MOZILLA_SNAPSHOT >= 20
+#if MOZILLA_SNAPSHOT >= 18
 /* void markPageAsTyped (in nsIURI url); */
 NS_IMETHODIMP MozGlobalHistory::MarkPageAsTyped(nsIURI *aURI)
 {
diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
index d06a5b8d1..9f38f6575 100644
--- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp
+++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
@@ -86,7 +86,7 @@ public:
 	NS_DECL_ISUPPORTS
 	NS_DECL_NSIDOMWINDOWINTERNAL
 	NS_DECL_NSIDOMWINDOW
-#if MOZILLA_SNAPSHOT == 17 || MOZILLA_SNAPSHOT >= 19
+#if MOZILLA_SNAPSHOT >= 17
 	NS_DECL_NSIDOMWINDOW2
 #endif
 
@@ -96,7 +96,7 @@ public:
 	gboolean close_called;
 };
 
-#if MOZILLA_SNAPSHOT == 17 || MOZILLA_SNAPSHOT >= 19
+#if MOZILLA_SNAPSHOT >= 17
 NS_IMPL_ISUPPORTS3(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow, nsIDOMWindow2)
 #else
 NS_IMPL_ISUPPORTS2(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow)
@@ -244,7 +244,7 @@ NS_IMETHODIMP KeyPairHelperWindow::GetWindow(nsIDOMWindowInternal * *aWindow)
     MOZ_NOT_IMPLEMENTED
 }
 
-#if MOZILLA_SNAPSHOT == 17 || MOZILLA_SNAPSHOT >= 19
+#if MOZILLA_SNAPSHOT >= 17
 NS_IMETHODIMP KeyPairHelperWindow::GetWindowRoot(nsIDOMEventTarget * *aEvent)
 {
     MOZ_NOT_IMPLEMENTED
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 98ac57580..9b9517459 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -350,7 +350,7 @@ MozDownload::OnStateChange (nsIWebProgress *aWebProgress, nsIRequest *aRequest,
 		else if (NS_SUCCEEDED (aStatus))
 		{
 			GnomeVFSMimeApplication *helperApp;
-#if MOZILLA_SNAPSHOT < 18
+#if MOZILLA_SNAPSHOT < 20
 			char *mimeType;
 			rv = mMIMEInfo->GetMIMEType (&mimeType);
 			NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 9a32ab3b0..0facda266 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -578,7 +578,7 @@ impl_load_proxy_autoconf (EphyEmbedSingle *shell,
                 do_GetService ("@mozilla.org/network/protocol-proxy-service;1");
 	if (!pps) return;
 
-#if MOZILLA_SNAPSHOT >= 19
+#if MOZILLA_SNAPSHOT >= 20
 	pps->ConfigureFromPAC (nsDependentCString (url));
 #else
 	pps->ConfigureFromPAC (url);