Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/dae0ff3d26d92af373d69f834573d114504c2fe6
...commit
http://git.netsurf-browser.org/netsurf.git/commit/dae0ff3d26d92af373d69f834573d114504c2fe6
...tree
http://git.netsurf-browser.org/netsurf.git/tree/dae0ff3d26d92af373d69f834573d114504c2fe6
The branch, master has been updated
via dae0ff3d26d92af373d69f834573d114504c2fe6 (commit)
via 0e16c01cdcc3481eea85bcb152afcf0b519954d5 (commit)
from ad27ed6926499f3381b8e7f6d80e86268919ec6c (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=dae0ff3d26d92af373d69f834573d114504c2fe6
commit dae0ff3d26d92af373d69f834573d114504c2fe6
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
remove warning callback from miscelaneous function table
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index 7ab7b46..8b52e54 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 995ec4c..5384ffe 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 e55271c..a5df8fc 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 b738d10..b49bc80 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 74d8b4c..e51705b 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 ea8d77a..351b002 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 0b7efda..e1c2a38 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 169b89b..ff13a58 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 e36ae2c..54e0249 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 ac58cf3..8a79531 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 */
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=0e16c01cdcc3481eea85bcb152afcf0b519954d5
commit 0e16c01cdcc3481eea85bcb152afcf0b519954d5
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
remove unecessary user warning
diff --git a/content/handlers/html/search.c b/content/handlers/html/search.c
index 1e2fa04..981c80b 100644
--- a/content/handlers/html/search.c
+++ b/content/handlers/html/search.c
@@ -269,20 +269,18 @@ static const char *find_pattern(const char *string, int
s_len,
* Add a new entry to the list of matches
*
* \param start_idx Offset of match start within textual representation
- * \param end_idx Offset of match end
- * \param context The search context to add the entry to.
+ * \param end_idx Offset of match end
+ * \param context The search context to add the entry to.
* \return Pointer to added entry, NULL iff failed.
*/
-
-static struct list_entry *add_entry(unsigned start_idx, unsigned end_idx,
- struct search_context *context)
+static struct list_entry *
+add_entry(unsigned start_idx, unsigned end_idx, struct search_context
*context)
{
struct list_entry *entry;
/* found string in box => add to list */
entry = calloc(1, sizeof(*entry));
if (!entry) {
- guit->misc->warning("NoMemory", 0);
return NULL;
}
@@ -293,10 +291,11 @@ static struct list_entry *add_entry(unsigned start_idx,
unsigned end_idx,
entry->next = 0;
entry->prev = context->found->prev;
- if (context->found->prev == NULL)
+ if (context->found->prev == NULL) {
context->found->next = entry;
- else
+ } else {
context->found->prev->next = entry;
+ }
context->found->prev = entry;
-----------------------------------------------------------------------
Summary of changes:
content/handlers/html/search.c | 15 +++++++--------
desktop/gui_factory.c | 3 ---
frontends/amiga/gui.c | 1 -
frontends/atari/gui.c | 1 -
frontends/beos/gui.cpp | 1 -
frontends/framebuffer/gui.c | 1 -
frontends/gtk/gui.c | 1 -
frontends/monkey/main.c | 1 -
frontends/riscos/gui.c | 1 -
frontends/windows/main.c | 1 -
include/netsurf/misc.h | 15 ++-------------
11 files changed, 9 insertions(+), 32 deletions(-)
diff --git a/content/handlers/html/search.c b/content/handlers/html/search.c
index 1e2fa04..981c80b 100644
--- a/content/handlers/html/search.c
+++ b/content/handlers/html/search.c
@@ -269,20 +269,18 @@ static const char *find_pattern(const char *string, int
s_len,
* Add a new entry to the list of matches
*
* \param start_idx Offset of match start within textual representation
- * \param end_idx Offset of match end
- * \param context The search context to add the entry to.
+ * \param end_idx Offset of match end
+ * \param context The search context to add the entry to.
* \return Pointer to added entry, NULL iff failed.
*/
-
-static struct list_entry *add_entry(unsigned start_idx, unsigned end_idx,
- struct search_context *context)
+static struct list_entry *
+add_entry(unsigned start_idx, unsigned end_idx, struct search_context
*context)
{
struct list_entry *entry;
/* found string in box => add to list */
entry = calloc(1, sizeof(*entry));
if (!entry) {
- guit->misc->warning("NoMemory", 0);
return NULL;
}
@@ -293,10 +291,11 @@ static struct list_entry *add_entry(unsigned start_idx,
unsigned end_idx,
entry->next = 0;
entry->prev = context->found->prev;
- if (context->found->prev == NULL)
+ if (context->found->prev == NULL) {
context->found->next = entry;
- else
+ } else {
context->found->prev->next = entry;
+ }
context->found->prev = entry;
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index 7ab7b46..8b52e54 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 995ec4c..5384ffe 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 e55271c..a5df8fc 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 b738d10..b49bc80 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 74d8b4c..e51705b 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 ea8d77a..351b002 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 0b7efda..e1c2a38 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 169b89b..ff13a58 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 e36ae2c..54e0249 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 ac58cf3..8a79531 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 */
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
