diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2011-10-07 21:03:45 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2011-10-07 21:03:45 +0000 |
commit | 4c829ae481aa155517f114c5cb12e132e7ba3c15 (patch) | |
tree | 954acc5750ef755a5bd8478f9093b2a8ef6a2469 | |
parent | 8a293636fbe2b4cc57fd542e4b18af4cf0bc3fe3 (diff) | |
download | netsurf-4c829ae481aa155517f114c5cb12e132e7ba3c15.tar.gz netsurf-4c829ae481aa155517f114c5cb12e132e7ba3c15.tar.bz2 |
use resource:favicon.ico instead of resource:favicon.png
svn path=/trunk/netsurf/; revision=12982
-rw-r--r-- | content/fetchers/resource.c | 2 | ||||
-rw-r--r-- | desktop/browser.c | 2 | ||||
-rw-r--r-- | gtk/gui.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c index ff1c0af9b..77a25d36c 100644 --- a/content/fetchers/resource.c +++ b/content/fetchers/resource.c @@ -78,7 +78,7 @@ static const char *fetch_resource_paths[] = { "quirks.css", "credits.html", "licence.html", - "favicon.png", + "favicon.ico", "netsurf.png" }; static struct fetch_resource_map_entry { diff --git a/desktop/browser.c b/desktop/browser.c index f442809f9..e5142d88b 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -997,7 +997,7 @@ static void browser_window_update_favicon(hlcache_handle *c, /* no favicon via link, try for the default location */ error = nsurl_join(nsurl, "/favicon.ico", &nsurl); } else { - error = nsurl_create("resource:favicon.png", &nsurl); + error = nsurl_create("resource:favicon.ico", &nsurl); } if (error != NSERROR_OK) { LOG(("Unable to create default location url")); @@ -327,6 +327,10 @@ nsurl *gui_get_resource_url(const char *path) if (strcmp(path, "default.css") == 0) path = "gtkdefault.css"; + /* favicon.ico -> favicon.png */ + if (strcmp(path, "favicon.ico") == 0) + path = "favicon.png"; + raw = path_to_url(filepath_sfind(respaths, buf, path)); if (raw != NULL) { nsurl_create(raw, &url); |