diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2014-10-25 16:04:43 +0100 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2014-10-25 16:04:43 +0100 |
| commit | 720579e1106482de066d27f092292e7134b151c1 (patch) | |
| tree | c146684172a538c9e0394491c2de4a048e6ce020 /atari | |
| parent | 6823d229eaacbf9e7ad5e7d8ca9904e6e1a9dd05 (diff) | |
| download | netsurf-720579e1106482de066d27f092292e7134b151c1.tar.gz netsurf-720579e1106482de066d27f092292e7134b151c1.tar.bz2 | |
Don't access bw internals.
Diffstat (limited to 'atari')
| -rw-r--r-- | atari/ctxmenu.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c index e21876c35..334433bdc 100644 --- a/atari/ctxmenu.c +++ b/atari/ctxmenu.c @@ -70,7 +70,7 @@ static struct s_context_info * get_context_info( struct gui_window * gw, short m struct browser_window * bw = gw->browser->bw; int sx, sy; - h = bw->current_content; + h = browser_window_get_content(bw); ctxinfo.flags = 0; window_get_grect(gw->root, BROWSER_AREA_CONTENT, &area); @@ -79,7 +79,8 @@ static struct s_context_info * get_context_info( struct gui_window * gw, short m mx -= area.g_x; my -= area.g_y; - if (!bw->current_content || content_get_type(h) != CONTENT_HTML){ + if (browser_window_has_content(bw) == false || + content_get_type(h) != CONTENT_HTML){ return(&ctxinfo); } @@ -231,7 +232,7 @@ void context_popup(struct gui_window * gw, short x, short y) browser_window_navigate( gw->browser->bw, hlcache_handle_get_url(ctx->ccdata.object), - hlcache_handle_get_url(gw->browser->bw->current_content), + browser_window_get_url(gw->browser->bw), BW_NAVIGATE_DOWNLOAD, NULL, NULL, @@ -250,7 +251,7 @@ void context_popup(struct gui_window * gw, short x, short y) error = browser_window_navigate( gw->browser->bw, url, - hlcache_handle_get_url(gw->browser->bw->current_content), + browser_window_get_url(gw->browser->bw), BW_NAVIGATE_DOWNLOAD, NULL, NULL, @@ -290,7 +291,7 @@ void context_popup(struct gui_window * gw, short x, short y) error = browser_window_create( BW_CREATE_HISTORY | BW_CREATE_CLONE, url, - hlcache_handle_get_url(gw->browser->bw->current_content), + browser_window_get_url(gw->browser->bw), gw->browser->bw, NULL ); @@ -305,7 +306,7 @@ void context_popup(struct gui_window * gw, short x, short y) case POP_CTX_VIEW_SOURCE: editor = nsoption_charp(atari_editor); if (editor != NULL && strlen(editor)>0) { - data = content_get_source_data(gw->browser->bw->current_content, + data = content_get_source_data(browser_window_get_content(gw->browser->bw), &size); if (size > 0 && data != NULL){ snprintf(tempfile, 127, "%s", get_tmpfilename("ns-", ".html")); |