Port to new recursive expand/contract functions.

3 files changed, 31 insertions, 31 deletions

diff --git a/riscos/cookies.c b/riscos/cookies.c
index dfdbc5d20..7f37de812 100644
--- a/riscos/cookies.c
+++ b/riscos/cookies.c
@@ -183,19 +183,19 @@ void ro_gui_cookies_toolbar_click(button_bar_action action)
 		break;
 
 	case TOOLBAR_BUTTON_EXPAND:
-		cookies_expand_cookies();
+		cookie_manager_expand(false);
 		break;
 
 	case TOOLBAR_BUTTON_COLLAPSE:
-		cookies_collapse_cookies();
+		cookie_manager_contract(false);
 		break;
 
 	case TOOLBAR_BUTTON_OPEN:
-		cookies_expand_domains();
+		cookie_manager_expand(true);
 		break;
 
 	case TOOLBAR_BUTTON_CLOSE:
-		cookies_collapse_domains();
+		cookie_manager_contract(true);
 		break;
 
 	default:
@@ -300,22 +300,22 @@ bool ro_gui_cookies_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
 {
 	switch (action) {
 	case TREE_EXPAND_ALL:
-		cookies_expand_all();
+		cookie_manager_expand(false);
 		return true;
 	case TREE_EXPAND_FOLDERS:
-		cookies_expand_domains();
+		cookie_manager_expand(true);
 		return true;
 	case TREE_EXPAND_LINKS:
-		cookies_expand_cookies();
+		cookie_manager_expand(false);
 		return true;
 	case TREE_COLLAPSE_ALL:
-		cookies_collapse_all();
+		cookie_manager_contract(true);
 		return true;
 	case TREE_COLLAPSE_FOLDERS:
-		cookies_collapse_domains();
+		cookie_manager_contract(true);
 		return true;
 	case TREE_COLLAPSE_LINKS:
-		cookies_collapse_cookies();
+		cookie_manager_contract(false);
 		return true;
 	case TREE_SELECTION_DELETE:
 		cookie_manager_keypress(KEY_DELETE_LEFT);
diff --git a/riscos/global_history.c b/riscos/global_history.c
index aecc98903..dfabbe9cf 100644
--- a/riscos/global_history.c
+++ b/riscos/global_history.c
@@ -189,19 +189,19 @@ void ro_gui_global_history_toolbar_click(button_bar_action action)
 		break;
 
 	case TOOLBAR_BUTTON_EXPAND:
-		history_global_expand_addresses();
+		global_history_expand(false);
 		break;
 
 	case TOOLBAR_BUTTON_COLLAPSE:
-		history_global_collapse_addresses();
+		global_history_contract(false);
 		break;
 
 	case TOOLBAR_BUTTON_OPEN:
-		history_global_expand_directories();
+		global_history_expand(true);
 		break;
 
 	case TOOLBAR_BUTTON_CLOSE:
-		history_global_collapse_directories();
+		global_history_contract(true);
 		break;
 
 	case TOOLBAR_BUTTON_LAUNCH:
@@ -324,22 +324,22 @@ bool ro_gui_global_history_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
 		ro_gui_dialog_open_persistent(w, dialog_saveas, true);
 		return true;
 	case TREE_EXPAND_ALL:
-		history_global_expand_all();
+		global_history_expand(false);
 		return true;
 	case TREE_EXPAND_FOLDERS:
-		history_global_expand_directories();
+		global_history_expand(true);
 		return true;
 	case TREE_EXPAND_LINKS:
-		history_global_expand_addresses();
+		global_history_expand(false);
 		return true;
 	case TREE_COLLAPSE_ALL:
-		history_global_collapse_all();
+		global_history_contract(true);
 		return true;
 	case TREE_COLLAPSE_FOLDERS:
-		history_global_collapse_directories();
+		global_history_contract(true);
 		return true;
 	case TREE_COLLAPSE_LINKS:
-		history_global_collapse_addresses();
+		global_history_contract(false);
 		return true;
 	case TREE_SELECTION_LAUNCH:
 		global_history_keypress(KEY_CR);
diff --git a/riscos/hotlist.c b/riscos/hotlist.c
index 73c800280..d00e72479 100644
--- a/riscos/hotlist.c
+++ b/riscos/hotlist.c
@@ -231,19 +231,19 @@ void ro_gui_hotlist_toolbar_click(button_bar_action action)
 		break;
 
 	case TOOLBAR_BUTTON_EXPAND:
-		hotlist_old_expand_addresses();
+		hotlist_expand(false);
 		break;
 
 	case TOOLBAR_BUTTON_COLLAPSE:
-		hotlist_old_collapse_addresses();
+		hotlist_contract(false);
 		break;
 
 	case TOOLBAR_BUTTON_OPEN:
-		hotlist_old_expand_directories();
+		hotlist_expand(true);
 		break;
 
 	case TOOLBAR_BUTTON_CLOSE:
-		hotlist_old_collapse_directories();
+		hotlist_contract(true);
 		break;
 
 	case TOOLBAR_BUTTON_LAUNCH:
@@ -372,22 +372,22 @@ bool ro_gui_hotlist_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
 		hotlist_add_entry(NULL, NULL, false, 0);
 		return true;
 	case TREE_EXPAND_ALL:
-		hotlist_old_expand_all();
+		hotlist_expand(false);
 		return true;
 	case TREE_EXPAND_FOLDERS:
-		hotlist_old_expand_directories();
+		hotlist_expand(true);
 		return true;
 	case TREE_EXPAND_LINKS:
-		hotlist_old_expand_addresses();
+		hotlist_expand(false);
 		return true;
 	case TREE_COLLAPSE_ALL:
-		hotlist_old_collapse_all();
+		hotlist_contract(true);
 		return true;
 	case TREE_COLLAPSE_FOLDERS:
-		hotlist_old_collapse_directories();
+		hotlist_contract(true);
 		return true;
 	case TREE_COLLAPSE_LINKS:
-		hotlist_old_collapse_addresses();
+		hotlist_contract(false);
 		return true;
 	case TREE_SELECTION_EDIT:
 		hotlist_edit_selection();
@@ -541,7 +541,7 @@ static void ro_gui_hotlist_addurl_bounce(wimp_message *message)
 		if (nsurl_create(hotlist_url, &nsurl) != NSERROR_OK)
 			return;
 
-		hotlist_add_page(nsurl);
+		hotlist_add_url(nsurl);
 		nsurl_unref(nsurl);
 	}