Fix mozilla API checks to correctly detect firefox libraries.

2004-09-21  Christian Persch  <chpe@cvs.gnome.org>

	* configure.in:
	* embed/mozilla/ContentHandler.cpp:
	* embed/mozilla/ContentHandler.h:
	* embed/mozilla/EphyBrowser.cpp:
	* embed/mozilla/EphyBrowser.h:
	* embed/mozilla/EphyContentPolicy.cpp:
	* embed/mozilla/FilePicker.cpp:
	* embed/mozilla/GlobalHistory.cpp:
	* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
	* embed/mozilla/Makefile.am:
	* embed/mozilla/MozDownload.cpp:
	* embed/mozilla/mozilla-download.cpp:
	* embed/mozilla/mozilla-embed-single.cpp:
	* embed/mozilla/mozilla-embed.cpp:
	* embed/mozilla/mozilla-notifiers.cpp:
	* embed/mozilla/mozilla-version.h:

	Fix mozilla API checks to correctly detect firefox libraries.

15 files changed, 47 insertions, 131 deletions

diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 96aa15e7f..422597d03 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -61,7 +61,7 @@ class GContentHandler;
 
 NS_IMPL_ISUPPORTS1(GContentHandler, nsIHelperAppLauncherDialog)
 
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIMIMEINFO_NSACSTRING_
 GContentHandler::GContentHandler()
 {
 	LOG ("GContentHandler ctor (%p)", this)
@@ -77,7 +77,7 @@ GContentHandler::~GContentHandler()
 {
 	LOG ("GContentHandler dtor (%p)", this)
 
-#if !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifndef MOZ_NSIMIMEINFO_NSACSTRING_
 	nsMemory::Free (mMimeType);
 #endif
 }
@@ -101,7 +101,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_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIMIMEINFO_NSACSTRING_
 	g_signal_emit_by_name (single, "handle_content", mMimeType.get(),
 			       mUrl.get(), &handled);
 #else
@@ -241,7 +241,7 @@ NS_METHOD GContentHandler::Init (void)
 	mLauncher->GetMIMEInfo (getter_AddRefs(MIMEInfo));
 	NS_ENSURE_TRUE (MIMEInfo, NS_ERROR_FAILURE);
 
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIMIMEINFO_NSACSTRING_
 	rv = MIMEInfo->GetMIMEType (mMimeType);
 #else
 	rv = MIMEInfo->GetMIMEType (&mMimeType);
@@ -359,7 +359,7 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
 
 	auto_downloads = eel_gconf_get_boolean (CONF_AUTO_DOWNLOADS);
 
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIMIMEINFO_NSACSTRING_
 	mHelperApp = gnome_vfs_mime_get_default_application (mMimeType.get());
 	mPermission = ephy_embed_shell_check_mime (embed_shell, mMimeType.get());
 #else
@@ -402,7 +402,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_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIMIMEINFO_NSACSTRING_
 		mimeInfo->SetApplicationDescription (desc);
 #else
 		mimeInfo->SetApplicationDescription (desc.get());
@@ -410,7 +410,7 @@ NS_METHOD GContentHandler::MIMEDoAction (void)
 	}
 	else
 	{
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIMIMEINFO_NSACSTRING_
 		mimeInfo->SetApplicationDescription (nsEmbedString ());
 #else
 		mimeInfo->SetApplicationDescription (nsnull);
diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h
index df77559d4..a4d561a6e 100644
--- a/embed/mozilla/ContentHandler.h
+++ b/embed/mozilla/ContentHandler.h
@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-#include "mozilla-version.h"
 #include "ephy-embed-shell.h"
 
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
@@ -84,7 +83,7 @@ class GContentHandler : public nsIHelperAppLauncherDialog
 
 	nsEmbedCString mUrl;
 	nsEmbedCString mScheme;
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIMIMEINFO_NSACSTRING_
 	nsEmbedCString mMimeType;
 #else
 	char *mMimeType;
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 40eb42a35..77a2ed9eb 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -411,7 +411,7 @@ nsresult EphyBrowser::GoToHistoryIndex (PRInt16 index)
 	return ContentNav->GotoIndex (index);
 }
 
