Test if plugins are redundant instead of skipping them all

1 files changed, 32 insertions, 1 deletions

diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index d7a8a172..46644360 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -596,6 +596,8 @@ midori_web_settings_has_plugin_support (void)
 /**
  * midori_web_settings_skip_plugin:
  *
+ * Tests if a plugin is redundant
+ *
  * Returns: %TRUE if the passed plugin shouldn't be shown in UI listings.
  *
  * Since: 0.5.1
@@ -603,7 +605,36 @@ midori_web_settings_has_plugin_support (void)
 gboolean
 midori_web_settings_skip_plugin (const gchar* path)
 {
-    return !path || strstr (path, "npwrapper.") || strstr (path, "plugins-wrapped");
+    static GHashTable* plugins = NULL;
+    gchar* basename = NULL;
+    gchar* plugin_path = NULL;
+
+    if (!path)
+        return TRUE;
+
+    if (!plugins)
+        plugins = g_hash_table_new (g_str_hash,  g_str_equal);
+
+    basename = g_path_get_basename (path);
+
+    plugin_path = g_hash_table_lookup (plugins, basename);
+    if (g_strcmp0 (path, plugin_path) == 0)
+    {
+        return FALSE;
+    }
+
+    if (plugin_path != NULL)
+    {
+        g_free (basename);
+
+        return TRUE;
+    }
+
+    g_hash_table_insert (plugins, basename, g_strdup (path));
+
+    /* Note: do not free basename */
+
+    return FALSE;
 }
 
 /**