Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/78aa34e5d761c2597f24ebba89c69ac6fda2f3a8
...commit
http://git.netsurf-browser.org/netsurf.git/commit/78aa34e5d761c2597f24ebba89c69ac6fda2f3a8
...tree
http://git.netsurf-browser.org/netsurf.git/tree/78aa34e5d761c2597f24ebba89c69ac6fda2f3a8
The branch, master has been updated
via 78aa34e5d761c2597f24ebba89c69ac6fda2f3a8 (commit)
from 7c63f5f66bde003c2e661f2914b74872cb5a5b8b (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=78aa34e5d761c2597f24ebba89c69ac6fda2f3a8
commit 78aa34e5d761c2597f24ebba89c69ac6fda2f3a8
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
remove user warnings from hotlist load and curl poll
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index 2644c68..a1d7ee1 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -1325,9 +1325,9 @@ static void fetch_curl_poll(lwc_string *scheme_ignored)
do {
codem = curl_multi_perform(fetch_curl_multi, &running);
if (codem != CURLM_OK && codem != CURLM_CALL_MULTI_PERFORM) {
- NSLOG(netsurf, WARNING, "curl_multi_perform: %i %s",
+ NSLOG(netsurf, WARNING,
+ "curl_multi_perform: %i %s",
codem, curl_multi_strerror(codem));
- guit->misc->warning("MiscError",
curl_multi_strerror(codem));
return;
}
} while (codem == CURLM_CALL_MULTI_PERFORM);
diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index 4bdd7c8..4daaaed 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -890,7 +890,9 @@ static nserror hotlist_load(const char *path, bool *loaded)
corestring_lwc_html);
if (html == NULL) {
dom_node_unref(document);
- guit->misc->warning("TreeLoadError", "(<html> not found)");
+ NSLOG(netsurf, WARNING,
+ "%s (<html> not found)",
+ messages_get("TreeLoadError"));
return NSERROR_OK;
}
@@ -899,7 +901,9 @@ static nserror hotlist_load(const char *path, bool *loaded)
if (body == NULL) {
dom_node_unref(html);
dom_node_unref(document);
- guit->misc->warning("TreeLoadError", "(<html>...<body> not
found)");
+ NSLOG(netsurf, WARNING,
+ "%s (<html>...<body> not found)",
+ messages_get("TreeLoadError"));
return NSERROR_OK;
}
@@ -909,8 +913,9 @@ static nserror hotlist_load(const char *path, bool *loaded)
dom_node_unref(body);
dom_node_unref(html);
dom_node_unref(document);
- guit->misc->warning("TreeLoadError",
- "(<html>...<body>...<ul> not found.)");
+ NSLOG(netsurf, WARNING,
+ "%s (<html>...<body>...<ul> not found.)",
+ messages_get("TreeLoadError"));
return NSERROR_OK;
}
@@ -934,7 +939,9 @@ static nserror hotlist_load(const char *path, bool *loaded)
dom_node_unref(document);
if (err != NSERROR_OK) {
- guit->misc->warning("TreeLoadError", "(Failed building tree.)");
+ NSLOG(netsurf, WARNING,
+ "%s (Failed building tree.)",
+ messages_get("TreeLoadError"));
return NSERROR_OK;
}
-----------------------------------------------------------------------
Summary of changes:
content/fetchers/curl.c | 4 ++--
desktop/hotlist.c | 17 ++++++++++++-----
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index 2644c68..a1d7ee1 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -1325,9 +1325,9 @@ static void fetch_curl_poll(lwc_string *scheme_ignored)
do {
codem = curl_multi_perform(fetch_curl_multi, &running);
if (codem != CURLM_OK && codem != CURLM_CALL_MULTI_PERFORM) {
- NSLOG(netsurf, WARNING, "curl_multi_perform: %i %s",
+ NSLOG(netsurf, WARNING,
+ "curl_multi_perform: %i %s",
codem, curl_multi_strerror(codem));
- guit->misc->warning("MiscError",
curl_multi_strerror(codem));
return;
}
} while (codem == CURLM_CALL_MULTI_PERFORM);
diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index 4bdd7c8..4daaaed 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -890,7 +890,9 @@ static nserror hotlist_load(const char *path, bool *loaded)
corestring_lwc_html);
if (html == NULL) {
dom_node_unref(document);
- guit->misc->warning("TreeLoadError", "(<html> not found)");
+ NSLOG(netsurf, WARNING,
+ "%s (<html> not found)",
+ messages_get("TreeLoadError"));
return NSERROR_OK;
}
@@ -899,7 +901,9 @@ static nserror hotlist_load(const char *path, bool *loaded)
if (body == NULL) {
dom_node_unref(html);
dom_node_unref(document);
- guit->misc->warning("TreeLoadError", "(<html>...<body> not
found)");
+ NSLOG(netsurf, WARNING,
+ "%s (<html>...<body> not found)",
+ messages_get("TreeLoadError"));
return NSERROR_OK;
}
@@ -909,8 +913,9 @@ static nserror hotlist_load(const char *path, bool *loaded)
dom_node_unref(body);
dom_node_unref(html);
dom_node_unref(document);
- guit->misc->warning("TreeLoadError",
- "(<html>...<body>...<ul> not found.)");
+ NSLOG(netsurf, WARNING,
+ "%s (<html>...<body>...<ul> not found.)",
+ messages_get("TreeLoadError"));
return NSERROR_OK;
}
@@ -934,7 +939,9 @@ static nserror hotlist_load(const char *path, bool *loaded)
dom_node_unref(document);
if (err != NSERROR_OK) {
- guit->misc->warning("TreeLoadError", "(Failed building tree.)");
+ NSLOG(netsurf, WARNING,
+ "%s (Failed building tree.)",
+ messages_get("TreeLoadError"));
return NSERROR_OK;
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
