12:14 p.m.
Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/fb4f1d28ba4d2b0935ac5...
...commit
http://git.netsurf-browser.org/netsurf.git/commit/fb4f1d28ba4d2b0935ac56a...
...tree
http://git.netsurf-browser.org/netsurf.git/tree/fb4f1d28ba4d2b0935ac56a3d...
The branch, master has been updated
via fb4f1d28ba4d2b0935ac56a3d37ea9fa52c5de51 (commit)
via 55ba27c68f1664e8a6a356e45c6c9ce9c7bdded9 (commit)
via 3fdbef0566a4310dc2567c101b38e9c1667d883e (commit)
from fd510b27eee7d8d146ddf1a54a0a98b2ba61f27f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=fb4f1d28ba4d2b0935a...
commit fb4f1d28ba4d2b0935ac56a3d37ea9fa52c5de51
Author: John-Mark Bell <jmb(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fix parent pointer use after free in RISC OS dialog handling
diff --git a/frontends/riscos/dialog.c b/frontends/riscos/dialog.c
index 8a907eb..f0bcb59 100644
--- a/frontends/riscos/dialog.c
+++ b/frontends/riscos/dialog.c
@@ -335,12 +335,16 @@ void ro_gui_dialog_close(wimp_w close)
{
int i;
wimp_caret caret;
+ wimp_w parent = -1;
os_error *error;
/* Check if we're a persistent window */
for (i = 0; i < MAX_PERSISTENT; i++) {
if (persistent_dialog[i].dialog == close) {
/* We are => invalidate record */
+ if (persistent_dialog[i].parent != NULL) {
+ parent = persistent_dialog[i].parent;
+ }
persistent_dialog[i].parent = NULL;
persistent_dialog[i].dialog = NULL;
break;
@@ -363,7 +367,7 @@ void ro_gui_dialog_close(wimp_w close)
/* Check if we are a persistent window */
if (i < MAX_PERSISTENT) {
error = xwimp_set_caret_position(
- persistent_dialog[i].parent,
+ parent,
wimp_ICON_WINDOW, -100, -100,
32, -1);
/* parent may have been closed first */
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=55ba27c68f1664e8a6a...
commit 55ba27c68f1664e8a6a356e45c6c9ce9c7bdded9
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
re-order config include so strcasecmp is correctly detected on RISC OS/win32
diff --git a/content/handlers/html/html_css.c b/content/handlers/html/html_css.c
index 5d9987d..23d51f1 100644
--- a/content/handlers/html/html_css.c
+++ b/content/handlers/html/html_css.c
@@ -21,6 +21,8 @@
* Processing for html content css operations.
*/
+#include "utils/config.h"
+
#define _GNU_SOURCE /* strcasestr needs this for string.h */
#include <assert.h>
@@ -30,7 +32,6 @@
#include <strings.h>
#include <stdlib.h>
-#include "utils/config.h"
#include "utils/nsoption.h"
#include "utils/corestrings.h"
#include "utils/log.h"
diff --git a/desktop/treeview.c b/desktop/treeview.c
index e8b4a14..cb4ca80 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -22,11 +22,11 @@
* Treeview handling implementation.
*/
-#define _GNU_SOURCE /* strcasestr needs this for string.h */
+#include "utils/config.h"
+#define _GNU_SOURCE /* strcasestr needs this for string.h */
#include <string.h>
-#include "utils/config.h"
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/nsurl.h"
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=3fdbef0566a4310dc25...
commit 3fdbef0566a4310dc2567c101b38e9c1667d883e
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
remove unused render_resample option from beos, gtk and monkey frontends
diff --git a/docs/netsurf-fb.1 b/docs/netsurf-fb.1
index e9d721c..aa30ab3 100644
--- a/docs/netsurf-fb.1
+++ b/docs/netsurf-fb.1
@@ -302,9 +302,6 @@ Override CSS sys_colour_WindowFrame colour.
.B \-\-sys_colour_WindowText
Override CSS sys_colour_WindowText colour.
.TP
-.B \-\-render_resample
-render resample
-.TP
.B \-\-downloads_clear
downloads clear
.TP
diff --git a/docs/netsurf-gtk.1 b/docs/netsurf-gtk.1
index daa0148..10f0ae5 100644
--- a/docs/netsurf-gtk.1
+++ b/docs/netsurf-gtk.1
@@ -205,8 +205,6 @@ Override CSS sys_colour_Window colour.
Override CSS sys_colour_WindowFrame colour.
.It Fl -sys_colour_WindowText
Override CSS sys_colour_WindowText colour.
-.It Fl -render_resample
-render resample
.It Fl -downloads_clear
downloads clear
.It Fl -request_overwrite
diff --git a/frontends/beos/options.h b/frontends/beos/options.h
index 40d23a3..f959442 100644
--- a/frontends/beos/options.h
+++ b/frontends/beos/options.h
@@ -18,13 +18,12 @@
*/
-#ifndef _NETSURF_BEOS_OPTIONS_H_
-#define _NETSURF_BEOS_OPTIONS_H_
+#ifndef NETSURF_BEOS_OPTIONS_H_
+#define NETSURF_BEOS_OPTIONS_H_
/* currently nothing here */
#endif
-NSOPTION_BOOL(render_resample, false)
NSOPTION_STRING(url_file, NULL)
diff --git a/frontends/gtk/options.h b/frontends/gtk/options.h
index 81457ef..7fd79d7 100644
--- a/frontends/gtk/options.h
+++ b/frontends/gtk/options.h
@@ -23,9 +23,6 @@
#endif
-/* High quality image scaling */
-NSOPTION_BOOL(render_resample, true)
-
/* clear downloads */
NSOPTION_BOOL(downloads_clear, false)
diff --git a/frontends/gtk/preferences.c b/frontends/gtk/preferences.c
index 5fe9450..8ec41ca 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)
-/* high quality image scaling */
-TOGGLEBUTTON_SIGNALS(checkResampleImages, render_resample)
-
/* load and display of images */
G_MODULE_EXPORT void
nsgtk_preferences_comboboxLoadImages_changed(GtkComboBox *combo,
diff --git a/frontends/gtk/res/options.gtk2.ui b/frontends/gtk/res/options.gtk2.ui
index f30abeb..ed596c0 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="checkResampleImages">
- <property name="label"
translatable="yes">preferencesControlHigh</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_checkResampleImages_toggled"
swapped="no"/>
- <signal name="realize"
handler="nsgtk_preferences_checkResampleImages_realize"
swapped="no"/>
- </object>
- <packing>
- <property
name="expand">True</property>
- <property
name="fill">True</property>
- <property
name="position">3</property>
- </packing>
- </child>
- <child>
<object class="GtkHBox"
id="hbox8">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
@@ -1199,7 +1183,7 @@
<packing>
<property
name="expand">True</property>
<property
name="fill">True</property>
- <property
name="position">4</property>
+ <property
name="position">3</property>
</packing>
</child>
</object>
diff --git a/frontends/gtk/res/options.gtk3.ui b/frontends/gtk/res/options.gtk3.ui
index b74846c..af0dd5c 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="checkResampleImages">
- <property name="label"
translatable="yes">preferencesControlHigh</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_checkResampleImages_toggled"
swapped="no"/>
- <signal name="realize"
handler="nsgtk_preferences_checkResampleImages_realize"
swapped="no"/>
- </object>
- <packing>
- <property
name="expand">True</property>
- <property
name="fill">True</property>
- <property
name="position">3</property>
- </packing>
- </child>
- <child>
<object class="GtkHBox"
id="hbox8">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
@@ -1044,7 +1024,7 @@
<packing>
<property
name="expand">True</property>
<property
name="fill">True</property>
- <property
name="position">4</property>
+ <property
name="position">3</property>
</packing>
</child>
</object>
diff --git a/frontends/monkey/options.h b/frontends/monkey/options.h
index a39e54b..8f6dd8b 100644
--- a/frontends/monkey/options.h
+++ b/frontends/monkey/options.h
@@ -16,14 +16,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>;.
*/
-#ifndef _NETSURF_MONKEY_OPTIONS_H_
-#define _NETSURF_MONKEY_OPTIONS_H_
+#ifndef NETSURF_MONKEY_OPTIONS_H_
+#define NETSURF_MONKEY_OPTIONS_H_
/* currently nothing here */
#endif
-NSOPTION_BOOL(render_resample, true)
NSOPTION_BOOL(downloads_clear, false)
NSOPTION_BOOL(request_overwrite, true)
NSOPTION_STRING(downloads_directory, NULL)
diff --git a/test/data/Choices b/test/data/Choices
index 8ca4bec..a1fc15b 100644
--- a/test/data/Choices
+++ b/test/data/Choices
@@ -99,7 +99,6 @@ sys_colour_ThreeDShadow:000000
sys_colour_Window:000000
sys_colour_WindowFrame:000000
sys_colour_WindowText:000000
-render_resample:1
downloads_clear:0
request_overwrite:1
downloads_directory:/home/vince
diff --git a/test/data/Choices-all b/test/data/Choices-all
index 2742339..b430db5 100644
--- a/test/data/Choices-all
+++ b/test/data/Choices-all
@@ -95,7 +95,6 @@ sys_colour_WindowFrame:4e4e4e
sys_colour_WindowText:000000
log_filter:level:WARNING
verbose_filter:level:DEBUG
-render_resample:1
downloads_clear:0
request_overwrite:1
downloads_directory:/home/vince
-----------------------------------------------------------------------
Summary of changes:
content/handlers/html/html_css.c | 3 ++-
desktop/treeview.c | 4 ++--
docs/netsurf-fb.1 | 3 ---
docs/netsurf-gtk.1 | 2 --
frontends/beos/options.h | 5 ++---
frontends/gtk/options.h | 3 ---
frontends/gtk/preferences.c | 3 ---
frontends/gtk/res/options.gtk2.ui | 18 +-----------------
frontends/gtk/res/options.gtk3.ui | 22 +---------------------
frontends/monkey/options.h | 5 ++---
frontends/riscos/dialog.c | 6 +++++-
test/data/Choices | 1 -
test/data/Choices-all | 1 -
13 files changed, 15 insertions(+), 61 deletions(-)
diff --git a/content/handlers/html/html_css.c b/content/handlers/html/html_css.c
index 5d9987d..23d51f1 100644
--- a/content/handlers/html/html_css.c
+++ b/content/handlers/html/html_css.c
@@ -21,6 +21,8 @@
* Processing for html content css operations.
*/
+#include "utils/config.h"
+
#define _GNU_SOURCE /* strcasestr needs this for string.h */
#include <assert.h>
@@ -30,7 +32,6 @@
#include <strings.h>
#include <stdlib.h>
-#include "utils/config.h"
#include "utils/nsoption.h"
#include "utils/corestrings.h"
#include "utils/log.h"
diff --git a/desktop/treeview.c b/desktop/treeview.c
index e8b4a14..cb4ca80 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -22,11 +22,11 @@
* Treeview handling implementation.
*/
-#define _GNU_SOURCE /* strcasestr needs this for string.h */
+#include "utils/config.h"
+#define _GNU_SOURCE /* strcasestr needs this for string.h */
#include <string.h>
-#include "utils/config.h"
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/nsurl.h"
diff --git a/docs/netsurf-fb.1 b/docs/netsurf-fb.1
index e9d721c..aa30ab3 100644
--- a/docs/netsurf-fb.1
+++ b/docs/netsurf-fb.1
@@ -302,9 +302,6 @@ Override CSS sys_colour_WindowFrame colour.
.B \-\-sys_colour_WindowText
Override CSS sys_colour_WindowText colour.
.TP
-.B \-\-render_resample
-render resample
-.TP
.B \-\-downloads_clear
downloads clear
.TP
diff --git a/docs/netsurf-gtk.1 b/docs/netsurf-gtk.1
index daa0148..10f0ae5 100644
--- a/docs/netsurf-gtk.1
+++ b/docs/netsurf-gtk.1
@@ -205,8 +205,6 @@ Override CSS sys_colour_Window colour.
Override CSS sys_colour_WindowFrame colour.
.It Fl -sys_colour_WindowText
Override CSS sys_colour_WindowText colour.
-.It Fl -render_resample
-render resample
.It Fl -downloads_clear
downloads clear
.It Fl -request_overwrite
diff --git a/frontends/beos/options.h b/frontends/beos/options.h
index 40d23a3..f959442 100644
--- a/frontends/beos/options.h
+++ b/frontends/beos/options.h
@@ -18,13 +18,12 @@
*/
-#ifndef _NETSURF_BEOS_OPTIONS_H_
-#define _NETSURF_BEOS_OPTIONS_H_
+#ifndef NETSURF_BEOS_OPTIONS_H_
+#define NETSURF_BEOS_OPTIONS_H_
/* currently nothing here */
#endif
-NSOPTION_BOOL(render_resample, false)
NSOPTION_STRING(url_file, NULL)
diff --git a/frontends/gtk/options.h b/frontends/gtk/options.h
index 81457ef..7fd79d7 100644
--- a/frontends/gtk/options.h
+++ b/frontends/gtk/options.h
@@ -23,9 +23,6 @@
#endif
-/* High quality image scaling */
-NSOPTION_BOOL(render_resample, true)
-
/* clear downloads */
NSOPTION_BOOL(downloads_clear, false)
diff --git a/frontends/gtk/preferences.c b/frontends/gtk/preferences.c
index 5fe9450..8ec41ca 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)
-/* high quality image scaling */
-TOGGLEBUTTON_SIGNALS(checkResampleImages, render_resample)
-
/* load and display of images */
G_MODULE_EXPORT void
nsgtk_preferences_comboboxLoadImages_changed(GtkComboBox *combo,
diff --git a/frontends/gtk/res/options.gtk2.ui b/frontends/gtk/res/options.gtk2.ui
index f30abeb..ed596c0 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="checkResampleImages">
- <property name="label"
translatable="yes">preferencesControlHigh</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_checkResampleImages_toggled"
swapped="no"/>
- <signal name="realize"
handler="nsgtk_preferences_checkResampleImages_realize"
swapped="no"/>
- </object>
- <packing>
- <property
name="expand">True</property>
- <property
name="fill">True</property>
- <property
name="position">3</property>
- </packing>
- </child>
- <child>
<object class="GtkHBox"
id="hbox8">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
@@ -1199,7 +1183,7 @@
<packing>
<property
name="expand">True</property>
<property
name="fill">True</property>
- <property
name="position">4</property>
+ <property
name="position">3</property>
</packing>
</child>
</object>
diff --git a/frontends/gtk/res/options.gtk3.ui b/frontends/gtk/res/options.gtk3.ui
index b74846c..af0dd5c 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="checkResampleImages">
- <property name="label"
translatable="yes">preferencesControlHigh</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_checkResampleImages_toggled"
swapped="no"/>
- <signal name="realize"
handler="nsgtk_preferences_checkResampleImages_realize"
swapped="no"/>
- </object>
- <packing>
- <property
name="expand">True</property>
- <property
name="fill">True</property>
- <property
name="position">3</property>
- </packing>
- </child>
- <child>
<object class="GtkHBox"
id="hbox8">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
@@ -1044,7 +1024,7 @@
<packing>
<property
name="expand">True</property>
<property
name="fill">True</property>
- <property
name="position">4</property>
+ <property
name="position">3</property>
</packing>
</child>
</object>
diff --git a/frontends/monkey/options.h b/frontends/monkey/options.h
index a39e54b..8f6dd8b 100644
--- a/frontends/monkey/options.h
+++ b/frontends/monkey/options.h
@@ -16,14 +16,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>;.
*/
-#ifndef _NETSURF_MONKEY_OPTIONS_H_
-#define _NETSURF_MONKEY_OPTIONS_H_
+#ifndef NETSURF_MONKEY_OPTIONS_H_
+#define NETSURF_MONKEY_OPTIONS_H_
/* currently nothing here */
#endif
-NSOPTION_BOOL(render_resample, true)
NSOPTION_BOOL(downloads_clear, false)
NSOPTION_BOOL(request_overwrite, true)
NSOPTION_STRING(downloads_directory, NULL)
diff --git a/frontends/riscos/dialog.c b/frontends/riscos/dialog.c
index 8a907eb..f0bcb59 100644
--- a/frontends/riscos/dialog.c
+++ b/frontends/riscos/dialog.c
@@ -335,12 +335,16 @@ void ro_gui_dialog_close(wimp_w close)
{
int i;
wimp_caret caret;
+ wimp_w parent = -1;
os_error *error;
/* Check if we're a persistent window */
for (i = 0; i < MAX_PERSISTENT; i++) {
if (persistent_dialog[i].dialog == close) {
/* We are => invalidate record */
+ if (persistent_dialog[i].parent != NULL) {
+ parent = persistent_dialog[i].parent;
+ }
persistent_dialog[i].parent = NULL;
persistent_dialog[i].dialog = NULL;
break;
@@ -363,7 +367,7 @@ void ro_gui_dialog_close(wimp_w close)
/* Check if we are a persistent window */
if (i < MAX_PERSISTENT) {
error = xwimp_set_caret_position(
- persistent_dialog[i].parent,
+ parent,
wimp_ICON_WINDOW, -100, -100,
32, -1);
/* parent may have been closed first */
diff --git a/test/data/Choices b/test/data/Choices
index 8ca4bec..a1fc15b 100644
--- a/test/data/Choices
+++ b/test/data/Choices
@@ -99,7 +99,6 @@ sys_colour_ThreeDShadow:000000
sys_colour_Window:000000
sys_colour_WindowFrame:000000
sys_colour_WindowText:000000
-render_resample:1
downloads_clear:0
request_overwrite:1
downloads_directory:/home/vince
diff --git a/test/data/Choices-all b/test/data/Choices-all
index 2742339..b430db5 100644
--- a/test/data/Choices-all
+++ b/test/data/Choices-all
@@ -95,7 +95,6 @@ sys_colour_WindowFrame:4e4e4e
sys_colour_WindowText:000000
log_filter:level:WARNING
verbose_filter:level:DEBUG
-render_resample:1
downloads_clear:0
request_overwrite:1
downloads_directory:/home/vince
--
NetSurf Browser