-#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 4)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+#ifdef GTKMOZEMBED_BROKEN_RELOAD
 /* Workaround for broken reload with frames, see mozilla bug
  * http://bugzilla.mozilla.org/show_bug.cgi?id=246392
  */
diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h
index 03fc9e750..d7fc5a148 100644
--- a/embed/mozilla/EphyBrowser.h
+++ b/embed/mozilla/EphyBrowser.h
@@ -25,8 +25,6 @@
 #include "config.h"
 #endif
 
-#include "mozilla-version.h"
-
 #include "ephy-encodings.h"
 #include "ephy-embed.h"
 
@@ -112,7 +110,7 @@ public:
 	nsresult GetSHUrlAtIndex (PRInt32 index, nsACString &url);
 	nsresult GoToHistoryIndex (PRInt16 index);
 
-#if (!MOZILLA_IS_BRANCH (1, 7) || !MOZILLA_CHECK_VERSION3 (1, 7, 4)) && !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+#ifdef GTKMOZEMBED_BROKEN_RELOAD
 	enum ReloadType { RELOAD_NORMAL		 = 0,
 			  RELOAD_FORCE		 = 1,
 			  RELOAD_ENCODING_CHANGE = 2 };
diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp
index 8654afe38..65b26b05b 100644
--- a/embed/mozilla/EphyContentPolicy.cpp
+++ b/embed/mozilla/EphyContentPolicy.cpp
@@ -27,8 +27,6 @@
 
 #include "EphyContentPolicy.h"
 
-#include "mozilla-version.h"
-
 #include "eel-gconf-extensions.h"
 #include "ephy-debug.h"
 
@@ -61,16 +59,12 @@ EphyContentPolicy::~EphyContentPolicy()
 	g_slist_free (mSafeProtocols);
 }
 
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSICONTENTPOLICY_VARIANT_2
 NS_IMETHODIMP
 EphyContentPolicy::ShouldLoad(PRUint32 aContentType,
 			      nsIURI *aContentLocation,
 			      nsIURI *aRequestingLocation,
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
 			      nsISupports *aContext,
-#else
-			      nsIDOMNode *aRequestingNode,
-#endif
 			      const nsACString &aMimeTypeGuess,
 			      nsISupports *aExtra,
 			      PRInt16 *aDecision)
@@ -109,11 +103,7 @@ NS_IMETHODIMP
 EphyContentPolicy::ShouldProcess(PRUint32 aContentType,
 			         nsIURI *aContentLocation,
 			         nsIURI *aRequestingLocation,
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
 				 nsISupports *aContext,
-#else
-			         nsIDOMNode *aRequestingNode,
-#endif
 			         const nsACString &aMimeType,
 			         nsISupports *aExtra,
 			         PRInt16 *aDecision)
@@ -168,4 +158,4 @@ NS_IMETHODIMP EphyContentPolicy::ShouldProcess(PRInt32 contentType,
 	*_retval = PR_TRUE;
 	return NS_OK;
 }
-#endif /* MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1) */
+#endif /* MOZ_NSICONTENTPOLICY_VARIANT_2 || MOZ_NSICONTENTPOLICY_VARIANT_3 */
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index 2223dafbe..a0e90f781 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -28,8 +28,6 @@
 #include "FilePicker.h"
 #include "MozillaPrivate.h"
 
-#include "mozilla-version.h"
-
 #include <nsCOMPtr.h>
 #include <nsEmbedString.h>
 #include <nsIServiceManager.h>
@@ -40,7 +38,7 @@
 #include <nsIDOMWindow.h>
 #include <nsNetCID.h>
 
-#if !MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifndef MOZ_NSIFILEPICKER_NSASTRING_
 #include <nsIDOMWindowInternal.h>
 #endif
 
