From 6a3082a962422d0d15b25914eaa3cbb17443d7ef Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Silva Date: Thu, 14 Apr 2011 12:49:20 -0300 Subject: Rely on WebKit doing the check for mixed symbols WebKit 1.4.0 checks if symbols are being mixed before loading a plugin. That is more robust, so we should rely on it. Bug #647096 --- embed/ephy-embed-single.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'embed/ephy-embed-single.c') diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c index 3fd58aa3b..2353a122b 100644 --- a/embed/ephy-embed-single.c +++ b/embed/ephy-embed-single.c @@ -483,8 +483,6 @@ ephy_embed_single_initialize (EphyEmbedSingle *single) char *filename; char *cookie_policy; char *cache_dir; - WebKitWebPluginDatabase* database; - GSList *list, *p; EphyEmbedSinglePrivate *priv = single->priv; /* Initialise nspluginwrapper's plugins if available */ @@ -548,18 +546,6 @@ ephy_embed_single_initialize (EphyEmbedSingle *single) soup_session_add_feature_by_type (session, SOUP_TYPE_PASSWORD_MANAGER_GNOME); #endif - /* Disable Flash by default, since it uses GTK+2.x and we can't mix - * it in our GTK+3.x process */ - database = webkit_get_web_plugin_database (); - list = webkit_web_plugin_database_get_plugins (database); - for (p = list; p; p = p->next) { - WebKitWebPlugin *plugin = WEBKIT_WEB_PLUGIN (p->data); - if (g_strcmp0 (webkit_web_plugin_get_name (plugin), "Shockwave Flash") == 0) - webkit_web_plugin_set_enabled (plugin, FALSE); - } - - webkit_web_plugin_database_plugins_list_free (list); - return TRUE; } -- cgit