Add --disable-filepicker to use when the mozilla build itself has native

2004-11-19  Christian Persch  <chpe@cvs.gnome.org>

	* configure.in:
	* embed/mozilla/Makefile.am:
	* embed/mozilla/MozRegisterComponents.cpp:

	Add --disable-filepicker to use when the mozilla build itself has
        native gtk+ filepicker.

4 files changed, 39 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 976080ca8..98da489c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-11-19  Christian Persch  <chpe@cvs.gnome.org>
+
+	* configure.in:
+	* embed/mozilla/Makefile.am:
+	* embed/mozilla/MozRegisterComponents.cpp:
+
+	Add --disable-filepicker to use when the mozilla build itself has
+        native gtk+ filepicker.
+
 2004-11-18  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/mozilla/ContentHandler.cpp:
diff --git a/configure.in b/configure.in
index 468f227bd..57c20175c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([GNOME Web browser], [1.4.5.90],
+AC_INIT([GNOME Web browser], [1.4.6],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
 
 GNOME_COMMON_INIT
@@ -375,6 +375,18 @@ fi
 MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
 AC_SUBST(MOZILLA_WARN_CXXFLAGS)
 
+AC_MSG_CHECKING([whether to enable native gtk+ filepicker])
+AC_ARG_ENABLE([filepicker],
+	AS_HELP_STRING([--enable-filepicker],[Whether to enable the gtk+ native filepicker; not neede when the mozilla build itself has native gtk+ filepicker enabled (default:enabled)]),
+	[filepicker=$enableval],
+	[filepicker=yes])
+AC_MSG_RESULT([$filepicker])
+
+AM_CONDITIONAL([ENABLE_FILEPICKER],[test "x$filepicker" = "xyes"])
+if test "x$filepicker" = "xyes"; then
+  AC_DEFINE([ENABLE_FILEPICKER],[1],[Define to enable the native filepicker])
+fi
+
 dnl *******************************
 dnl Internationalization
 dnl ******************************* 
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index 747be8078..029956db0 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -64,8 +64,6 @@ libephymozillaembed_la_SOURCES = 	\
 	EphyUtils.h			\
 	EventContext.cpp                \
 	EventContext.h                  \
-	FilePicker.cpp			\
-	FilePicker.h                    \
 	GlobalHistory.cpp               \
 	GlobalHistory.h                 \
 	GtkNSSClientAuthDialogs.cpp	\
@@ -94,3 +92,9 @@ libephymozillaembed_la_SOURCES = 	\
 	mozilla-embed-single.h	        \
 	mozilla-notifiers.cpp		\
 	mozilla-notifiers.h
+
+if ENABLE_FILEPICKER
+libephymozillaembed_la_SOURCES += 	\
+	FilePicker.cpp			\
+	FilePicker.h
+endif
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index fdb2ae96f..9643c9e93 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -26,13 +26,16 @@
 #endif
 
 #include "ContentHandler.h"
-#include "FilePicker.h"
 #include "GlobalHistory.h"
 #include "PrintingPromptService.h"
 #include "MozDownload.h"
 #include "EphyAboutRedirector.h"
 #include "EphyContentPolicy.h"
 
+#ifdef ENABLE_FILEPICKER
+#include "FilePicker.h"
+#endif
+
 #ifdef HAVE_MOZILLA_PSM
 #include "GtkNSSClientAuthDialogs.h"
 #include "GtkNSSDialogs.h"
@@ -51,13 +54,16 @@
 #include <glib/gmessages.h>
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(EphyAboutRedirector)
-NS_GENERIC_FACTORY_CONSTRUCTOR(MozDownload)	
-NS_GENERIC_FACTORY_CONSTRUCTOR(GFilePicker)
+NS_GENERIC_FACTORY_CONSTRUCTOR(MozDownload)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GContentHandler)
 NS_GENERIC_FACTORY_CONSTRUCTOR(MozGlobalHistory)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GPrintingPromptService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(EphyContentPolicy)
 
+#ifdef ENABLE_FILEPICKER
+NS_GENERIC_FACTORY_CONSTRUCTOR(GFilePicker)
+#endif
+
 #ifdef HAVE_MOZILLA_PSM
 NS_GENERIC_FACTORY_CONSTRUCTOR(GtkNSSClientAuthDialogs)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GtkNSSDialogs)
@@ -88,12 +94,14 @@ static const nsModuleComponentInfo sAppComps[] = {
 		NS_DOWNLOAD_CONTRACTID,
 		MozDownloadConstructor
 	},
+#ifdef ENABLE_FILEPICKER
 	{
 		G_FILEPICKER_CLASSNAME,
 		G_FILEPICKER_CID,
 		G_FILEPICKER_CONTRACTID,
 		GFilePickerConstructor
 	},
+#endif
 #ifdef HAVE_MOZILLA_PSM
 	{
 		GTK_NSSCLIENTAUTHDIALOGS_CLASSNAME,