From 918b1d0fed158fdb48a61536ff7aec7495916298 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Tue, 17 Dec 2019 22:09:41 +0000
Subject: remove long unused plugin option from gtk and monkey

---
 docs/netsurf-fb.1                 |  3 ---
 docs/netsurf-gtk.1                |  2 --
 frontends/gtk/options.h           |  3 ---
 frontends/gtk/preferences.c       |  3 ---
 frontends/gtk/res/options.gtk2.ui | 20 ++------------------
 frontends/gtk/res/options.gtk3.ui | 24 ++----------------------
 frontends/monkey/options.h        |  1 -
 test/data/Choices                 |  1 -
 test/data/Choices-all             |  1 -
 9 files changed, 4 insertions(+), 54 deletions(-)

diff --git a/docs/netsurf-fb.1 b/docs/netsurf-fb.1
index e4c310075..a196fcfa0 100644
--- a/docs/netsurf-fb.1
+++ b/docs/netsurf-fb.1
@@ -332,9 +332,6 @@ button type
 .B \-\-disable_popups
 disable popups
 .TP
-.B \-\-disable_plugins
-disable plugins
-.TP
 .B \-\-history_age
 history age
 .TP
diff --git a/docs/netsurf-gtk.1 b/docs/netsurf-gtk.1
index 7b2f4f4f3..b2b97f779 100644
--- a/docs/netsurf-gtk.1
+++ b/docs/netsurf-gtk.1
@@ -225,8 +225,6 @@ Force tabs to always be show.
 button type
 .It Fl -disable_popups
 disable popups
-.It Fl -disable_plugins
-disable plugins
 .It Fl -history_age
 history age
 .It Fl -hover_urls
diff --git a/frontends/gtk/options.h b/frontends/gtk/options.h
index dad17f059..81457efc0 100644
--- a/frontends/gtk/options.h
+++ b/frontends/gtk/options.h
@@ -47,9 +47,6 @@ NSOPTION_INTEGER(button_type, 0)
 /* disallow popup windows */
 NSOPTION_BOOL(disable_popups, false)
 
-/* disable content plugins */
-NSOPTION_BOOL(disable_plugins, false)
-
 /* number of days to keep history data */
 NSOPTION_INTEGER(history_age, 0)
 
diff --git a/frontends/gtk/preferences.c b/frontends/gtk/preferences.c
index 3aaaa9026..5fe945073 100644
--- a/frontends/gtk/preferences.c
+++ b/frontends/gtk/preferences.c
@@ -412,9 +412,6 @@ TOGGLEBUTTON_SIGNALS(checkHideAdverts, block_advertisements)
 /* enable javascript */
 TOGGLEBUTTON_SIGNALS(checkEnableJavascript, enable_javascript)
 
-/* disable plugins */
-TOGGLEBUTTON_SIGNALS(checkDisablePlugins, disable_plugins)
-
 /* high quality image scaling */
 TOGGLEBUTTON_SIGNALS(checkResampleImages, render_resample)
 
diff --git a/frontends/gtk/res/options.gtk2.ui b/frontends/gtk/res/options.gtk2.ui
index a1162585d..f30abeb49 100644
--- a/frontends/gtk/res/options.gtk2.ui
+++ b/frontends/gtk/res/options.gtk2.ui
@@ -1142,22 +1142,6 @@
                                 <property name="position">2</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkDisablePlugins">
-                                <property name="label" translatable="yes">preferencesControlDisable</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="nsgtk_preferences_checkDisablePlugins_toggled" swapped="no"/>
-                                <signal name="realize" handler="nsgtk_preferences_checkDisablePlugins_realize" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
                             <child>
                               <object class="GtkCheckButton" id="checkResampleImages">
                                 <property name="label" translatable="yes">preferencesControlHigh</property>
@@ -1171,7 +1155,7 @@
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">True</property>
-                                <property name="position">4</property>
+                                <property name="position">3</property>
                               </packing>
                             </child>
                             <child>
@@ -1215,7 +1199,7 @@
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">True</property>
-                                <property name="position">5</property>
+                                <property name="position">4</property>
                               </packing>
                             </child>
                           </object>
diff --git a/frontends/gtk/res/options.gtk3.ui b/frontends/gtk/res/options.gtk3.ui
index 2a3516f09..b74846cb2 100644
--- a/frontends/gtk/res/options.gtk3.ui
+++ b/frontends/gtk/res/options.gtk3.ui
@@ -982,26 +982,6 @@
                                 <property name="position">2</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkCheckButton" id="checkDisablePlugins">
-                                <property name="label" translatable="yes">preferencesControlDisable</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="halign">start</property>
-                                <property name="use_action_appearance">False</property>
-                                <property name="xalign">0.5</property>
-                                <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="nsgtk_preferences_checkDisablePlugins_toggled" swapped="no"/>
-                                <signal name="realize" handler="nsgtk_preferences_checkDisablePlugins_realize" swapped="no"/>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">3</property>
-                              </packing>
-                            </child>
                             <child>
                               <object class="GtkCheckButton" id="checkResampleImages">
                                 <property name="label" translatable="yes">preferencesControlHigh</property>
@@ -1019,7 +999,7 @@
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">True</property>
-                                <property name="position">4</property>
+                                <property name="position">3</property>
                               </packing>
                             </child>
                             <child>
@@ -1064,7 +1044,7 @@
                               <packing>
                                 <property name="expand">True</property>
                                 <property name="fill">True</property>
-                                <property name="position">5</property>
+                                <property name="position">4</property>
                               </packing>
                             </child>
                           </object>
diff --git a/frontends/monkey/options.h b/frontends/monkey/options.h
index 57cce7e1f..a39e54b3f 100644
--- a/frontends/monkey/options.h
+++ b/frontends/monkey/options.h
@@ -31,7 +31,6 @@ NSOPTION_STRING(url_file, NULL)
 NSOPTION_BOOL(show_single_tab, false)
 NSOPTION_INTEGER(button_type, 0)
 NSOPTION_BOOL(disable_popups, false)
-NSOPTION_BOOL(disable_plugins, false)
 NSOPTION_INTEGER(history_age, 0)
 NSOPTION_BOOL(hover_urls, false)
 NSOPTION_BOOL(focus_new, false)
diff --git a/test/data/Choices b/test/data/Choices
index bd946f77b..439a67fdc 100644
--- a/test/data/Choices
+++ b/test/data/Choices
@@ -109,7 +109,6 @@ url_file:/home/vince/.netsurf/URLs
 show_single_tab:1
 button_type:1
 disable_popups:0
-disable_plugins:0
 history_age:0
 hover_urls:0
 focus_new:0
diff --git a/test/data/Choices-all b/test/data/Choices-all
index f2a6188c1..492cd3e7e 100644
--- a/test/data/Choices-all
+++ b/test/data/Choices-all
@@ -105,7 +105,6 @@ url_file:/home/vince/.netsurf/URLs
 show_single_tab:1
 button_type:1
 disable_popups:0
-disable_plugins:0
 history_age:0
 hover_urls:0
 focus_new:0
-- 
cgit v1.2.3