summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2019-11-11 16:58:17 +0000
committerVincent Sanders <vince@kyllikki.org>2019-11-11 16:59:28 +0000
commitdae0ff3d26d92af373d69f834573d114504c2fe6 (patch)
tree9078d3ebbe0956cb0b56fafa78bdc8dbb79c7d59
parent0e16c01cdcc3481eea85bcb152afcf0b519954d5 (diff)
downloadnetsurf-dae0ff3d26d92af373d69f834573d114504c2fe6.tar.gz
netsurf-dae0ff3d26d92af373d69f834573d114504c2fe6.tar.bz2
remove warning callback from miscelaneous function table
-rw-r--r--desktop/gui_factory.c3
-rw-r--r--frontends/amiga/gui.c1
-rw-r--r--frontends/atari/gui.c1
-rw-r--r--frontends/beos/gui.cpp1
-rw-r--r--frontends/framebuffer/gui.c1
-rw-r--r--frontends/gtk/gui.c1
-rw-r--r--frontends/monkey/main.c1
-rw-r--r--frontends/riscos/gui.c1
-rw-r--r--frontends/windows/main.c1
-rw-r--r--include/netsurf/misc.h15
10 files changed, 2 insertions, 24 deletions
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index 7ab7b465a..8b52e5469 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -678,9 +678,6 @@ static nserror verify_misc_register(struct gui_misc_table *gmt)
if (gmt->schedule == NULL) {
return NSERROR_BAD_PARAMETER;
}
- if (gmt->warning == NULL) {
- return NSERROR_BAD_PARAMETER;
- }
/* fill in the optional entries with defaults */
if (gmt->quit == NULL) {
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 995ec4c4d..5384ffec4 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -6368,7 +6368,6 @@ static struct gui_search_web_table amiga_search_web_table = {
static struct gui_misc_table amiga_misc_table = {
.schedule = ami_schedule,
- .warning = amiga_warn_user,
.quit = gui_quit,
.launch_url = gui_launch_url,
diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c
index e55271c10..a5df8fcb0 100644
--- a/frontends/atari/gui.c
+++ b/frontends/atari/gui.c
@@ -1109,7 +1109,6 @@ static struct gui_fetch_table atari_fetch_table = {
static struct gui_misc_table atari_misc_table = {
.schedule = atari_schedule,
- .warning = atari_warn_user,
.quit = gui_quit,
};
diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp
index b738d105d..b49bc80c6 100644
--- a/frontends/beos/gui.cpp
+++ b/frontends/beos/gui.cpp
@@ -993,7 +993,6 @@ static struct gui_fetch_table beos_fetch_table = {
static struct gui_misc_table beos_misc_table = {
beos_schedule,
- beos_warn_user,
gui_quit,
gui_launch_url,
NULL, //cert_verify
diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c
index 74d8b4c5a..e51705bac 100644
--- a/frontends/framebuffer/gui.c
+++ b/frontends/framebuffer/gui.c
@@ -2136,7 +2136,6 @@ static struct gui_window_table framebuffer_window_table = {
static struct gui_misc_table framebuffer_misc_table = {
.schedule = framebuffer_schedule,
- .warning = fb_warn_user,
.quit = gui_quit,
};
diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c
index ea8d77a46..351b00281 100644
--- a/frontends/gtk/gui.c
+++ b/frontends/gtk/gui.c
@@ -1139,7 +1139,6 @@ static nserror nsgtk_option_init(int *pargc, char** argv)
static struct gui_misc_table nsgtk_misc_table = {
.schedule = nsgtk_schedule,
- .warning = nsgtk_warning,
.quit = gui_quit,
.launch_url = gui_launch_url,
diff --git a/frontends/monkey/main.c b/frontends/monkey/main.c
index 0b7efda29..e1c2a382c 100644
--- a/frontends/monkey/main.c
+++ b/frontends/monkey/main.c
@@ -245,7 +245,6 @@ static bool nslog_stream_configure(FILE *fptr)
static struct gui_misc_table monkey_misc_table = {
.schedule = monkey_schedule,
- .warning = monkey_warn_user,
.quit = monkey_quit,
.launch_url = gui_launch_url,
diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c
index 169b89b1c..ff13a58aa 100644
--- a/frontends/riscos/gui.c
+++ b/frontends/riscos/gui.c
@@ -2427,7 +2427,6 @@ static struct gui_fetch_table riscos_fetch_table = {
static struct gui_misc_table riscos_misc_table = {
.schedule = riscos_schedule,
- .warning = ro_warn_user,
.quit = gui_quit,
.launch_url = gui_launch_url,
diff --git a/frontends/windows/main.c b/frontends/windows/main.c
index e36ae2c31..54e0249a8 100644
--- a/frontends/windows/main.c
+++ b/frontends/windows/main.c
@@ -310,7 +310,6 @@ static nserror nsw32_messages_init(char **respaths)
static struct gui_misc_table win32_misc_table = {
.schedule = win32_schedule,
- .warning = win32_warning,
};
/**
diff --git a/include/netsurf/misc.h b/include/netsurf/misc.h
index ac58cf302..8a7953192 100644
--- a/include/netsurf/misc.h
+++ b/include/netsurf/misc.h
@@ -22,8 +22,8 @@
* Interface to platform-specific miscellaneous browser operation table.
*/
-#ifndef _NETSURF_MISC_H_
-#define _NETSURF_MISC_H_
+#ifndef NETSURF_MISC_H_
+#define NETSURF_MISC_H_
struct form_control;
struct gui_window;
@@ -57,17 +57,6 @@ struct gui_misc_table {
*/
nserror (*schedule)(int t, void (*callback)(void *p), void *p);
- /**
- * Warn the user of an event.
- *
- * \param[in] message A warning looked up in the message
- * translation table
- * \param[in] detail Additional text to be displayed or NULL.
- * \return NSERROR_OK on success or error code if there was a
- * faliure displaying the message to the user.
- */
- nserror (*warning)(const char *message, const char *detail);
-
/* Optional entries */