@@ -76,7 +74,7 @@ GFilePicker::~GFilePicker()
 }
 
 /* void init (in nsIDOMWindow parent, in AString title, in short mode); */
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIFILEPICKER_NSASTRING_
 NS_IMETHODIMP GFilePicker::Init(nsIDOMWindow *parent, const nsAString& title, PRInt16 mode)
 #else
 NS_IMETHODIMP GFilePicker::Init(nsIDOMWindowInternal *parent, const PRUnichar *title, PRInt16 mode)
@@ -85,12 +83,12 @@ NS_IMETHODIMP GFilePicker::Init(nsIDOMWindowInternal *parent, const PRUnichar *t
 	LOG ("GFilePicker::Init")
 
 	GtkWidget *gtkparent = MozillaFindGtkParent (parent);
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#if defined(MOZ_NSIFILEPICKER_NSASTRING_)
 	NS_ENSURE_TRUE (gtkparent, NS_ERROR_FAILURE);
 #endif
 
 	nsEmbedCString cTitle;
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIFILEPICKER_NSASTRING_
 	NS_UTF16ToCString (title, NS_CSTRING_ENCODING_UTF8, cTitle);
 #else
 	NS_UTF16ToCString (nsEmbedString(title), NS_CSTRING_ENCODING_UTF8, cTitle);
@@ -181,7 +179,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 }
 
 /* void appendFilter (in AString title, in AString filter); */
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIFILEPICKER_NSASTRING_
 NS_IMETHODIMP GFilePicker::AppendFilter(const nsAString& title, const nsAString& filter)
 #else
 NS_IMETHODIMP GFilePicker::AppendFilter(const PRUnichar *title, const PRUnichar *filter)
@@ -191,14 +189,14 @@ NS_IMETHODIMP GFilePicker::AppendFilter(const PRUnichar *title, const PRUnichar
 
 	LOG ("GFilePicker::AppendFilter")
 
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIFILEPICKER_NSASTRING_
 	if (!filter.Length()) return NS_ERROR_FAILURE;
 #else
 	if (!filter) return NS_ERROR_FAILURE;
 #endif
 
 	nsEmbedCString pattern;
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIFILEPICKER_NSASTRING_
 	NS_UTF16ToCString (filter, NS_CSTRING_ENCODING_UTF8, pattern);
 #else
 	NS_UTF16ToCString (nsEmbedString(filter), NS_CSTRING_ENCODING_UTF8, pattern);
@@ -217,7 +215,7 @@ NS_IMETHODIMP GFilePicker::AppendFilter(const PRUnichar *title, const PRUnichar
 	}
 
 	nsEmbedCString cTitle;
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIFILEPICKER_NSASTRING_
 	NS_UTF16ToCString (title, NS_CSTRING_ENCODING_UTF8, cTitle);
 #else
 	NS_UTF16ToCString (nsEmbedString(title), NS_CSTRING_ENCODING_UTF8, cTitle);
@@ -233,7 +231,7 @@ NS_IMETHODIMP GFilePicker::AppendFilter(const PRUnichar *title, const PRUnichar
 }
 
 /* attribute AString defaultString; */
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIFILEPICKER_NSASTRING_
 NS_IMETHODIMP GFilePicker::GetDefaultString(nsAString& aDefaultString)
 #else
 NS_IMETHODIMP GFilePicker::GetDefaultString(PRUnichar **aDefaultString)
@@ -243,7 +241,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultString(PRUnichar **aDefaultString)
 
 	LOG ("GFilePicker::GetDefaultString")
 
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIFILEPICKER_NSASTRING_
 	aDefaultString = mDefaultString;
 #else
 	*aDefaultString = NS_StringCloneData (mDefaultString);
@@ -252,7 +250,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultString(PRUnichar **aDefaultString)
 	return NS_OK;
 }
 
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIFILEPICKER_NSASTRING_
 NS_IMETHODIMP GFilePicker::SetDefaultString(const nsAString& aDefaultString)
 #else
 NS_IMETHODIMP GFilePicker::SetDefaultString(const PRUnichar *aDefaultString)
