diff -up epiphany-2.20.2/embed/mozilla/mozilla-embed-single.cpp.wrapped-plugins epiphany-2.20.2/embed/mozilla/mozilla-embed-single.cpp
--- epiphany-2.20.2/embed/mozilla/mozilla-embed-single.cpp.wrapped-plugins 2007-11-27 00:36:42.000000000 +0100
+++ epiphany-2.20.2/embed/mozilla/mozilla-embed-single.cpp 2007-11-29 11:38:19.000000000 +0100
@@ -294,6 +296,19 @@ mozilla_init_plugin_add_unique_paths (GL
return list;
}
+static int
+mozilla_setup_wrapped_plugin (void)
+{
+ char *p_viewer = "/usr/bin/mozilla-plugin-config";
+ gboolean ret;
+
+ if(g_file_test(p_viewer, G_FILE_TEST_EXISTS) == FALSE)
+ return(FALSE);
+
+ ret = g_spawn_command_line_sync(p_viewer,NULL,NULL,NULL,NULL);
+ return(ret);
+}
+
static void
mozilla_init_plugin_path ()
{
@@ -307,8 +322,17 @@ mozilla_init_plugin_path ()
MOZILLA_PREFIX "/lib/mozilla/plugins");
list = mozilla_init_plugin_add_unique_path (list,
MOZILLA_HOME "/plugins");
- list = mozilla_init_plugin_add_unique_path (list,
- MOZILLA_NATIVE_PLUGINSDIR);
+ /* Note this only works if MOZILLA_NATIVE_PLUGINSDIR doesn't
+ * finish with a '/' */
+ if(mozilla_setup_wrapped_plugin()) {
+ list = mozilla_init_plugin_add_unique_path (list,
+ MOZILLA_NATIVE_PLUGINSDIR"-wrapped");
+ }
+ else {
+ list = mozilla_init_plugin_add_unique_path (list,
+ MOZILLA_NATIVE_PLUGINSDIR);
+ }
+
#ifdef HAVE_PRIVATE_PLUGINS
list = mozilla_init_plugin_add_unique_path (list, PLUGINDIR);
#endif