Drop non-toolkit gecko support too.

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

	* configure.ac:
	* embed/mozilla/Makefile.am:
	* embed/mozilla/mozilla-embed-single.cpp:

	Drop non-toolkit gecko support too.

4 files changed, 14 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 1b5e5cb5b..521703936 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-05-10  Christian Persch  <chpe@cvs.gnome.org>
 
+	* configure.ac:
+	* embed/mozilla/Makefile.am:
+	* embed/mozilla/mozilla-embed-single.cpp:
+
+	Drop non-toolkit gecko support too.
+
+2006-05-10  Christian Persch  <chpe@cvs.gnome.org>
+
 	* embed/mozilla/EphySidebar.cpp:
 
 	Another API change! Thank you, mozilla!
diff --git a/configure.ac b/configure.ac
index 671909a40..59d262cdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,14 +179,13 @@ AC_SUBST([MOZILLA_HOME])
 AC_SUBST([MOZILLA_PREFIX])
 AC_SUBST([MOZILLA_EXTRA_LIBS])
 
-# if test "$gecko_cv_gecko_flavour" != "toolkit"; then
-#	AC_MSG_ERROR(["$gecko_cv_gecko_flavour" flavoured geckos aren't tasty enough!])
-# fi
+if test "$gecko_cv_gecko_flavour" != "toolkit"; then
+	AC_MSG_ERROR(["$gecko_cv_gecko_flavour" flavoured geckos aren't tasty enough!])
+fi
 
 case "$gecko_cv_gecko" in
 xulrunner) min_version=1.8 ;;
 *firefox) min_version=1.5 ;;
-seamonkey) min_version=1.0 ;;
 *) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;
 esac
 
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index d89299876..2e0063272 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -11,6 +11,8 @@ libephymozillaembed_la_SOURCES = 	\
 	EphyBadCertRejector.h		\
 	EphyContentPolicy.cpp		\
 	EphyContentPolicy.h		\
+	EphyDirectoryProvider.cpp       \
+	EphyDirectoryProvider.h		\
 	EphyHeaderSniffer.cpp		\
 	EphyHeaderSniffer.h		\
 	EphyBrowser.cpp                 \
@@ -80,12 +82,6 @@ libephymozillaembed_la_SOURCES += \
 	mozilla-x509-cert.h
 endif
 
-if HAVE_MOZILLA_TOOLKIT
-libephymozillaembed_la_SOURCES += \
-	EphyDirectoryProvider.cpp       \
-	EphyDirectoryProvider.h
-endif
-
 mozilla_include_subdirs = \
 	.			\
 	caps			\
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 6203c9117..0c90f6445 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -89,14 +89,11 @@
 #include "mozilla-x509-cert.h"
 
 #include "EphyBrowser.h"
+#include "EphyDirectoryProvider.h"
 #include "EphySingle.h"
 #include "EphyUtils.h"
 #include "MozRegisterComponents.h"
 
-#ifdef HAVE_MOZILLA_TOOLKIT
-#include "EphyDirectoryProvider.h"
-#endif
-
 #include "mozilla-embed-single.h"
 
 #define MOZILLA_PROFILE_DIR  "/mozilla"
@@ -604,12 +601,10 @@ impl_init (EphyEmbedSingle *esingle)
 	gtk_moz_embed_set_comp_path (MOZILLA_HOME);
 #endif
 
-#ifdef HAVE_MOZILLA_TOOLKIT
 	nsCOMPtr<nsIDirectoryServiceProvider> dp = new EphyDirectoryProvider ();
 	if (!dp) return FALSE;
 
 	gtk_moz_embed_set_directory_service_provider (dp);
-#endif
 
 	/* Fire up the beast */
 	gtk_moz_embed_push_startup ();