@@ -281,7 +279,7 @@ NS_IMETHODIMP GFilePicker::SetDefaultString(const PRUnichar *aDefaultString)
 }
 
 /* attribute AString defaultExtension; */
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIFILEPICKER_NSASTRING_
 NS_IMETHODIMP GFilePicker::GetDefaultExtension(nsAString& aDefaultExtension)
 #else
 NS_IMETHODIMP GFilePicker::GetDefaultExtension(PRUnichar **aDefaultExtension)
@@ -292,7 +290,7 @@ NS_IMETHODIMP GFilePicker::GetDefaultExtension(PRUnichar **aDefaultExtension)
 	return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIFILEPICKER_NSASTRING_
 NS_IMETHODIMP GFilePicker::SetDefaultExtension(const nsAString& aDefaultExtension)
 #else
 NS_IMETHODIMP GFilePicker::SetDefaultExtension(const PRUnichar *aDefaultExtension)
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index 27932779d..c2ba7a1ae 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -25,8 +25,6 @@
 #include "config.h"
 #endif
 
-#include "mozilla-version.h"
-
 #include "ephy-embed-shell.h"
 
 #include "GlobalHistory.h"
@@ -133,7 +131,7 @@ NS_IMETHODIMP MozGlobalHistory::HidePage(nsIURI *aURI)
 	return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 4)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+#ifdef MOZ_NSIGLOBALHISTORY_NSIURIP
 /* void removePage (in nsIURI aURI); */
 NS_IMETHODIMP MozGlobalHistory::RemovePage(nsIURI *aURI)
 {
@@ -179,7 +177,7 @@ NS_IMETHODIMP MozGlobalHistory::GetCount(PRUint32 *aCount)
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-#if (MOZILLA_IS_BRANCH (1, 7) && MOZILLA_CHECK_VERSION3 (1, 7, 4)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+#ifdef MOZ_NSIGLOBALHISTORY_NSIURIP
 /* void markPageAsTyped (in AUTF8String aURI) */
 NS_IMETHODIMP MozGlobalHistory::MarkPageAsTyped(nsIURI *aURI)
 {
@@ -192,3 +190,11 @@ NS_IMETHODIMP MozGlobalHistory::MarkPageAsTyped(const char *url)
     return NS_ERROR_NOT_IMPLEMENTED;
 }
 #endif
+
+#ifdef MOZ_NSIBROWSERHISTORY_ADDPAGEWITHDETAILS
+/* void addPageWithDetails (in nsIURI aURI, in wstring aTitle, in long long aLastVisited); */
+NS_IMETHODIMP MozGlobalHistory::AddPageWithDetails(nsIURI *aURI, const PRUnichar *aTitle, PRInt64 aLastVisited)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+#endif
diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
index d84739cc9..55fa5968c 100644
--- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp
+++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
@@ -43,8 +43,6 @@
 
 #ifdef HAVE_MOZILLA_PSM
 
-#include "mozilla-version.h"
-
 #include "MozillaPrivate.h"
 
 #include <nsIServiceManager.h>
@@ -95,9 +93,7 @@ public:
 	NS_DECL_ISUPPORTS
 	NS_DECL_NSIDOMWINDOWINTERNAL
 	NS_DECL_NSIDOMWINDOW
-#if !MOZILLA_IS_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
 	NS_DECL_NSIDOMWINDOW2
-#endif
 
 	KeyPairHelperWindow();
 	virtual ~KeyPairHelperWindow();
@@ -105,11 +101,7 @@ public:
 	gboolean close_called;
 };
 
-#if !MOZILLA_IS_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
 NS_IMPL_ISUPPORTS3(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow, nsIDOMWindow2)
-#else
-NS_IMPL_ISUPPORTS2(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow)
-#endif
 
 KeyPairHelperWindow::KeyPairHelperWindow()
 {
@@ -716,13 +708,9 @@ NS_IMETHODIMP KeyPairHelperWindow::SizeToContent()
     MOZ_NOT_IMPLEMENTED
 }
 
-#if !MOZILLA_IS_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
-
 NS_IMETHODIMP KeyPairHelperWindow::GetWindowRoot(nsIDOMEventTarget * *aWindowRoot)
 {
     MOZ_NOT_IMPLEMENTED
 }
 
 #endif
