summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2019-12-17 22:09:41 +0000
committerVincent Sanders <vince@kyllikki.org>2019-12-17 22:09:41 +0000
commit918b1d0fed158fdb48a61536ff7aec7495916298 (patch)
tree99a6858b9d23d4ab4b072f2088a7a965c0631876
parent0e304aba42ca904c49ea9190fa0313f858b12385 (diff)
downloadnetsurf-918b1d0fed158fdb48a61536ff7aec7495916298.tar.gz
netsurf-918b1d0fed158fdb48a61536ff7aec7495916298.tar.bz2
remove long unused plugin option from gtk and monkey
-rw-r--r--docs/netsurf-fb.13
-rw-r--r--docs/netsurf-gtk.12
-rw-r--r--frontends/gtk/options.h3
-rw-r--r--frontends/gtk/preferences.c3
-rw-r--r--frontends/gtk/res/options.gtk2.ui20
-rw-r--r--frontends/gtk/res/options.gtk3.ui24
-rw-r--r--frontends/monkey/options.h1
-rw-r--r--test/data/Choices1
-rw-r--r--test/data/Choices-all1
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
@@ -1143,22 +1143,6 @@
</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>
<property name="visible">True</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
@@ -983,26 +983,6 @@
</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>
<property name="use_action_appearance">False</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