Updating branch refs/heads/master
to 0f7baae1938a7d413ba77449f9d4b92844b98884 (commit)
from c32b685289661ae1b83355c566120e8bd3437240 (commit)
commit 0f7baae1938a7d413ba77449f9d4b92844b98884
Author: Christian Dywan <christ...@twotoasts.de>
Date: Thu Apr 4 23:53:11 2013 +0200
enable-java-applet becomes enable-java in WebKit2
midori/midori-websettings.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index bcc3c62..985dc42 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -1009,7 +1009,9 @@ midori_web_settings_set_property (GObject* object,
case PROP_ENABLE_PLUGINS:
g_object_set (web_settings,
WEB_SETTINGS_STRING ("enable-plugins"), g_value_get_boolean (value),
- #if WEBKIT_CHECK_VERSION (1, 1, 22)
+ #if HAVE_WEBKIT2
+ "enable-java", g_value_get_boolean (value),
+ #elif WEBKIT_CHECK_VERSION (1, 1, 22)
"enable-java-applet", g_value_get_boolean (value),
#endif
NULL);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
