diff options
| -rwxr-xr-x | amiga/gui.c | 7 | ||||
| -rwxr-xr-x | amiga/pkg/makereslinks | 2 | ||||
| l--------- | amiga/resources/default.ico | 1 |
3 files changed, 3 insertions, 7 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index e7fff73c5..d67f78cef 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -3605,9 +3605,6 @@ void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon) g->shared->objects[GID_TABS], (ULONG *)&cur_tab); - if ((icon != NULL) && - (content_get_status(icon) != CONTENT_STATUS_READY) && - (content_get_status(icon) != CONTENT_STATUS_DONE)) return; if ((icon != NULL) && (content_get_bitmap(icon) != NULL)) { bm = ami_getcachenativebm(content_get_bitmap(icon), 16, 16, @@ -3661,13 +3658,13 @@ void gui_window_set_search_ico(hlcache_handle *ico) if(IsMinListEmpty(window_list)) return; if(option_kiosk_mode == true) return; -/* disabled, as at the moment, favicon/search icons don't work +/* disabled, as at the moment, favicon/search icons don't work*/ if (ico == NULL) ico = search_web_ico(); if ((ico != NULL) && (content_get_bitmap(ico) != NULL)) { bm = ami_getcachenativebm(content_get_bitmap(ico), 16, 16, NULL); } -*/ +/**/ /* generic search image */ if(bm == NULL) diff --git a/amiga/pkg/makereslinks b/amiga/pkg/makereslinks index 120f1da74..dc30de561 100755 --- a/amiga/pkg/makereslinks +++ b/amiga/pkg/makereslinks @@ -8,7 +8,7 @@ makelink default.css /amiga/resources/default.css soft makelink ca-bundle /!NetSurf/Resources/ca-bundle soft makelink de /!NetSurf/Resources/de soft makelink nsdefault.css /!NetSurf/Resources/CSS,f79 soft -makelink default.ico /!NetSurf/Resources/default.ico soft +makelink favicon.ico /!NetSurf/Resources/default.ico soft makelink en /!NetSurf/Resources/en soft makelink fr /!NetSurf/Resources/fr soft makelink internal.css /!NetSurf/Resources/internal.css,f79 soft diff --git a/amiga/resources/default.ico b/amiga/resources/default.ico deleted file mode 120000 index 7071459a3..000000000 --- a/amiga/resources/default.ico +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/default.ico
\ No newline at end of file |