From e71691bae890040b83cfd54a2d9a1097d5026866 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Fri, 6 May 2011 20:40:09 +0000 Subject: Merge branches/jmb/content-factory to trunk svn path=/trunk/netsurf/; revision=12283 --- riscos/gui/url_bar.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'riscos/gui') diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c index 4a3b4b232..aadc0e36f 100644 --- a/riscos/gui/url_bar.c +++ b/riscos/gui/url_bar.c @@ -875,7 +875,7 @@ bool ro_gui_url_bar_test_for_text_field_keypress(struct url_bar *url_bar, bool ro_gui_url_bar_set_site_favicon(struct url_bar *url_bar, struct hlcache_handle *h) { - content_type type = CONTENT_OTHER; + content_type type = CONTENT_NONE; if (url_bar == NULL) return false; @@ -885,7 +885,7 @@ bool ro_gui_url_bar_set_site_favicon(struct url_bar *url_bar, // \TODO -- Maybe test for CONTENT_ICO ??? - if (type != CONTENT_OTHER && type != CONTENT_UNKNOWN) { + if (type == CONTENT_IMAGE) { url_bar->favicon_content = h; url_bar->favicon_width = content_get_width(h); url_bar->favicon_height = content_get_height(h); @@ -938,7 +938,7 @@ bool ro_gui_url_bar_set_content_favicon(struct url_bar *url_bar, return false; if (h != NULL) - type = ro_content_filetype_from_type(content_get_type(h)); + type = ro_content_filetype(h); if (type != 0) { snprintf(sprite, URLBAR_FAVICON_NAME_LENGTH, -- cgit v1.2.3