-
-#endif
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index f309b0449..1b83bfa1c 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -19,6 +19,7 @@ INCLUDES = \
 	-I$(MOZILLA_INCLUDE_ROOT)/mimetype		\
 	-I$(MOZILLA_INCLUDE_ROOT)/necko			\
 	-I$(MOZILLA_INCLUDE_ROOT)/nkcache		\
+	-I$(MOZILLA_INCLUDE_ROOT)/passwordmgr		\
 	-I$(MOZILLA_INCLUDE_ROOT)/pipboot		\
 	-I$(MOZILLA_INCLUDE_ROOT)/pipnss		\
 	-I$(MOZILLA_INCLUDE_ROOT)/shistory		\
@@ -88,5 +89,4 @@ libephymozillaembed_la_SOURCES = 	\
 	mozilla-embed-single.cpp	\
 	mozilla-embed-single.h	        \
 	mozilla-notifiers.cpp		\
-	mozilla-notifiers.h		\
-	mozilla-version.h
+	mozilla-notifiers.h
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 365aeaa10..975b852ca 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -47,8 +47,6 @@
 #include "config.h"
 #endif
 
-#include "mozilla-version.h"
-
 #include "mozilla-download.h"
 #include "eel-gconf-extensions.h"
 #include "ephy-prefs.h"
