summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2004-06-28 23:57:26 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2004-06-28 23:57:26 +0000
commit05c46359bac1596a87961a3738b7be15f306326d (patch)
tree6e71fb8a88c80e7dedc33c67b55a495500630fab
parent5d0bc4e75877b3d3fb5a4aa75b6d5bda6af357ca (diff)
downloadnetsurf-05c46359bac1596a87961a3738b7be15f306326d.tar.gz
netsurf-05c46359bac1596a87961a3738b7be15f306326d.tar.bz2
[project @ 2004-06-28 23:57:26 by jmb]
Correct behaviour of unknown URL launching mechanism. the ANT load never occurred. svn path=/import/netsurf/; revision=1025
-rw-r--r--riscos/gui.c3
-rw-r--r--riscos/uri.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/riscos/gui.c b/riscos/gui.c
index b60f52ab6..2400f992b 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -818,8 +818,7 @@ void ro_gui_user_message(wimp_event_no event, wimp_message *message)
ro_uri_message_received(message);
break;
case message_URI_RETURN_RESULT:
- if (event == wimp_USER_MESSAGE_ACKNOWLEDGE)
- ro_uri_bounce(message);
+ ro_uri_bounce(message);
break;
#endif
#ifdef WITH_URL
diff --git a/riscos/uri.c b/riscos/uri.c
index 11178ddc3..b07cd00a5 100644
--- a/riscos/uri.c
+++ b/riscos/uri.c
@@ -66,7 +66,8 @@ bool ro_uri_launch(char *uri) {
uri_dispatch_flags returned;
os_error *e;
- e = xuri_dispatch(0, uri, task_handle, &returned, &handle_task, &uri_handle);
+ e = xuri_dispatch(uri_DISPATCH_INFORM_CALLER, uri, task_handle,
+ &returned, &handle_task, &uri_handle);
if (e || returned & 1) {
return false;
@@ -84,7 +85,10 @@ void ro_uri_bounce(uri_full_message_return_result *message) {
e = xuri_request_uri(0, uri_buf, sizeof uri_buf, message->handle, 0);
- if (e) return;
+ if (e) {
+ LOG(("xuri_request_uri: %d: %s", e->errnum, e->errmess));
+ return;
+ }
ro_url_load(uri_buf);