Update the correct favicon setter to take gui_window.

This commit is contained in:
Michael Drake 2014-10-16 09:34:27 +01:00
parent b4b97d9003
commit 925082cbe1

View File

@ -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);