diff options
| author | Marco Pesenti Gritti <marco@gnome.org> | 2004-10-07 11:15:47 +0000 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2004-10-07 11:15:47 +0000 |
| commit | 253d79513df2640b3753024183d6881a18308649 (patch) | |
| tree | 5190b3eee0ed3f72c07d022500955c50e392cfc0 | |
| parent | d96f2b25fffa651288bf6c72514f8e71d2dc7b3c (diff) | |
| download | epiphany-253d79513df2640b3753024183d6881a18308649.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | embed/mozilla/Makefile.am | 1 | ||||
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 18 |
4 files changed, 32 insertions, 0 deletions
@@ -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-07 Christian Persch <chpe@cvs.gnome.org> * lib/ephy-file-chooser.c: diff --git a/configure.in b/configure.in index 8f07f594c..7ec87f662 100644 --- a/configure.in +++ b/configure.in @@ -158,6 +158,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 08d0995b8..e6af11890 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; @@ -461,6 +478,7 @@ static gboolean init_services (MozillaEmbedSingle *single) { /* Pre initialization */ + mozilla_init_plugin_path (); mozilla_init_home (); mozilla_init_profile (); |