diff options
author | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2011-01-20 14:05:13 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2011-01-20 14:05:13 +0000 |
commit | 699f0cb344d589c6c4b218a6b18d717bccf45e4a (patch) | |
tree | f543d6c1b8b31768c084b03c76c7ce88aa47ed6c /gtk/gtk_gui.c | |
parent | 3e7bf7cfb5368bb59fb3a620cac1e3dfcccf1ebb (diff) | |
download | netsurf-699f0cb344d589c6c4b218a6b18d717bccf45e4a.tar.gz netsurf-699f0cb344d589c6c4b218a6b18d717bccf45e4a.tar.bz2 |
Make the tree icon dir a non-option
svn path=/trunk/netsurf/; revision=11422
Diffstat (limited to 'gtk/gtk_gui.c')
-rw-r--r-- | gtk/gtk_gui.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index ed20d9b8e..399cf138f 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -55,6 +55,7 @@ #include "desktop/searchweb.h" #include "desktop/sslcert.h" #include "desktop/textinput.h" +#include "desktop/tree.h" #include "css/utils.h" #include "gtk/dialogs/gtk_options.h" #include "gtk/gtk_completion.h" @@ -390,15 +391,10 @@ static void check_options(char **respath) option_downloads_directory = hdir; } - if (!option_tree_icons_dir) { - sfindresourcedef(respath, buf, "icons/", "~/.netsurf/"); - LOG(("Using '%s' as Tree icons dir", buf)); - option_tree_icons_dir = strdup(buf); - } - if (!option_tree_icons_dir) - die("Failed initialising tree icons option"); - - + sfindresourcedef(respath, buf, "icons/", "~/.netsurf/"); + LOG(("Using '%s' as Tree icons dir", buf)); + tree_set_icon_dir(strdup(buf)); + if (!option_hotlist_path) { sfindresourcedef(respath, buf, "Hotlist", "~/.netsurf/"); LOG(("Using '%s' as Hotlist file", buf)); @@ -689,7 +685,6 @@ void gui_quit(void) free(adblock_stylesheet_url); free(option_cookie_file); free(option_cookie_jar); - free(option_tree_icons_dir); free(print_options_file_location); free(search_engines_file_location); free(search_default_ico_location); |