diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2011-10-03 20:28:29 +0000 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2011-10-03 20:28:29 +0000 |
| commit | 898b01e72163a53aac3a93bda5181b5897299cb1 (patch) | |
| tree | 7e74675cf999d342806a3f9da02698a69565a659 /render/html_interaction.c | |
| parent | b9a40d8e47bac102c998b78b97d205886bc2dafb (diff) | |
| download | netsurf-898b01e72163a53aac3a93bda5181b5897299cb1.tar.gz netsurf-898b01e72163a53aac3a93bda5181b5897299cb1.tar.bz2 | |
More conversion to nsurl. (box->href, object params, imagemaps, (i)frames)
svn path=/trunk/netsurf/; revision=12933
Diffstat (limited to 'render/html_interaction.c')
| -rw-r--r-- | render/html_interaction.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/render/html_interaction.c b/render/html_interaction.c index abe7d20f3..95993d594 100644 --- a/render/html_interaction.c +++ b/render/html_interaction.c @@ -168,7 +168,7 @@ void html_mouse_action(struct content *c, struct browser_window *bw, html_content *html = (html_content *) c; enum { ACTION_NONE, ACTION_SUBMIT, ACTION_GO } action = ACTION_NONE; const char *title = 0; - const char *url = 0; + nsurl *url = 0; const char *target = 0; char status_buffer[200]; const char *status = 0; @@ -543,22 +543,23 @@ void html_mouse_action(struct content *c, struct browser_window *bw, } else if (url) { if (title) { snprintf(status_buffer, sizeof status_buffer, "%s: %s", - url, title); + nsurl_access(url), title); status = status_buffer; } else - status = url; + status = nsurl_access(url); pointer = get_pointer_shape(bw, url_box, imagemap); if (mouse & BROWSER_MOUSE_CLICK_1 && mouse & BROWSER_MOUSE_MOD_1) { /* force download of link */ - browser_window_go_post(bw, url, 0, 0, false, - nsurl_access(content_get_url(h)), + browser_window_go_post(bw, nsurl_access(url), 0, 0, + false, nsurl_access(content_get_url(h)), true, true, 0); } else if (mouse & BROWSER_MOUSE_CLICK_2 && mouse & BROWSER_MOUSE_MOD_1) { - gui_window_save_link(bw->window, url, title); + gui_window_save_link(bw->window, + nsurl_access(url), title); } else if (mouse & (BROWSER_MOUSE_CLICK_1 | BROWSER_MOUSE_CLICK_2)) action = ACTION_GO; @@ -690,7 +691,8 @@ void html_mouse_action(struct content *c, struct browser_window *bw, break; case ACTION_GO: browser_window_go(browser_window_find_target(bw, target, mouse), - url, nsurl_access(content_get_url(h)), true); + nsurl_access(url), + nsurl_access(content_get_url(h)), true); break; case ACTION_NONE: break; |