[Xfce4-commits] <midori:master> Have NS plugin manager honor has_plugin_support

[Christian Dywan]

Updating branch refs/heads/master
         to 7646e20001f6dbe324eb5862362f2fc3ca23eebd (commit)
       from aa149553d64cf1a54d4baa904e146e91ae06c972 (commit)

commit 7646e20001f6dbe324eb5862362f2fc3ca23eebd
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Mar 30 17:04:29 2013 +0100

    Have NS plugin manager honor has_plugin_support

 extensions/nsplugin-manager.vala |    3 +++
 midori/midori.vapi               |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/extensions/nsplugin-manager.vala b/extensions/nsplugin-manager.vala
index 27b1d13..2d769f0 100644
--- a/extensions/nsplugin-manager.vala
+++ b/extensions/nsplugin-manager.vala
@@ -57,6 +57,9 @@ namespace NSPlugins {
 
 public Katze.Array? extension_init () {
 #if HAVE_WEBKIT_1_3_8
+    if (!Midori.WebSettings.has_plugin_support ())
+        return null;
+
     var extensions = new Katze.Array( typeof (Midori.Extension));
     WebKit.WebPluginDatabase pdb = WebKit.get_web_plugin_database ();
     SList<WebKit.WebPlugin> plugins = pdb.get_plugins ();
diff --git a/midori/midori.vapi b/midori/midori.vapi
index ed7d67c..ed89134 100644
--- a/midori/midori.vapi
+++ b/midori/midori.vapi
@@ -221,6 +221,7 @@ namespace Midori {
         public WebSettings ();
         [NoAccessorMethod]
         public MidoriStartup load_on_startup { get; set; }
+        public static bool has_plugin_support ();
     }
 
     [CCode (cheader_filename = "midori/midori-websettings.h", cprefix = "MIDORI_STARTUP_")]