Merge lp:~ivaldi/midori/skip-plugin into lp:midori

[André Stösel]

Test if plugins are redundant instead of skipping them all

[Cris Dywan (kalikiana)]

This finalley fixes the duplicate Google Talk plugins for me.

Small issue: please use TRUE/ FALSE in C code.

review: Needs Fixing

[lp:~ivaldi/midori/skip-plugin]

6246. By André Stösel on 2013-07-07

Fix coding style issues

[André Stösel (ivaldi)]

Oops, sorry, I'm guess I'm too used to vala ;)

fixed

[Cris Dywan (kalikiana)]

Thanks!

review: Approve

[Cris Dywan (kalikiana)]

Paweł, could you give it a spin? I recall your plugin paths are quite different to mine at least and I'd prefer a second review on this one.

[Paweł Forysiuk (tuxator)]

This seems to break listing in about:version (we probably hardcode same string skip there. Would be nice to see how it behaves on the systems where 64 bit plugins dirs is just a symlink to 32 bit one (i think it was ubuntu). Otherwise it seems to work. Cannot get flash to work witn gtk3 but it is probably unrelated to this change.

review: Needs Information

[André Stösel (ivaldi)]

Nice catch! Either the extension list or about:version works, but never both. I'll fix it.

[lp:~ivaldi/midori/skip-plugin]

6247. By André Stösel on 2013-07-07

Fixed bug which occurs when midori_web_settings_skip_plugin is called multiple times

[Paweł Forysiuk (tuxator)]

Nothing looks obviously wrong now and from mild testing it seems to work properly.

review: Approve

=== modified file 'midori/midori-websettings.c'
--- midori/midori-websettings.c	2013-06-19 20:20:05 +0000
+++ midori/midori-websettings.c	2013-07-07 13:17:26 +0000
@@ -596,6 +596,8 @@
 /**
  * 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 @@
 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;
 }
 
 /**