Remove old hotlist, cookies, and history_global_core modules.

New versions of expand/collapse node functions for these modules aren't yet implemented.

5 files changed, 27 insertions, 25 deletions

diff --git a/gtk/cookies.c b/gtk/cookies.c
index 4c56563a2..e020c53f7 100644
--- a/gtk/cookies.c
+++ b/gtk/cookies.c
@@ -21,9 +21,10 @@
  */
 
 
-#include "desktop/cookies_old.h"
+#include "desktop/cookie_manager.h"
 #include "desktop/plotters.h"
 #include "desktop/tree.h"
+#include "desktop/textinput.h"
 #include "utils/log.h"
 #include "gtk/gui.h"
 #include "gtk/cookies.h"
@@ -160,25 +161,26 @@ void nsgtk_cookies_destroy(void)
 /* edit menu */
 MENUHANDLER(delete_selected)
 {
-	cookies_delete_selected();
+	cookie_manager_keypress(KEY_DELETE_LEFT);
 	return TRUE;
 }
 
 MENUHANDLER(delete_all)
 {
-	cookies_delete_all();
+	cookie_manager_keypress(KEY_SELECT_ALL);
+	cookie_manager_keypress(KEY_DELETE_LEFT);
 	return TRUE;
 }
 
 MENUHANDLER(select_all)
 {
-	cookies_select_all();
+	cookie_manager_keypress(KEY_SELECT_ALL);
 	return TRUE;
 }
 
 MENUHANDLER(clear_selection)
 {
-	cookies_clear_selection();
+	cookie_manager_keypress(KEY_CLEAR_SELECTION);
 	return TRUE;
 }
 
diff --git a/gtk/gui.c b/gtk/gui.c
index 1f191d67c..226d718b0 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -45,9 +45,7 @@
 #include "content/hlcache.h"
 #include "content/urldb.h"
 #include "desktop/browser_private.h"
-#include "desktop/cookies_old.h"
 #include "desktop/gui.h"
-#include "desktop/history_global_core.h"
 #include "desktop/netsurf.h"
 #include "utils/nsoption.h"
 #include "desktop/save_complete.h"
diff --git a/gtk/history.c b/gtk/history.c
index bfdb90b35..c44373939 100644
--- a/gtk/history.c
+++ b/gtk/history.c
@@ -18,9 +18,10 @@
  */
 
 
-#include "desktop/history_global_core.h"
+#include "desktop/global_history.h"
 #include "desktop/plotters.h"
 #include "desktop/tree.h"
+#include "desktop/textinput.h"
 #include "gtk/gui.h"
 #include "gtk/history.h"
 #include "gtk/plotters.h"
@@ -184,7 +185,7 @@ MENUHANDLER(export)
 		gchar *filename = gtk_file_chooser_get_filename(
 				GTK_FILE_CHOOSER(save_dialog));
 		
-		history_global_export(filename);		
+		global_history_export(filename, NULL);		
 		g_free(filename);
 	}
 	
@@ -196,25 +197,26 @@ MENUHANDLER(export)
 /* edit menu */
 MENUHANDLER(delete_selected)
 {
-	history_global_delete_selected();
+	global_history_keypress(KEY_DELETE_LEFT);
 	return TRUE;
 }
 
 MENUHANDLER(delete_all)
 {
-	history_global_delete_all();
+	global_history_keypress(KEY_SELECT_ALL);
+	global_history_keypress(KEY_DELETE_LEFT);
 	return TRUE;
 }
 
 MENUHANDLER(select_all)
 {
-	history_global_select_all();
+	global_history_keypress(KEY_SELECT_ALL);
 	return TRUE;
 }
 
 MENUHANDLER(clear_selection)
 {
-	history_global_clear_selection();
+	global_history_keypress(KEY_CLEAR_SELECTION);
 	return TRUE;
 }
 
@@ -257,6 +259,6 @@ MENUHANDLER(collapse_addresses)
 
 MENUHANDLER(launch)
 {
-	history_global_launch_selected(true);
+	global_history_keypress(KEY_CR);
 	return TRUE;
 }
diff --git a/gtk/hotlist.c b/gtk/hotlist.c
index 618d9d42f..9506ed74f 100644
--- a/gtk/hotlist.c
+++ b/gtk/hotlist.c
@@ -17,7 +17,7 @@
  */
 
 
-#include "desktop/hotlist_old.h"
+#include "desktop/hotlist.h"
 #include "utils/nsoption.h"
 #include "desktop/plotters.h"
 #include "desktop/tree.h"
@@ -190,7 +190,7 @@ MENUHANDLER(export)
 		gchar *filename = gtk_file_chooser_get_filename(
 				GTK_FILE_CHOOSER(save_dialog));
 		
-		hotlist_old_export(filename);		
+		hotlist_export(filename, NULL);		
 		g_free(filename);
 	}
 	
@@ -201,38 +201,38 @@ MENUHANDLER(export)
 
 MENUHANDLER(new_folder)
 {
-	hotlist_old_add_folder(true);
+	hotlist_add_folder(NULL, false, 0);
 	return TRUE;
 }
 
 MENUHANDLER(new_entry)
 {
-	hotlist_old_add_entry(true);
+	hotlist_add_entry(NULL, NULL, false, 0);
 	return TRUE;
 }
 
 /* edit menu */
 MENUHANDLER(edit_selected)
 {
-	hotlist_old_edit_selected();
+	hotlist_edit_selection();
 	return TRUE;
 }
 
 MENUHANDLER(delete_selected)
 {
-	hotlist_old_delete_selected();
+	hotlist_keypress(KEY_DELETE_LEFT);
 	return TRUE;
 }
 
 MENUHANDLER(select_all)
 {
-	hotlist_old_select_all();
+	hotlist_keypress(KEY_SELECT_ALL);
 	return TRUE;
 }
 
 MENUHANDLER(clear_selection)
 {
-	hotlist_old_clear_selection();
+	hotlist_keypress(KEY_CLEAR_SELECTION);
 	return TRUE;
 }
 
@@ -275,6 +275,6 @@ MENUHANDLER(collapse_addresses)
 
 MENUHANDLER(launch)
 {
-	hotlist_old_launch_selected(true);
+	hotlist_keypress(KEY_CR);
 	return TRUE;
 }
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index d2aabafb4..fdc3cc727 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -34,7 +34,7 @@
 #include "css/utils.h"
 #include "desktop/browser_private.h"
 #include "desktop/local_history.h"
-#include "desktop/hotlist_old.h"
+#include "desktop/hotlist.h"
 #include "desktop/gui.h"
 #include "desktop/netsurf.h"
 #include "utils/nsoption.h"
@@ -1540,7 +1540,7 @@ MULTIHANDLER(addbookmarks)
 	if (bw == NULL || bw->current_content == NULL ||
 			hlcache_handle_get_url(bw->current_content) == NULL)
 		return TRUE;
-	hotlist_old_add_page(nsurl_access(hlcache_handle_get_url(bw->current_content)));
+	hotlist_add_url(hlcache_handle_get_url(bw->current_content));
 	return TRUE;
 }