From deab0d1c914913ae0615eec1cd1dc170255275a5 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Sun, 14 Dec 2003 16:19:40 +0000
Subject: Adapt to changed mozilla APIs for 1.6. (Ported from HEAD).

2003-12-14  Christian Persch  <chpe@cvs.gnome.org>

	* NEWS:
	* configure.in:
	* embed/mozilla/EphyEventListener.cpp:
	* embed/mozilla/EphyWrapper.cpp:
	* embed/mozilla/EventContext.cpp:
	* embed/mozilla/ExternalProtocolService.cpp:
	* embed/mozilla/MozRegisterComponents.cpp:
	* embed/mozilla/mozilla-embed-persist.cpp:
	* embed/mozilla/mozilla-embed-single.cpp:
	* src/ephy-window.c: (show_embed_popup):

	Adapt to changed mozilla APIs for 1.6. (Ported from HEAD).
---
 embed/mozilla/ExternalProtocolService.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'embed/mozilla/ExternalProtocolService.cpp')

diff --git a/embed/mozilla/ExternalProtocolService.cpp b/embed/mozilla/ExternalProtocolService.cpp
index be5dfdee2..f8d9a008c 100644
--- a/embed/mozilla/ExternalProtocolService.cpp
+++ b/embed/mozilla/ExternalProtocolService.cpp
@@ -17,9 +17,11 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
+#if MOZILLA_SNAPSHOT < 12
+
 #include <gtk/gtk.h>
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-i18n.h>
@@ -155,3 +157,5 @@ NS_IMETHODIMP GExternalProtocolService::LoadUrl(nsIURI *aURL)
 
 	return NS_OK;
 }
+
+#endif /* MOZILLA_SNAPSHOT < 12 */
-- 
cgit v1.2.3