aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Noronha Silva <gns@gnome.org>2011-04-14 23:49:20 +0800
committerGustavo Noronha Silva <gns@gnome.org>2011-04-15 03:06:54 +0800
commit6a3082a962422d0d15b25914eaa3cbb17443d7ef (patch)
tree644ff0b54f6b1be8b9dba2f3aff546a7e066411e
parentff8e1b4af8c8af5afffbfd3f5b1d7a660300dba5 (diff)
downloadgsoc2013-epiphany-6a3082a962422d0d15b25914eaa3cbb17443d7ef.tar
gsoc2013-epiphany-6a3082a962422d0d15b25914eaa3cbb17443d7ef.tar.gz
gsoc2013-epiphany-6a3082a962422d0d15b25914eaa3cbb17443d7ef.tar.bz2
gsoc2013-epiphany-6a3082a962422d0d15b25914eaa3cbb17443d7ef.tar.lz
gsoc2013-epiphany-6a3082a962422d0d15b25914eaa3cbb17443d7ef.tar.xz
gsoc2013-epiphany-6a3082a962422d0d15b25914eaa3cbb17443d7ef.tar.zst
gsoc2013-epiphany-6a3082a962422d0d15b25914eaa3cbb17443d7ef.zip
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
-rw-r--r--configure.ac2
-rw-r--r--embed/ephy-embed-single.c14
2 files changed, 1 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac
index 88ac4ff30..07b047de5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,7 @@ LIBXML_REQUIRED=2.6.12
LIBXSLT_REQUIRED=1.1.7
LIBSTARTUP_NOTIFICATION_REQUIRED=0.5
DBUS_GLIB_REQUIRED=0.35
-WEBKIT_GTK_REQUIRED=1.3.13
+WEBKIT_GTK_REQUIRED=1.4.0
LIBSOUP_GNOME_REQUIRED=2.33.1
GNOME_KEYRING_REQUIRED=2.26.0
GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.0.1
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;
}