aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2003-11-24 03:21:20 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2003-11-24 03:21:20 +0800
commit1b77ab17d05695b4c398d96f9900813b5c8f7d67 (patch)
tree980baab1da37f768d1b0e72e5433ab438171196f
parent9c07939292bd7a2a4b74aadf72bbe11d2aafb9ac (diff)
downloadgsoc2013-epiphany-1b77ab17d05695b4c398d96f9900813b5c8f7d67.tar
gsoc2013-epiphany-1b77ab17d05695b4c398d96f9900813b5c8f7d67.tar.gz
gsoc2013-epiphany-1b77ab17d05695b4c398d96f9900813b5c8f7d67.tar.bz2
gsoc2013-epiphany-1b77ab17d05695b4c398d96f9900813b5c8f7d67.tar.lz
gsoc2013-epiphany-1b77ab17d05695b4c398d96f9900813b5c8f7d67.tar.xz
gsoc2013-epiphany-1b77ab17d05695b4c398d96f9900813b5c8f7d67.tar.zst
gsoc2013-epiphany-1b77ab17d05695b4c398d96f9900813b5c8f7d67.zip
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.
-rw-r--r--ChangeLog8
-rw-r--r--embed/mozilla/ExternalProtocolService.cpp4
-rw-r--r--embed/mozilla/MozRegisterComponents.cpp5
3 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f4b772d1..cd02952d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
2003-11-23 Xan Lopez <xan@masilla.org>
* src/prefs-dialog.c: (get_download_button_label),
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,