@@ -330,7 +328,7 @@ MozDownload::OnStateChange (nsIWebProgress *aWebProgress, nsIRequest *aRequest,
 		else if (NS_SUCCEEDED (aStatus))
 		{
 			GnomeVFSMimeApplication *helperApp;
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIMIMEINFO_NSACSTRING_
 			nsEmbedCString mimeType;
 			rv = mMIMEInfo->GetMIMEType (mimeType);
 			NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
diff --git a/embed/mozilla/mozilla-download.cpp b/embed/mozilla/mozilla-download.cpp
index 3b66cbaf8..9360de066 100644
--- a/embed/mozilla/mozilla-download.cpp
+++ b/embed/mozilla/mozilla-download.cpp
@@ -25,7 +25,6 @@
 #endif
 
 #include "mozilla-download.h"
-#include "mozilla-version.h"
 
 #include "ephy-debug.h"
 
@@ -191,7 +190,7 @@ impl_get_mime (EphyDownload *download)
 	mozDownload->GetMIMEInfo (getter_AddRefs(mime));
         if (!mime) return g_strdup ("application/octet-stream");
 
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
+#ifdef MOZ_NSIMIMEINFO_NSACSTRING_
         mime->GetMIMEType(mimeType);
 #else
 	char *tmp = nsnull;
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 356a83dc4..025d3347d 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -26,7 +26,6 @@
 #endif
 
 #include "mozilla-embed-single.h"
-#include "mozilla-version.h"
 
 #include "ephy-cookie-manager.h"
 #include "ephy-password-manager.h"
@@ -404,6 +403,8 @@ getUILang (nsAString& aUILang)
 static nsresult
 mozilla_init_chrome (void)
 {
+/* FIXME: can we just omit this on new-toolkit ? */
+#ifdef MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN
 	nsresult rv;
 	nsEmbedString uiLang;
 
@@ -425,6 +426,9 @@ mozilla_init_chrome (void)
 	NS_UTF16ToCString (uiLang, NS_CSTRING_ENCODING_UTF8, cUILang);
 
 	return chromeRegistry->SelectLocale (cUILang, PR_FALSE);
+#else
+	return NS_OK;
+#endif
 }
 
 static void
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 95e854cf9..7d98478cf 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -503,7 +503,7 @@ static void
 impl_reload (EphyEmbed *embed, 
              gboolean force)
 {
-#if (MOZILLA_IS_BRANCH (1,7) && MOZILLA_CHECK_VERSION3 (1, 7, 4)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+#ifndef GTKMOZEMBED_BROKEN_RELOAD
 	guint32 mflags;
 
 	mflags = GTK_MOZ_EMBED_FLAG_RELOADNORMAL;
@@ -711,14 +711,12 @@ impl_set_encoding (EphyEmbed *embed,
 		if (NS_FAILED (rv)) return;
 	}
 
-#if (MOZILLA_IS_BRANCH (1,7) && MOZILLA_CHECK_VERSION3 (1, 7, 4)) || MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 3)
+#ifndef GTKMOZEMBED_BROKEN_RELOAD
 	gtk_moz_embed_reload (GTK_MOZ_EMBED (embed),
 			      GTK_MOZ_EMBED_FLAG_RELOADCHARSETCHANGE);
 #else
 	/* Workaround for broken reload with frames, see mozilla bug
 	 * http://bugzilla.mozilla.org/show_bug.cgi?id=246392
-	 * Replace #if 0 with appropriate MOZILLA_CHECK_VERSION4 once the bug
-	 * has been fixed
 	 */
 	mpriv->browser->Reload (EphyBrowser::RELOAD_ENCODING_CHANGE);
 #endif
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index e49c1f86e..c00a18b6f 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -25,8 +25,6 @@
 #include "config.h"
 #endif
 
-#include "mozilla-version.h"
-
 #include "ephy-embed-single.h"
 #include "ephy-embed-shell.h"
 #include "mozilla-notifiers.h"
@@ -370,7 +368,7 @@ mozilla_proxy_autoconfig_notifier (GConfClient *client,
 	char *url = eel_gconf_get_string (entry->key);
 	if (url && url[0] != '\0')
 	{
-#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 2)
+#ifdef MOZ_NSIPROTOCOLPROXYSERVICE_NSACSTRING_
 	        pps->ConfigureFromPAC (nsEmbedCString (url));
 #else
 	        pps->ConfigureFromPAC (url);
diff --git a/embed/mozilla/mozilla-version.h b/embed/mozilla/mozilla-version.h
deleted file mode 100644
index 3dc260cdf..000000000
--- a/embed/mozilla/mozilla-version.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Copyright (C) 2004 Crispin Flowerday
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- *  $Id$
- */
-
-#ifndef MOZILLA_VERSION_H
-#define MOZILLA_VERSION_H
-
-/**
- * Create a version int from components
- */
-#define VERSION4(a,b,c,d) ((a << 24) + (b << 16) + (c << 8) + d)
-
-/**
- * Macros for comparing mozilla version numbers
- */
-#define MOZILLA_ALPHA   1
-#define MOZILLA_BETA    2
-#define MOZILLA_RC      3
-#define MOZILLA_RELEASE 4
-
-#define MOZILLA_CHECK_VERSION4(major, minor, type, micro) \
-          (VERSION4(MOZILLA_MAJOR, MOZILLA_MINOR, MOZILLA_TYPE, MOZILLA_MICRO) >= \
-           VERSION4(major, minor, type, micro))
-
-#define MOZILLA_CHECK_VERSION3(a,b,c) MOZILLA_CHECK_VERSION4(a,b,MOZILLA_RELEASE,c)
-#define MOZILLA_CHECK_VERSION2(a,b) MOZILLA_CHECK_VERSION3(a,b,0)
-
-#define MOZILLA_IS_VERSION4(major, minor, type, micro) \
-	(VERSION4(MOZILLA_MAJOR, MOZILLA_MINOR, MOZILLA_TYPE, MOZILLA_MICRO) == \
-	 VERSION4(major, minor, type, micro))
-
-#define MOZILLA_IS_BRANCH(major, minor) \
-	(MOZILLA_MAJOR == major && MOZILLA_MINOR == minor)
-
-/* Use the following:
- *
- *  1.4.1 -> MOZILLA_CHECK_VERSION3 (1,4,1)
- *  1.7   -> MOZILLA_CHECK_VERSION2 (1,7)
- *  1.8a1 -> MOZILLA_CHECK_VERSION4 (1,8,MOZILLA_ALPHA,1)
- *  1.7a  -> MOZILLA_CHECK_VERSION4 (1,7,MOZILLA_ALPHA,0)
- *  1.7rc2 -> MOZILLA_CHECK_VERSION4 (1,7,MOZILLA_RC, 2)
- */
-
-#endif /* MOZILLA_VERSION_H */