eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix open url dialog not coping with invalid url by using the omnibox helper

This commit is contained in:
Vincent Sanders 2020-05-24 11:17:48 +01:00
parent 8673b035f0
commit d3ac0e71ab
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
frontends/riscos/dialog.c
View File

@ -39,6 +39,7 @@
#include "utils/messages.h"
#include "utils/nsurl.h"
#include "desktop/version.h"
#include "desktop/searchweb.h"
#include "netsurf/browser_window.h"
#include "riscos/configure.h"
@ -335,7 +336,7 @@ void ro_gui_dialog_close(wimp_w close)
{
int i;
wimp_caret caret;
wimp_w parent = -1;
wimp_w parent = (wimp_w)-1;
os_error *error;
/* Check if we're a persistent window */
@ -429,9 +430,9 @@ bool ro_gui_dialog_open_top(wimp_w w, struct toolbar *toolbar,
if (!open) {
int dimension;
int scroll_width;
/* cancel any editing */
if (ro_toolbar_get_editing(toolbar))
ro_toolbar_toggle_edit(toolbar);
/* cancel any editing */
if (ro_toolbar_get_editing(toolbar))
ro_toolbar_toggle_edit(toolbar);
/* move to the centre */
ro_gui_screen_size(&screen_width, &screen_height);
@ -605,7 +606,7 @@ void ro_gui_dialog_open_persistent(wimp_w parent, wimp_w w, bool pointer) {
void ro_gui_dialog_add_persistent(wimp_w parent, wimp_w w) {
int i;
int i;
/* all persistant windows have a back icon */
ro_gui_wimp_update_window_furniture(w, wimp_WINDOW_BACK_ICON,
@ -754,9 +755,9 @@ static bool ro_gui_dialog_open_url_init(void)
xwimp_close_template();
die(error->errmess);
}
free(definition);
ro_gui_wimp_event_register_menu_gright(dialog_openurl, ICON_OPENURL_URL,
ICON_OPENURL_MENU, ro_gui_url_suggest_menu);
ro_gui_wimp_event_register_cancel(dialog_openurl, ICON_OPENURL_CANCEL);
@ -771,35 +772,31 @@ static bool ro_gui_dialog_open_url_init(void)
bool ro_gui_dialog_openurl_apply(wimp_w w) {
const char *urltxt;
char *url2;
bool ro_gui_dialog_openurl_apply(wimp_w w)
{
nserror res;
const char *url_s;
nsurl *url;
nserror error;
urltxt = ro_gui_get_icon_string(w, ICON_OPENURL_URL);
url2 = strdup(urltxt); /** @todo why is this copied */
if (url2 == NULL) {
return false;
}
url_s = ro_gui_get_icon_string(w, ICON_OPENURL_URL);
error = nsurl_create(url2, &url);
free(url2);
if (error == NSERROR_OK) {
error = browser_window_create(BW_CREATE_HISTORY,
url,
NULL,
NULL,
NULL);
res = search_web_omni(url_s, SEARCH_WEB_OMNI_NONE, &url);
if (res == NSERROR_OK) {
res = browser_window_create(BW_CREATE_HISTORY,
url,
NULL,
NULL,
NULL);
nsurl_unref(url);
}
if (error != NSERROR_OK) {
ro_warn_user(messages_get_errorcode(error), 0);
if (res != NSERROR_OK) {
ro_warn_user(messages_get_errorcode(res), 0);
return false;
}
return true;
}