[epiphany] Revert "Restore enable-plugins setting, hidden and off by default"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit da85c2e2054b44a2fad3d95d312fca225cb900ab
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Thu Oct 27 20:03:57 2016 -0500

    Revert "Restore enable-plugins setting, hidden and off by default"
    
    This reverts commit b5914109106d3fdc760a690195651957a38d04d7.

 data/org.gnome.epiphany.gschema.xml |    4 ----
 embed/ephy-embed-prefs.c            |    5 +----
 lib/ephy-prefs.h                    |    1 -
 3 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index f1c9f24..c84318d 100644
--- a/data/org.gnome.epiphany.gschema.xml
+++ b/data/org.gnome.epiphany.gschema.xml
@@ -156,10 +156,6 @@
                        <summary>Allow popups</summary>
                        <description>Allow sites to open new windows using JavaScript (if JavaScript is 
enabled).</description>
                </key>
-               <key type="b" name="enable-plugins">
-                       <default>false</default>
-                       <summary>Enable deprecated NPAPI plugins.</summary>
-               </key>
                <key type="b" name="enable-webgl">
                        <default>true</default>
                        <summary>Enable WebGL</summary>
diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c
index c5701e9..7c6f217 100644
--- a/embed/ephy-embed-prefs.c
+++ b/embed/ephy-embed-prefs.c
@@ -555,6 +555,7 @@ ephy_embed_prefs_init (gpointer user_data)
   webkit_settings = webkit_settings_new_with_settings ("enable-developer-extras", TRUE,
                                                        "enable-fullscreen", TRUE,
                                                        "enable-javascript", TRUE,
+                                                       "enable-plugins", FALSE,
                                                        "enable-site-specific-quirks", TRUE,
                                                        "enable-dns-prefetching", TRUE,
                                                        "javascript-can-open-windows-automatically", TRUE,
@@ -592,10 +593,6 @@ ephy_embed_prefs_init (gpointer user_data)
                    webkit_settings, "enable-caret-browsing",
                    G_SETTINGS_BIND_GET);
   g_settings_bind (EPHY_SETTINGS_WEB,
-                   EPHY_PREFS_WEB_ENABLE_PLUGINS,
-                   webkit_settings, "enable-plugins",
-                   G_SETTINGS_BIND_GET);
-  g_settings_bind (EPHY_SETTINGS_WEB,
                    EPHY_PREFS_WEB_FONT_MIN_SIZE,
                    webkit_settings, "minimum-font-size",
                    G_SETTINGS_BIND_GET);
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index ef93c27..2283e28 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -76,7 +76,6 @@ typedef enum
 #define EPHY_PREFS_WEB_MONOSPACE_FONT        "monospace-font"
 #define EPHY_PREFS_WEB_ENABLE_USER_CSS       "enable-user-css"
 #define EPHY_PREFS_WEB_ENABLE_POPUPS         "enable-popups"
-#define EPHY_PREFS_WEB_ENABLE_PLUGINS        "enable-plugins"
 #define EPHY_PREFS_WEB_ENABLE_SPELL_CHECKING "enable-spell-checking"
 #define EPHY_PREFS_WEB_ENABLE_WEBGL          "enable-webgl"
 #define EPHY_PREFS_WEB_ENABLE_WEBAUDIO       "enable-webaudio"