Remove old hotlist, cookies, and history_global_core modules.

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

3 files changed, 14 insertions, 9 deletions

diff --git a/atari/history.c b/atari/history.c
index 97636e294..1a19d4adc 100755
--- a/atari/history.c
+++ b/atari/history.c
@@ -25,7 +25,7 @@
 #include "utils/nsoption.h"
 #include "desktop/tree.h"
 #include "desktop/gui.h"
-#include "desktop/history_global_core.h"
+#include "desktop/global_history.h"
 #include "desktop/browser.h"
 #include "utils/messages.h"
 #include "content/content.h"
diff --git a/atari/hotlist.c b/atari/hotlist.c
index 9211f3c4f..57cf0c08b 100755
--- a/atari/hotlist.c
+++ b/atari/hotlist.c
@@ -28,7 +28,7 @@
 #include "content/hlcache.h"
 #include "content/urldb.h"
 #include "utils/nsoption.h"
-#include "desktop/hotlist_old.h"
+#include "desktop/hotlist.h"
 #include "desktop/tree.h"
 #include "desktop/gui.h"
 #include "utils/log.h"
@@ -61,20 +61,20 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8])
 
 				switch	(msg[4]) {
 					case TOOLBAR_HOTLIST_CREATE_FOLDER:
-						hotlist_old_add_folder(true);
+						hotlist_add_folder(NULL, false, 0);
 						break;
 
 					case TOOLBAR_HOTLIST_ADD:
-						atari_hotlist_add_page("http://www.de", "");
+						atari_hotlist_add_page(NULL, NULL);
 						break;
 
 					case TOOLBAR_HOTLIST_DELETE:
-						hotlist_old_delete_selected();
+						hotlist_keypress(KEY_DELETE_LEFT);
 						gemtk_wm_exec_redraw(tv->window, NULL);
 						break;
 
 					case TOOLBAR_HOTLIST_EDIT:
-						hotlist_old_edit_selected();
+						hotlist_edit_selection();
 						break;
 				}
 
@@ -207,15 +207,20 @@ void atari_hotlist_add_page( const char * url, const char * title )
 	struct node * root;
 	struct node * selected = NULL;
 	struct node * folder = NULL;
+	nsurl *nsurl;
 	NSTREEVIEW tv = hl.tv;
 	if(hl.tv == NULL )
 		return;
 
 	atari_hotlist_open();
 
+	if (nsurl_create(url, &nsurl) != NSERROR_OK)
+		return;
+
 	if( hl.tv->click.x >= 0 && hl.tv->click.y >= 0 ){
-		hotlist_old_add_page_xy( url, hl.tv->click.x, hl.tv->click.y );
+		hotlist_add_entry( nsurl, title, true, hl.tv->click.y );
 	} else {
-		hotlist_old_add_page( url );
+		hotlist_add_url( nsurl );
 	}
+	nsurl_unref(nsurl);
 }
diff --git a/atari/misc.c b/atari/misc.c
index 75410d2e6..974d37e69 100755
--- a/atari/misc.c
+++ b/atari/misc.c
@@ -27,7 +27,7 @@
 
 #include "content/content.h"
 #include "content/hlcache.h"

-#include "desktop/cookies_old.h"

+#include "desktop/cookie_manager.h"

 #include "desktop/mouse.h"
 #include "desktop/tree.h"
 #include "utils/nsoption.h"