Author: chris_y
Date: Sun Sep 26 15:21:55 2010
New Revision: 10847
URL:
http://source.netsurf-browser.org?rev=10847&view=rev
Log:
Don't probe options from hotlist.c
Modified:
branches/jmb/treeview-redux/amiga/gui.c
branches/jmb/treeview-redux/amiga/hotlist.c
branches/jmb/treeview-redux/amiga/hotlist.h
Modified: branches/jmb/treeview-redux/amiga/gui.c
URL:
http://source.netsurf-browser.org/branches/jmb/treeview-redux/amiga/gui.c...
==============================================================================
--- branches/jmb/treeview-redux/amiga/gui.c (original)
+++ branches/jmb/treeview-redux/amiga/gui.c Sun Sep 26 15:21:55 2010
@@ -564,7 +564,7 @@
ami_get_theme_filename(&tree_directory_icon_name,"theme_list_folder",true);
ami_get_theme_filename(&tree_content_icon_name,"theme_list_content",true);
- ami_hotlist_initialise();
+ ami_hotlist_initialise(option_hotlist_file);
ami_cookies_initialise();
ami_global_history_initialise();
sslcert_init();
@@ -1998,7 +1998,7 @@
urldb_save(option_url_file);
urldb_save_cookies(option_cookie_file);
- ami_hotlist_free();
+ ami_hotlist_free(option_hotlist_file);
ami_cookies_free();
ami_global_history_free();
sslcert_cleanup();
Modified: branches/jmb/treeview-redux/amiga/hotlist.c
URL:
http://source.netsurf-browser.org/branches/jmb/treeview-redux/amiga/hotli...
==============================================================================
--- branches/jmb/treeview-redux/amiga/hotlist.c (original)
+++ branches/jmb/treeview-redux/amiga/hotlist.c Sun Sep 26 15:21:55 2010
@@ -19,22 +19,21 @@
#include <proto/exec.h>
#include "amiga/hotlist.h"
#include "desktop/hotlist.h"
-#include "amiga/options.h"
#include "amiga/tree.h"
-void ami_hotlist_initialise(void)
+void ami_hotlist_initialise(const char *hotlist_file)
{
hotlist_window = ami_tree_create(hotlist_get_tree_flags(), NULL);
if(!hotlist_window) return;
hotlist_initialise(ami_tree_get_tree(hotlist_window),
- option_hotlist_file);
+ hotlist_file);
}
-void ami_hotlist_free()
+void ami_hotlist_free(const char *hotlist_file)
{
- hotlist_cleanup(option_hotlist_file);
+ hotlist_cleanup(hotlist_file);
ami_tree_destroy(hotlist_window);
hotlist_window = NULL;
}
Modified: branches/jmb/treeview-redux/amiga/hotlist.h
URL:
http://source.netsurf-browser.org/branches/jmb/treeview-redux/amiga/hotli...
==============================================================================
--- branches/jmb/treeview-redux/amiga/hotlist.h (original)
+++ branches/jmb/treeview-redux/amiga/hotlist.h Sun Sep 26 15:21:55 2010
@@ -21,8 +21,8 @@
#include "desktop/tree.h"
#include "amiga/tree.h"
-void ami_hotlist_initialise(void);
-void ami_hotlist_free(void);
+void ami_hotlist_initialise(const char *hotlist_file);
+void ami_hotlist_free(const char *hotlist_file);
struct treeview_window *hotlist_window;
#endif