Move old hotlist out of the way.

4 files changed, 26 insertions, 26 deletions

diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index be52865fd..e7bbe6237 100644
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -41,7 +41,7 @@
 #include "amiga/utf8.h"
 #include "desktop/browser_private.h"
 #include "desktop/local_history.h"
-#include "desktop/hotlist.h"
+#include "desktop/hotlist_old.h"
 #include "desktop/searchweb.h"
 #include "desktop/textinput.h"
 #include "desktop/tree_url_node.h"
@@ -768,7 +768,7 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
 
 			case CMID_URLHOTLIST:
 			case CMID_PAGEHOTLIST:
-				hotlist_add_page(userdata);
+				hotlist_old_add_page(userdata);
 			break;
 
 			case CMID_FRAMECOPYURL:
@@ -1216,7 +1216,7 @@ static uint32 ami_context_menu_hook_tree(struct Hook *hook, Object *item, APTR r
 			break;
 
 			case CMID_TREE_EDITFOLDER:
-				hotlist_edit_selected();
+				hotlist_old_edit_selected();
 			break;
 
 			case CMID_TREE_EDITTITLE:
@@ -1228,23 +1228,23 @@ static uint32 ami_context_menu_hook_tree(struct Hook *hook, Object *item, APTR r
 			break;
 
 			case CMID_TREE_NEWFOLDER:
-				hotlist_add_folder(true);
+				hotlist_old_add_folder(true);
 			break;
 
 			case CMID_TREE_NEWITEM:
-				hotlist_add_entry(true);
+				hotlist_old_add_entry(true);
 			break;
 
 			case CMID_TREE_SETDEFAULT:
-				hotlist_set_default_folder(false);
+				hotlist_old_set_default_folder(false);
 			break;
 
 			case CMID_TREE_CLEARDEFAULT:
-				hotlist_set_default_folder(true);
+				hotlist_old_set_default_folder(true);
 			break;
 
 			case CMID_TREE_ADDHOTLIST:
-				hotlist_add_page(tree_url_node_get_url(userdata));
+				hotlist_old_add_page(tree_url_node_get_url(userdata));
 			break;
 
 			case CMID_TREE_DELETE:
diff --git a/amiga/hotlist.c b/amiga/hotlist.c
index c82b92f72..073296771 100755
--- a/amiga/hotlist.c
+++ b/amiga/hotlist.c
@@ -19,7 +19,7 @@
 #include <proto/exec.h>
 #include "amiga/hotlist.h"
 #include "amiga/tree.h"
-#include "desktop/hotlist.h"
+#include "desktop/hotlist_old.h"
 #include "utils/messages.h"
 
 bool ami_hotlist_find_dir(struct tree *tree, const char *dir_name)
@@ -56,11 +56,11 @@ void ami_hotlist_add_default_dirs(struct tree *tree)
 
 void ami_hotlist_initialise(const char *hotlist_file)
 {
-	hotlist_window = ami_tree_create(hotlist_get_tree_flags(), NULL);
+	hotlist_window = ami_tree_create(hotlist_old_get_tree_flags(), NULL);
 
 	if(!hotlist_window) return;
 
-	hotlist_initialise(ami_tree_get_tree(hotlist_window),
+	hotlist_old_initialise(ami_tree_get_tree(hotlist_window),
 			   hotlist_file,
 			   tree_directory_icon_name);
 			   
@@ -69,7 +69,7 @@ void ami_hotlist_initialise(const char *hotlist_file)
 
 void ami_hotlist_free(const char *hotlist_file)
 {
-	hotlist_cleanup(hotlist_file);
+	hotlist_old_cleanup(hotlist_file);
 	ami_tree_destroy(hotlist_window);
 	hotlist_window = NULL;
 }
diff --git a/amiga/menu.c b/amiga/menu.c
index ef1338cc8..4f2e1556d 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -57,7 +57,7 @@
 #include "amiga/tree.h"
 #include "amiga/utf8.h"
 #include "desktop/tree_url_node.h"
-#include "desktop/hotlist.h"
+#include "desktop/hotlist_old.h"
 #include "desktop/browser_private.h"
 #include "desktop/gui.h"
 #include "desktop/textinput.h"
@@ -888,7 +888,7 @@ static void ami_menu_item_hotlist_add(struct Hook *hook, APTR window, struct Int
 			nsurl_access(hlcache_handle_get_url(bw->current_content)) == NULL)
 		return;
 
-	hotlist_add_page(nsurl_access(hlcache_handle_get_url(bw->current_content)));
+	hotlist_old_add_page(nsurl_access(hlcache_handle_get_url(bw->current_content)));
 }
 
 static void ami_menu_item_hotlist_show(struct Hook *hook, APTR window, struct IntuiMessage *msg)
diff --git a/amiga/tree.c b/amiga/tree.c
index 327e91195..a8dda20b7 100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -57,7 +57,7 @@
 #include "content/urldb.h"
 #include "desktop/cookies_old.h"
 #include "desktop/history_global_core.h"
-#include "desktop/hotlist.h"
+#include "desktop/hotlist_old.h"
 #include "desktop/sslcert_viewer.h"
 #include "desktop/tree_url_node.h"
 #include "utils/utils.h"
@@ -340,7 +340,7 @@ void ami_tree_drag_end(struct treeview_window *twin, int x, int y)
 			else if((tw = ami_window_at_pointer(AMINS_TVWINDOW)) &&
 				(tw != twin) && (tw->type == AMI_TREE_HOTLIST))
 			{
-				hotlist_add_page_xy(tree_url_node_get_url(selected_node), x, y);
+				hotlist_old_add_page_xy(tree_url_node_get_url(selected_node), x, y);
 			}
 		}
 		tree_drag_end(twin->tree, twin->mouse_state,
@@ -1014,7 +1014,7 @@ BOOL ami_tree_event(struct treeview_window *twin)
 										if(twin->type == AMI_TREE_HISTORY)
 											history_global_export(fname);
 										else if(twin->type == AMI_TREE_HOTLIST)
-											hotlist_export(fname);
+											hotlist_old_export(fname);
 										ami_update_pointer(twin->win, GUI_POINTER_DEFAULT);
 									}
 								break;
@@ -1032,7 +1032,7 @@ BOOL ami_tree_event(struct treeview_window *twin)
 													cookies_expand_all();
 												break;
 												case AMI_TREE_HOTLIST:
-													hotlist_expand_all();
+													hotlist_old_expand_all();
 												break;
 											}
 										break;
@@ -1047,7 +1047,7 @@ BOOL ami_tree_event(struct treeview_window *twin)
 													cookies_expand_domains();
 												break;
 												case AMI_TREE_HOTLIST:
-													hotlist_expand_directories();
+													hotlist_old_expand_directories();
 												break;
 											}
 										break;
