From 24b71aa8ac7de8dd140092705bb7cc439f6b3309 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Wed, 10 May 2006 18:07:03 +0000
Subject: Drop support for gecko 1.7.

2006-05-10  Christian Persch  <chpe@cvs.gnome.org>

	* configure.ac:
	* data/glade/prefs-dialog.glade:
	* embed/ephy-favicon-cache.c: (ephy_favicon_cache_get):
	* embed/mozilla/AutoJSContextStack.cpp:
	* embed/mozilla/ContentHandler.cpp:
	* embed/mozilla/ContentHandler.h:
	* embed/mozilla/EphyAboutModule.cpp:
	* embed/mozilla/EphyAboutModule.h:
	* embed/mozilla/EphyBrowser.cpp:
	* embed/mozilla/EphyBrowser.h:
	* embed/mozilla/EphyContentPolicy.cpp:
	* embed/mozilla/EphyContentPolicy.h:
	* embed/mozilla/EphyDirectoryProvider.cpp:
	* embed/mozilla/EphyFind.cpp:
	* embed/mozilla/EphyFind.h:
	* embed/mozilla/EphyHeaderSniffer.cpp:
	* embed/mozilla/EphyHeaderSniffer.h:
	* embed/mozilla/EphyHistoryListener.cpp:
	* embed/mozilla/EphyHistoryListener.h:
	* embed/mozilla/EphyPromptService.cpp:
	* embed/mozilla/EphySidebar.cpp:
	* embed/mozilla/EphySidebar.h:
	* embed/mozilla/EphySingle.cpp:
	* embed/mozilla/EphySingle.h:
	* embed/mozilla/EphyUtils.cpp:
	* embed/mozilla/EphyUtils.h:
	* embed/mozilla/EventContext.cpp:
	* embed/mozilla/EventContext.h:
	* embed/mozilla/FilePicker.cpp:
	* embed/mozilla/FilePicker.h:
	* embed/mozilla/GlobalHistory.cpp:
	* embed/mozilla/GlobalHistory.h:
	* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
	* embed/mozilla/GtkNSSDialogs.cpp:
	* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
	* embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:
	* embed/mozilla/GtkNSSSecurityWarningDialogs.h:
	* embed/mozilla/Makefile.am:
	* embed/mozilla/MozDownload.cpp:
	* embed/mozilla/MozDownload.h:
	* embed/mozilla/MozRegisterComponents.cpp:
	* embed/mozilla/MozRegisterComponents.h:
	* embed/mozilla/MozillaPrivate.cpp:
	* embed/mozilla/MozillaPrivate.h:
	* embed/mozilla/PrintingPromptService.cpp:
	* embed/mozilla/PrintingPromptService.h:
	* embed/mozilla/mozilla-download.cpp:
	* embed/mozilla/mozilla-download.h:
	* embed/mozilla/mozilla-embed-event.cpp:
	* embed/mozilla/mozilla-embed-event.h:
	* embed/mozilla/mozilla-embed-find.cpp:
	* embed/mozilla/mozilla-embed-find.h:
	* embed/mozilla/mozilla-embed-persist.cpp:
	* embed/mozilla/mozilla-embed-persist.h:
	* embed/mozilla/mozilla-embed-single.cpp:
	* embed/mozilla/mozilla-embed.cpp:
	* embed/mozilla/mozilla-embed.h:
	* embed/mozilla/mozilla-notifiers.cpp:
	* embed/mozilla/mozilla-notifiers.h:
	* embed/mozilla/mozilla-x509-cert.cpp:
	* embed/mozilla/mozilla-x509-cert.h:
	* lib/ephy-gui.c:
	* lib/ephy-gui.h:
	* lib/ephy-langs.c:
	* m4/gecko.m4:
	* src/ephy-window.c: (sync_tab_security):
	* src/prefs-dialog.c: (prefs_dialog_init):

	Drop support for gecko 1.7.
---
 embed/mozilla/Makefile.am | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

(limited to 'embed/mozilla/Makefile.am')

diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index f7285d45e..d89299876 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -7,6 +7,8 @@ libephymozillaembed_la_SOURCES = 	\
 	ContentHandler.h		\
 	EphyAboutModule.cpp		\
 	EphyAboutModule.h		\
+	EphyBadCertRejector.cpp		\
+	EphyBadCertRejector.h		\
 	EphyContentPolicy.cpp		\
 	EphyContentPolicy.h		\
 	EphyHeaderSniffer.cpp		\
@@ -78,20 +80,14 @@ libephymozillaembed_la_SOURCES += \
 	mozilla-x509-cert.h
 endif
 
-if HAVE_GECKO_1_8
-libephymozillaembed_la_SOURCES += \
-	EphyBadCertRejector.cpp		\
-	EphyBadCertRejector.h
-
 if HAVE_MOZILLA_TOOLKIT
 libephymozillaembed_la_SOURCES += \
-	EphyDirectoryProvider.cpp	\
+	EphyDirectoryProvider.cpp       \
 	EphyDirectoryProvider.h
 endif
 
-endif
-
 mozilla_include_subdirs = \
+	.			\
 	caps			\
 	chardet			\
 	chrome			\
@@ -103,6 +99,7 @@ mozilla_include_subdirs = \
 	exthandler		\
 	fastfind		\
 	helperAppDlg		\
+	find			\
 	gfx			\
 	gtkembedmoz		\
 	history			\
@@ -115,6 +112,7 @@ mozilla_include_subdirs = \
 	passwordmgr		\
 	pipboot			\
 	pipnss			\
+	pref			\
 	shistory		\
 	sidebar			\
 	uriloader		\
@@ -128,17 +126,10 @@ mozilla_include_subdirs = \
 	xpcom			\
 	xpconnect
 
-# Grr, damn gentoo has a dodgy header layout
-# http://bugs.gentoo.org/show_bug.cgi?id=100804
-mozilla_include_subdirs += \
-	find			\
-	pref
-
 libephymozillaembed_la_CPPFLAGS = \
 	-I$(top_srcdir)/lib	    		\
 	-I$(top_srcdir)/embed	    		\
 	-I$(top_srcdir)		    		\
-	-I$(MOZILLA_INCLUDE_ROOT)		\
 	$(addprefix -I$(MOZILLA_INCLUDE_ROOT)/,$(mozilla_include_subdirs))	\
 	-DSHARE_DIR=\"$(pkgdatadir)\"   	\
 	-DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\"		\
-- 
cgit v1.2.3