reviewed by: Christian Persch <chpe@cvs.gnome.org>

2004-10-07  Marco Pesenti Gritti  <marco@gnome.org>

        reviewed by: Christian Persch  <chpe@cvs.gnome.org>

        * configure.ac:
        * embed/mozilla/Makefile.am:
        * embed/mozilla/mozilla-embed-single.cpp:

        Initialize plugins path env var for backward compatibility

4 files changed, 32 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 69ae4fe43..eae9dbb3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-10-07  Marco Pesenti Gritti  <marco@gnome.org>
+
+	reviewed by: Christian Persch  <chpe@cvs.gnome.org>
+
+	* configure.ac:
+	* embed/mozilla/Makefile.am:
+	* embed/mozilla/mozilla-embed-single.cpp:
+
+	Initialize plugins path env var for backward compatibility
+
 2004-10-06  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/ephy-embed.h:
diff --git a/configure.ac b/configure.ac
index ae8463421..8250b6d4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,6 +175,9 @@ AC_SUBST(MOZILLA_INCLUDE_ROOT)
 MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA-gtkmozembed`"
 AC_SUBST(MOZILLA_HOME)
 
+MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $MOZILLA-gtkmozembed`"
+AC_SUBST(MOZILLA_PREFIX)
+
 dnl *************************************************************************
 dnl This is from Mozilla's configure.in. They set almost all the config stuff
 dnl they need in mozilla-config.h Except for this compiler flag, which can't
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index 1b83bfa1c..58ca89e96 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -34,6 +34,7 @@ INCLUDES = \
 	$(EPIPHANY_DEPENDENCY_CFLAGS) 			\
 	-DSHARE_DIR=\"$(pkgdatadir)\"   		\
 	-DMOZILLA_HOME=\"$(MOZILLA_HOME)\"		\
+	-DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\"		\
 	-DALLOW_PRIVATE_API
 
 if MAINTAINER_MODE
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 59a8cb00e..94f3123e3 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -321,6 +321,23 @@ mozilla_embed_single_new_window_orphan_cb (GtkMozEmbedSingle *embed,
 }
 
 static void
+mozilla_init_plugin_path ()
+{
+	const char *user_path;
+	char *new_path;
+
+	user_path = g_getenv ("MOZ_PLUGIN_PATH");
+	new_path = g_strconcat (user_path ? user_path : "",
+				user_path ? ":" : "",
+				MOZILLA_PREFIX "/lib/mozilla/plugins:"
+				MOZILLA_HOME "/plugins",
+				NULL);
+
+	g_setenv ("MOZ_PLUGIN_PATH", new_path, TRUE);
+	g_free (new_path);
+}
+
+static void
 mozilla_init_single (MozillaEmbedSingle *mes)
 {	
 	GtkMozEmbedSingle *single;
@@ -463,6 +480,7 @@ static gboolean
 init_services (MozillaEmbedSingle *single)
 {
 	/* Pre initialization */
+	mozilla_init_plugin_path ();
 	mozilla_init_home ();
 	mozilla_init_profile ();