diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2009-07-10 00:26:37 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-07-10 00:26:37 +0000 |
commit | 5feb7018c5228a22d370d070c1f7c3dad2c71e25 (patch) | |
tree | 9899af55ee95f4e48f2df822ce43deccdafb2829 /desktop/frames.c | |
parent | 801ef751afd7b5adb7ef41335192638c8443c6f6 (diff) | |
download | netsurf-5feb7018c5228a22d370d070c1f7c3dad2c71e25.tar.gz netsurf-5feb7018c5228a22d370d070c1f7c3dad2c71e25.tar.bz2 |
Replace parent_url with a pointer to the parent content.
svn path=/trunk/netsurf/; revision=8428
Diffstat (limited to 'desktop/frames.c')
-rw-r--r-- | desktop/frames.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/desktop/frames.c b/desktop/frames.c index d631f0962..acabdc1b9 100644 --- a/desktop/frames.c +++ b/desktop/frames.c @@ -105,7 +105,8 @@ void browser_window_create_iframes(struct browser_window *bw, window = &(bw->iframes[index++]); if (cur->url) browser_window_go_unverifiable(window, cur->url, - bw->current_content->url, false); + bw->current_content->url, false, + bw->current_content); } } @@ -154,7 +155,7 @@ void browser_window_create_frameset(struct browser_window *bw, int row, col, index; struct content_html_frames *frame; struct browser_window *window; - const char *referer; + struct content *parent; assert(bw && frameset); @@ -233,10 +234,8 @@ void browser_window_create_frameset(struct browser_window *bw, window->current_content->type == CONTENT_HTML) break; } - if (window->current_content) - referer = window->current_content->url; - else - referer = NULL; + + parent = window->current_content; /* 4. Launch content */ for (row = 0; row < bw->rows; row++) { @@ -248,8 +247,10 @@ void browser_window_create_frameset(struct browser_window *bw, if (frame->url) { browser_window_go_unverifiable(window, frame->url, - referer, - true); + parent != NULL + ? parent->url : NULL, + true, + parent); } } } |