diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-11-20 04:13:44 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-11-20 04:13:44 +0800 |
| commit | b0e668237680c11a5e3189d367ea1dbc7544d130 (patch) | |
| tree | e1414d4016b9712fa5c5415ffc3b8b2404fc5c45 /embed | |
| parent | c98367a38ddb3af23365caa49a0684e7ba7750ef (diff) | |
| download | gsoc2013-epiphany-b0e668237680c11a5e3189d367ea1dbc7544d130.tar gsoc2013-epiphany-b0e668237680c11a5e3189d367ea1dbc7544d130.tar.gz gsoc2013-epiphany-b0e668237680c11a5e3189d367ea1dbc7544d130.tar.bz2 gsoc2013-epiphany-b0e668237680c11a5e3189d367ea1dbc7544d130.tar.lz gsoc2013-epiphany-b0e668237680c11a5e3189d367ea1dbc7544d130.tar.xz gsoc2013-epiphany-b0e668237680c11a5e3189d367ea1dbc7544d130.tar.zst gsoc2013-epiphany-b0e668237680c11a5e3189d367ea1dbc7544d130.zip | |
Add --disable-filepicker to use when the mozilla build itself has native
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.
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/mozilla/Makefile.am | 8 | ||||
| -rw-r--r-- | embed/mozilla/MozRegisterComponents.cpp | 14 |
2 files changed, 17 insertions, 5 deletions
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, |