diff options
Diffstat (limited to 'embed/mozilla')
| -rw-r--r-- | embed/mozilla/Makefile.am | 8 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 7 |
2 files changed, 3 insertions, 12 deletions
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 (); |