diff options
| -rwxr-xr-x | amiga/gui.c | 16 | ||||
| -rw-r--r-- | amiga/options.h | 3 | ||||
| -rw-r--r-- | amiga/theme.c | 5 |
3 files changed, 5 insertions, 19 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index ad1c67c6a..a3ce7ad8c 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -365,11 +365,6 @@ void ami_set_options(void) search_engines_file_location = option_search_engines_file; - if((!option_search_ico_file) || (option_search_ico_file[0] == '\0')) - option_search_ico_file = (char *)strdup("PROGDIR:Resources/favicon.ico"); - - search_default_ico_location = option_search_ico_file; - if((!option_font_sans) || (option_font_sans[0] == '\0')) option_font_sans = (char *)strdup("DejaVu Sans"); @@ -3667,17 +3662,6 @@ void gui_window_set_search_ico(hlcache_handle *ico) bm = ami_getcachenativebm(content_get_bitmap(ico), 16, 16, NULL); } - /* generic search image */ - if(bm == NULL) - { - ami_get_theme_filename(fname, "theme_search", false); - if(nsbm = ami_bitmap_from_datatype(fname)) - { - bm = ami_getcachenativebm(nsbm, 16, 16, NULL); - } - free_bm = true; - } - node = (struct nsObject *)GetHead((struct List *)window_list); do { diff --git a/amiga/options.h b/amiga/options.h index 362825a07..68cde5761 100644 --- a/amiga/options.h +++ b/amiga/options.h @@ -34,7 +34,6 @@ extern bool option_new_tab_active; extern bool option_new_tab_last; extern bool option_kiosk_mode; extern char *option_search_engines_file; -extern char *option_search_ico_file; extern char *option_arexx_dir; extern char *option_arexx_startup; extern char *option_arexx_shutdown; @@ -83,7 +82,6 @@ bool option_new_tab_active = false; \ bool option_new_tab_last = false; \ bool option_kiosk_mode = false; \ char *option_search_engines_file = 0; \ -char *option_search_ico_file = 0; \ char *option_arexx_dir = 0; \ char *option_arexx_startup = 0; \ char *option_arexx_shutdown = 0; \ @@ -132,7 +130,6 @@ bool option_accept_lang_locale = true; \ { "new_tab_last", OPTION_BOOL, &option_new_tab_last}, \ { "kiosk_mode", OPTION_BOOL, &option_kiosk_mode}, \ { "search_engines_file", OPTION_STRING, &option_search_engines_file }, \ -{ "search_ico_file", OPTION_STRING, &option_search_ico_file }, \ { "arexx_dir", OPTION_STRING, &option_arexx_dir }, \ { "arexx_startup", OPTION_STRING, &option_arexx_startup }, \ { "arexx_shutdown", OPTION_STRING, &option_arexx_shutdown }, \ diff --git a/amiga/theme.c b/amiga/theme.c index d71421f48..bee0a0b75 100644 --- a/amiga/theme.c +++ b/amiga/theme.c @@ -38,6 +38,7 @@ #include "amiga/drag.h" #include "amiga/options.h" #include "amiga/theme.h" +#include "desktop/searchweb.h" #include "utils/messages.h" #include "utils/utils.h" @@ -96,6 +97,7 @@ char *ptrs32[AMI_LASTPOINTER+1] = { void ami_theme_init(void) { char themefile[1024]; + char searchico[1024]; BPTR lock = 0; strcpy(themefile,option_theme); @@ -121,6 +123,9 @@ void ami_theme_init(void) UnLock(lock); messages_load(themefile); } + + ami_get_theme_filename(searchico, "theme_search", false); + search_default_ico_location = (char *)strdup(searchico); } void ami_theme_throbber_setup(void) |