From 1b77ab17d05695b4c398d96f9900813b5c8f7d67 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@gnome.org>
Date: Sun, 23 Nov 2003 19:21:20 +0000
Subject: Do not build our externla protocol service with mozilla 1.6. It has
 his

2003-11-23  Marco Pesenti Gritti  <marco@gnome.org>

        * embed/mozilla/ExternalProtocolService.cpp:
        * embed/mozilla/MozRegisterComponents.cpp:

        Do not build our externla protocol service
        with mozilla 1.6. It has his own and api is changed.
---
 embed/mozilla/ExternalProtocolService.cpp | 4 ++++
 embed/mozilla/MozRegisterComponents.cpp   | 5 +++++
 2 files changed, 9 insertions(+)

(limited to 'embed/mozilla')

diff --git a/embed/mozilla/ExternalProtocolService.cpp b/embed/mozilla/ExternalProtocolService.cpp
index 89537cf8f..1f804d2f4 100644
--- a/embed/mozilla/ExternalProtocolService.cpp
+++ b/embed/mozilla/ExternalProtocolService.cpp
@@ -20,6 +20,8 @@
 #include <config.h>
 #endif
 
+#if MOZILLA_SNAPSHOT < 12
+
 #include <gtk/gtkmessagedialog.h>
 #include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
@@ -153,3 +155,5 @@ NS_IMETHODIMP GExternalProtocolService::LoadUrl(nsIURI *aURL)
 
 	return NS_OK;
 }
+
+#endif
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index b359a7b9f..8133a2650 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -51,7 +51,10 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(GPrintingPromptService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GIRCProtocolHandler)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GFtpProtocolHandler)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GNewsProtocolHandler)
+
+#if MOZILLA_SNAPSHOT < 12
 NS_GENERIC_FACTORY_CONSTRUCTOR(GExternalProtocolService)
+#endif
 
 #ifdef HAVE_MOZILLA_PSM
 NS_GENERIC_FACTORY_CONSTRUCTOR(GtkNSSClientAuthDialogs)
@@ -60,12 +63,14 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(GtkNSSKeyPairDialogs)
 #endif
 
 static const nsModuleComponentInfo sAppComps[] = {
+#if MOZILLA_SNAPSHOT < 12
 	{
 		G_EXTERNALPROTOCOLSERVICE_CLASSNAME,
 		G_EXTERNALPROTOCOLSERVICE_CID,
 		NS_EXTERNALPROTOCOLSERVICE_CONTRACTID,
  		GExternalProtocolServiceConstructor
 	},
+#endif
 	{
 		MOZ_DOWNLOAD_CLASSNAME,
 		MOZ_DOWNLOAD_CID,
-- 
cgit v1.2.3