From 00f6be2493945f3b6c63d30cf3a7dd8bf1901071 Mon Sep 17 00:00:00 2001 From: Chrhristian Persch Date: Sat, 14 Jan 2006 22:50:27 +0000 Subject: Only use the directory service provider on gecko 1.8; gecko 1.7 uses a 2006-01-14 Chrhristian Persch * embed/mozilla/Makefile.am: * embed/mozilla/mozilla-embed-single.cpp: Only use the directory service provider on gecko 1.8; gecko 1.7 uses a different method to register chrome. --- ChangeLog | 8 ++++++++ embed/mozilla/Makefile.am | 13 +++++++------ embed/mozilla/mozilla-embed-single.cpp | 6 +++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index eeba0a47b..b4bd65886 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-01-14 Chrhristian Persch + + * embed/mozilla/Makefile.am: + * embed/mozilla/mozilla-embed-single.cpp: + + Only use the directory service provider on gecko 1.8; + gecko 1.7 uses a different method to register chrome. + 2006-01-14 Crispin Flowerday * embed/mozilla/mozilla-embed-single.cpp (init_services): diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am index 3e7eced11..f5504128b 100644 --- a/embed/mozilla/Makefile.am +++ b/embed/mozilla/Makefile.am @@ -58,12 +58,6 @@ libephymozillaembed_la_SOURCES += \ FilePicker.h endif -if HAVE_MOZILLA_TOOLKIT -libephymozillaembed_la_SOURCES += \ - EphyDirectoryProvider.cpp \ - EphyDirectoryProvider.h -endif - if HAVE_MOZILLA_PSM libephymozillaembed_la_SOURCES += \ GtkNSSClientAuthDialogs.cpp \ @@ -86,6 +80,13 @@ if HAVE_GECKO_1_8 libephymozillaembed_la_SOURCES += \ EphyBadCertRejector.cpp \ EphyBadCertRejector.h + +if HAVE_MOZILLA_TOOLKIT +libephymozillaembed_la_SOURCES += \ + EphyDirectoryProvider.cpp \ + EphyDirectoryProvider.h +endif + endif mozilla_include_subdirs = \ diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index d904bda4f..05cdfbf18 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -73,7 +73,7 @@ #include #include -#ifdef HAVE_MOZILLA_TOOLKIT +#if defined(HAVE_MOZILLA_TOOLKIT) && defined(HAVE_GECKO_1_8) #include "EphyDirectoryProvider.h" #endif @@ -533,12 +533,12 @@ init_services (MozillaEmbedSingle *single) /* Set mozilla binary path */ gtk_moz_embed_set_comp_path (MOZILLA_HOME); -#ifdef HAVE_MOZILLA_TOOLKIT +#if defined(HAVE_MOZILLA_TOOLKIT) && defined(HAVE_GECKO_1_8) + nsCOMPtr dp = new EphyDirectoryProvider (); if (!dp) return FALSE; gtk_moz_embed_set_directory_service_provider (dp); - dp = nsnull; #endif /* Fire up the beast */ -- cgit v1.2.3