diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-05 18:56:03 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-05 18:56:03 +0000 |
commit | 047b37d5f8c3810f8942f5744bb92640fbd4879f (patch) | |
tree | e9c782f4c5c38d8d4f1c11716b6eeb61e0ffc0c0 /frontends/amiga/menu.c | |
parent | 695783e33b9c100b1ce28ef71a59a00f52cc374f (diff) | |
parent | 5687f6c27d40ec596b4d64c705d16a97bdb3c893 (diff) | |
download | netsurf-047b37d5f8c3810f8942f5744bb92640fbd4879f.tar.gz netsurf-047b37d5f8c3810f8942f5744bb92640fbd4879f.tar.bz2 |
Merge branch 'chris/amiga-corewindow'
Amiga cookie and SSL cert windows now migrated to corewindow
Diffstat (limited to 'frontends/amiga/menu.c')
-rw-r--r-- | frontends/amiga/menu.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c index 97b00f964..d88139d9f 100644 --- a/frontends/amiga/menu.c +++ b/frontends/amiga/menu.c @@ -77,7 +77,6 @@ #include "amiga/utf8.h" #include "amiga/schedule.h" -#define NSA_SPACE "blankspace.png" #define NSA_MAX_HOTLIST_MENU_LEN 100 enum { @@ -368,7 +367,7 @@ HOOKF(void, ami_menu_item_browser_globalhistory, APTR, window, struct IntuiMessa HOOKF(void, ami_menu_item_browser_cookies, APTR, window, struct IntuiMessage *) { - ami_tree_open(cookies_window,AMI_TREE_COOKIES); + ami_cookies_present(); } HOOKF(void, ami_menu_item_browser_foreimg, APTR, window, struct IntuiMessage *) @@ -545,7 +544,7 @@ HOOKF(void, ami_menu_item_arexx_entries, APTR, window, struct IntuiMessage *) /* menu creation code */ -void ami_menu_free_labs(struct ami_menu_data **md, int max) +static void ami_menu_free_labs(struct ami_menu_data **md, int max) { int i; @@ -984,6 +983,12 @@ void ami_menu_free(struct gui_window_2 *gwin) FreeMenus(gwin->imenu); } +void ami_menu_free_menu(struct ami_menu_data **md, int max, struct Menu *imenu) +{ + ami_menu_free_labs(md, max); + FreeMenus(imenu); +} + struct Menu *ami_menu_create(struct gui_window_2 *gwin) { ami_init_menulabs(gwin->menu_data); |