From 5c7ca39ada083e74ba93549efe71c67c906d91bc Mon Sep 17 00:00:00 2001
From: Michael Drake <tlsa@netsurf-browser.org>
Date: Mon, 2 Sep 2013 14:17:09 +0100
Subject: Remove tree_url_node module.  Had to disable treeview scanning in
 amiga and cocoa front ends.  Amiga front end very likely broken.

---
 amiga/context_menu.c | 11 +++++------
 amiga/gui.c          |  7 ++++++-
 amiga/menu.c         |  7 ++++++-
 amiga/tree.c         | 13 -------------
 4 files changed, 17 insertions(+), 21 deletions(-)

(limited to 'amiga')

diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index e7bbe6237..4d4d73aec 100644
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -44,7 +44,6 @@
 #include "desktop/hotlist_old.h"
 #include "desktop/searchweb.h"
 #include "desktop/textinput.h"
-#include "desktop/tree_url_node.h"
 #include "render/form.h"
 #include "utils/utf8.h"
 #include "utils/messages.h"
@@ -1220,11 +1219,11 @@ static uint32 ami_context_menu_hook_tree(struct Hook *hook, Object *item, APTR r
 			break;
 
 			case CMID_TREE_EDITTITLE:
-				tree_url_node_edit_title(tree, userdata);
+				warn_user("TODO.", 0);
 			break;
 
 			case CMID_TREE_EDITLINK:
-				tree_url_node_edit_url(tree, userdata);
+				warn_user("TODO.", 0);
 			break;
 
 			case CMID_TREE_NEWFOLDER:
@@ -1236,15 +1235,15 @@ static uint32 ami_context_menu_hook_tree(struct Hook *hook, Object *item, APTR r
 			break;
 
 			case CMID_TREE_SETDEFAULT:
-				hotlist_old_set_default_folder(false);
+				warn_user("TODO.", 0);
 			break;
 
 			case CMID_TREE_CLEARDEFAULT:
-				hotlist_old_set_default_folder(true);
+				warn_user("TODO.", 0);
 			break;
 
 			case CMID_TREE_ADDHOTLIST:
-				hotlist_old_add_page(tree_url_node_get_url(userdata));
+				warn_user("TODO.", 0);
 			break;
 
 			case CMID_TREE_DELETE:
diff --git a/amiga/gui.c b/amiga/gui.c
index f60e47835..d18e41021 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -29,7 +29,6 @@
 #include "desktop/searchweb.h"
 #include "desktop/textinput.h"
 #include "desktop/tree.h"
-#include "desktop/tree_url_node.h"
 #include "image/ico.h"
 #include "utils/log.h"
 #include "utils/messages.h"
@@ -2857,6 +2856,7 @@ void ami_update_buttons(struct gui_window_2 *gwin)
 void ami_gui_hotlist_scan_2(struct tree *tree, struct node *root, WORD *gen, int *item,
 			struct List *speed_button_list, struct gui_window_2 *gwin)
 {
+#if 0
 	struct node *tempnode;
 	struct node_element *element=NULL;
 	struct node *node;
@@ -2889,10 +2889,12 @@ void ami_gui_hotlist_scan_2(struct tree *tree, struct node *root, WORD *gen, int
 	}
 
 	*gen = *gen - 1;
+#endif
 }
 
 int ami_gui_hotlist_scan(struct tree *tree, struct List *speed_button_list, struct gui_window_2 *gwin)
 {
+#if 0
 	struct node *root = tree_node_get_child(tree_get_root(tree));
 	struct node *node;
 	struct node_element *element;
@@ -2910,6 +2912,9 @@ int ami_gui_hotlist_scan(struct tree *tree, struct List *speed_button_list, stru
 	}
 
 	return item;
+#else
+	return 0;
+#endif
 }
 
 void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin)
diff --git a/amiga/menu.c b/amiga/menu.c
index 6d8c5eb92..f114253a1 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -58,7 +58,6 @@
 #include "amiga/theme.h"
 #include "amiga/tree.h"
 #include "amiga/utf8.h"
-#include "desktop/tree_url_node.h"
 #include "desktop/hotlist_old.h"
 #include "desktop/browser_private.h"
 #include "desktop/gui.h"
@@ -540,6 +539,7 @@ void ami_menu_arexx_scan(struct gui_window_2 *gwin)
 
 ULONG ami_menu_scan(struct tree *tree, struct gui_window_2 *gwin)
 {
+#if 0
 	struct node *root = tree_node_get_child(tree_get_root(tree));
 	struct node *node;
 	struct node_element *element;
@@ -560,11 +560,15 @@ ULONG ami_menu_scan(struct tree *tree, struct gui_window_2 *gwin)
 	}
 
 	return(item - AMI_MENU_HOTLIST);
+#else
+	return 0;
+#endif
 }
 
 void ami_menu_scan_2(struct tree *tree, struct node *root, WORD *gen,
 		int *item, struct gui_window_2 *gwin)
 {
+#if 0
 	struct node *tempnode;
 	struct node_element *element=NULL;
 	struct node *node;
@@ -602,6 +606,7 @@ void ami_menu_scan_2(struct tree *tree, struct node *root, WORD *gen,
 	}
 
 	*gen = *gen - 1;
+#endif
 }
 
 void ami_menu_update_checked(struct gui_window_2 *gwin)
diff --git a/amiga/tree.c b/amiga/tree.c
index 478000b92..0515f706b 100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -59,7 +59,6 @@
 #include "desktop/history_global_core.h"
 #include "desktop/hotlist_old.h"
 #include "desktop/sslcert_viewer.h"
-#include "desktop/tree_url_node.h"
 #include "utils/utils.h"
 #include "utils/messages.h"
 
@@ -193,18 +192,6 @@ void ami_tree_get_window_dimensions(int *width, int *height, void *data)
 	if(height) *height = bbox->Height;
 }
 
-/**
- * Translates a content_type to the name of a respective icon
- *
- * \param content_type	content type
- * \param buffer	buffer for the icon name
- */
-void tree_icon_name_from_content_type(char *buffer, content_type type)
-{
-	const char *ftype = ami_content_type_to_file_type(type);
-	sprintf(buffer, "def_%s.info", ftype);
-}
-
 /**
  * Scrolls the tree to make an element visible
  *
-- 
cgit v1.2.3