[Xfce4-commits] <midori:master> Enable netscape plugins on win32

[Christian Dywan]

Updating branch refs/heads/master
         to db37fbcc744669f611be3e426a5d9d80d331c521 (commit)
       from b45222111b78ba63c65a69f4efe8dd4aadb7e019 (commit)

commit db37fbcc744669f611be3e426a5d9d80d331c521
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Mon Aug 6 23:36:02 2012 +0200

    Enable netscape plugins on win32

 midori/midori-websettings.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index 784f63a..e1768b3 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -1302,7 +1302,7 @@ midori_web_settings_finalize (GObject* object)
 gboolean
 midori_web_settings_has_plugin_support (void)
 {
-    #ifdef G_OS_WIN32
+    #if !WEBKIT_CHECK_VERSION (1, 8, 2) && defined G_OS_WIN32
     return FALSE;
     #else
     return g_getenv ("MIDORI_UNARMED") == NULL