From 7ee5680874383d1d111ae3cd3dec10c5b4111385 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Sat, 14 Jan 2006 21:06:48 +0000
Subject: Add defines and automake conditional for toolkit flavour.

2006-01-14  Christian Persch  <chpe@cvs.gnome.org>

	* m4/gecko.m4:

	Add defines and automake conditional for toolkit flavour.

	* configure.ac:
	* data/Makefile.am:
	A data/chrome/.cvsignore:
	A data/chrome/Makefile.am:
	A data/chrome/brand.dtd.in:
	A data/chrome/brand.properties.in:
	A data/chrome/epiphany.manifest.in:

	Provide branding so mozilla dialogues don't show "Deer Park" or
	"Firefox" but "Epiphany" instead.

	* embed/mozilla/Makefile.am:
	A embed/mozilla/EphyDirectoryProvider.cpp:
	A embed/mozilla/EphyDirectoryProvider.h:
	* embed/mozilla/mozilla-embed-single.cpp:

	Add a directory service provider.
---
 embed/mozilla/mozilla-embed-single.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'embed/mozilla/mozilla-embed-single.cpp')

diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 447f3b4ff..f0675d355 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -36,6 +36,7 @@
 #include "glib.h"
 #include "ephy-debug.h"
 #include "gtkmozembed.h"
+#include "gtkmozembed_internal.h"
 #include "mozilla-embed.h"
 #include "ephy-file-helpers.h"
 #include "mozilla-notifiers.h"
@@ -72,6 +73,10 @@
 #include <nsILocalFile.h>
 #include <nsIURI.h>
 
+#ifdef HAVE_MOZILLA_TOOLKIT
+#include "EphyDirectoryProvider.h"
+#endif
+
 #ifdef HAVE_MOZILLA_PSM
 #include <nsIX509Cert.h>
 #include <nsIX509CertDB.h>
@@ -528,6 +533,20 @@ init_services (MozillaEmbedSingle *single)
 	/* Set mozilla binary path */
 	gtk_moz_embed_set_comp_path (MOZILLA_HOME);
 
+#ifdef HAVE_MOZILLA_TOOLKIT
+	EphyDirectoryProvider *dirProvider = new EphyDirectoryProvider ();
+	if (!dirProvider) return FALSE;
+
+	NS_ADDREF (dirProvider);
+	nsCOMPtr<nsIDirectoryServiceProvider> dp (do_QueryInterface (dirProvider));
+	NS_RELEASE (dirProvider);
+
+	if (!dp) return FALSE;
+
+	gtk_moz_embed_set_directory_service_provider (dp);
+	dp = nsnull;
+#endif
+
 	/* Fire up the beast */
 	gtk_moz_embed_push_startup ();
 
-- 
cgit v1.2.3