From 925082cbe1ff8e44a519eefe7d8f337574ad8112 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 16 Oct 2014 09:34:27 +0100 Subject: Update the correct favicon setter to take gui_window. --- riscos/gui/url_bar.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'riscos/gui') 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); -- cgit v1.2.3