diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2014-10-16 09:34:27 +0100 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2014-10-16 09:34:27 +0100 |
| commit | 925082cbe1ff8e44a519eefe7d8f337574ad8112 (patch) | |
| tree | 2e424998b1d118215122d4e146a0d941d16f7a9f | |
| parent | b4b97d90032e7c52f1888b1b32132e30c0bd4094 (diff) | |
| download | netsurf-925082cbe1ff8e44a519eefe7d8f337574ad8112.tar.gz netsurf-925082cbe1ff8e44a519eefe7d8f337574ad8112.tar.bz2 | |
Update the correct favicon setter to take gui_window.
| -rw-r--r-- | riscos/gui/url_bar.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c index 76a63aa2d..348fc85c4 100644 --- a/riscos/gui/url_bar.c +++ b/riscos/gui/url_bar.c @@ -1164,16 +1164,13 @@ bool ro_gui_url_bar_test_for_text_field_keypress(struct url_bar *url_bar, /* This is an exported interface documented in url_bar.h */ bool ro_gui_url_bar_set_site_favicon(struct url_bar *url_bar, - struct gui_window *g) + struct hlcache_handle *h) { - struct hlcache_handle *h content_type type = CONTENT_NONE; - if (url_bar == NULL || g == NULL) + if (url_bar == NULL) return false; - h = browser_window_get_content(g->bw); - if (h != NULL) type = content_get_type(h); @@ -1223,14 +1220,16 @@ bool ro_gui_url_bar_set_site_favicon(struct url_bar *url_bar, /* This is an exported interface documented in url_bar.h */ bool ro_gui_url_bar_set_content_favicon(struct url_bar *url_bar, - struct hlcache_handle *h) + struct gui_window *g) { int type = 0; char sprite[URLBAR_FAVICON_NAME_LENGTH]; + struct hlcache_handle *h; - if (url_bar == NULL) + if (url_bar == NULL || g == NULL) return false; + h = browser_window_get_content(g->bw); if (h != NULL) type = ro_content_filetype(h); |