Port to new recursive expand/contract functions.

3 files changed, 18 insertions, 18 deletions

diff --git a/gtk/cookies.c b/gtk/cookies.c
index e020c53f7..35470ce93 100644
--- a/gtk/cookies.c
+++ b/gtk/cookies.c
@@ -187,36 +187,36 @@ MENUHANDLER(clear_selection)
 /* view menu*/
 MENUHANDLER(expand_all)
 {
-	cookies_expand_all();
+	cookie_manager_expand(false);
 	return TRUE;
 }
 
 MENUHANDLER(expand_domains)
 {
-	cookies_expand_domains();
+	cookie_manager_expand(true);
 	return TRUE;
 }
 
 MENUHANDLER(expand_cookies)
 {
-	cookies_expand_cookies();
+	cookie_manager_expand(false);
 	return TRUE;
 }
 
 MENUHANDLER(collapse_all)
 {
-	cookies_collapse_all();
+	cookie_manager_contract(true);
 	return TRUE;
 }
 
 MENUHANDLER(collapse_domains)
 {
-	cookies_collapse_domains();
+	cookie_manager_contract(true);
 	return TRUE;
 }
 
 MENUHANDLER(collapse_cookies)
 {
-	cookies_collapse_cookies();
+	cookie_manager_contract(false);
 	return TRUE;
 }
diff --git a/gtk/history.c b/gtk/history.c
index c44373939..2cf1438d4 100644
--- a/gtk/history.c
+++ b/gtk/history.c
@@ -223,37 +223,37 @@ MENUHANDLER(clear_selection)
 /* view menu*/
 MENUHANDLER(expand_all)
 {
-	history_global_expand_all();
+	global_history_expand(false);
 	return TRUE;
 }
 
 MENUHANDLER(expand_directories)
 {
-	history_global_expand_directories();
+	global_history_expand(true);
 	return TRUE;
 }
 
 MENUHANDLER(expand_addresses)
 {
-	history_global_expand_addresses();
+	global_history_expand(false);
 	return TRUE;
 }
 
 MENUHANDLER(collapse_all)
 {
-	history_global_collapse_all();
+	global_history_contract(true);
 	return TRUE;
 }
 
 MENUHANDLER(collapse_directories)
 {
-	history_global_collapse_directories();
+	global_history_contract(true);
 	return TRUE;
 }
 
 MENUHANDLER(collapse_addresses)
 {
-	history_global_collapse_addresses();
+	global_history_contract(false);
 	return TRUE;
 }
 
diff --git a/gtk/hotlist.c b/gtk/hotlist.c
index 9506ed74f..db090992c 100644
--- a/gtk/hotlist.c
+++ b/gtk/hotlist.c
@@ -239,37 +239,37 @@ MENUHANDLER(clear_selection)
 /* view menu*/
 MENUHANDLER(expand_all)
 {
-	hotlist_old_expand_all();
+	hotlist_expand(false);
 	return TRUE;
 }
 
 MENUHANDLER(expand_directories)
 {
-	hotlist_old_expand_directories();
+	hotlist_expand(true);
 	return TRUE;
 }
 
 MENUHANDLER(expand_addresses)
 {
-	hotlist_old_expand_addresses();
+	hotlist_expand(false);
 	return TRUE;
 }
 
 MENUHANDLER(collapse_all)
 {
-	hotlist_old_collapse_all();
+	hotlist_contract(true);
 	return TRUE;
 }
 
 MENUHANDLER(collapse_directories)
 {
-	hotlist_old_collapse_directories();
+	hotlist_contract(true);
 	return TRUE;
 }
 
 MENUHANDLER(collapse_addresses)
 {
-	hotlist_old_collapse_addresses();
+	hotlist_contract(false);
 	return TRUE;
 }