Updating branch refs/heads/master
to 211e5314fbd356803dc1f19e187edea7caaf7a0d (commit)
from 4d422777f7d310f8a4e3a94f3d1377c344d0389e (commit)
commit 211e5314fbd356803dc1f19e187edea7caaf7a0d
Author: Christian Dywan <[email protected]>
Date: Thu Nov 18 20:52:53 2010 +0100
Enable or disable Java applet tag with plugins
midori/midori-websettings.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index 4aa20e7..068624c 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -1438,8 +1438,12 @@ midori_web_settings_set_property (GObject* object,
g_value_get_boolean (value), NULL);
break;
case PROP_ENABLE_PLUGINS:
- g_object_set (web_settings, "WebKitWebSettings::enable-plugins",
- g_value_get_boolean (value), NULL);
+ g_object_set (web_settings,
+ "WebKitWebSettings::enable-plugins", g_value_get_boolean (value),
+ #if WEBKIT_CHECK_VERSION (1, 1, 22)
+ "enable-java-applet", g_value_get_boolean (value),
+ #endif
+ NULL);
break;
case PROP_ENABLE_DEVELOPER_EXTRAS:
g_object_set (web_settings,
"WebKitWebSettings::enable-developer-extras",
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
