aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--configure.ac12
-rw-r--r--embed/mozilla/Makefile.am8
-rw-r--r--embed/mozilla/MozRegisterComponents.cpp14
4 files changed, 38 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d5df153e7..c26f9a554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-11-19 Christian Persch <chpe@cvs.gnome.org>
+
+ * configure.ac:
+ * 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>
* src/ephy-extensions-manager.c:
diff --git a/configure.ac b/configure.ac
index f53df1038..1a4fd85c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -394,6 +394,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 fba9f2ffc..2da1c541a 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -24,13 +24,16 @@
#include "config.h"
#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"
@@ -49,13 +52,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)
@@ -86,12 +92,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,