@@ -1062,7 +1062,7 @@ BOOL ami_tree_event(struct treeview_window *twin)
 													cookies_expand_cookies();
 												break;
 												case AMI_TREE_HOTLIST:
-													hotlist_expand_addresses();
+													hotlist_old_expand_addresses();
 												break;
 											}
 										break;
@@ -1082,7 +1082,7 @@ BOOL ami_tree_event(struct treeview_window *twin)
 													cookies_collapse_all();
 												break;
 												case AMI_TREE_HOTLIST:
-													hotlist_collapse_all();
+													hotlist_old_collapse_all();
 												break;
 											}
 										break;
@@ -1097,7 +1097,7 @@ BOOL ami_tree_event(struct treeview_window *twin)
 													cookies_collapse_domains();
 												break;
 												case AMI_TREE_HOTLIST:
-													hotlist_collapse_directories();
+													hotlist_old_collapse_directories();
 												break;
 											}
 										break;
@@ -1112,7 +1112,7 @@ BOOL ami_tree_event(struct treeview_window *twin)
 													cookies_collapse_cookies();
 												break;
 												case AMI_TREE_HOTLIST:
-													hotlist_collapse_addresses();
+													hotlist_old_collapse_addresses();
 												break;
 											}
 										break;
@@ -1163,7 +1163,7 @@ BOOL ami_tree_event(struct treeview_window *twin)
 											cookies_delete_selected();
 										break;
 										case AMI_TREE_HOTLIST:
-											hotlist_delete_selected();
+											hotlist_old_delete_selected();
 										break;
 									}
 									ami_tree_update_buttons(twin);
@@ -1179,7 +1179,7 @@ BOOL ami_tree_event(struct treeview_window *twin)
 											cookies_select_all();
 										break;
 										case AMI_TREE_HOTLIST:
-											hotlist_select_all();
+											hotlist_old_select_all();
 										break;
 									}
 									ami_tree_update_buttons(twin);
@@ -1195,7 +1195,7 @@ BOOL ami_tree_event(struct treeview_window *twin)
 											cookies_clear_selection();
 										break;
 										case AMI_TREE_HOTLIST:
-											hotlist_clear_selection();
+											hotlist_old_clear_selection();
 										break;
 									}
 									ami_tree_update_buttons(twin);