summaryrefslogtreecommitdiff
path: root/amiga/context_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'amiga/context_menu.c')
-rwxr-xr-xamiga/context_menu.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index aec1b9d24..36f52dc91 100755
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -231,7 +231,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat
PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL,
PMIA_Title, (ULONG)ctxmenulab[CMID_PAGEHOTLIST],
PMIA_ID, CMID_PAGEHOTLIST,
- PMIA_UserData, nsurl_access(content_get_url(userdata)),
+ PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)),
PMIA_CommKey, "B",
TAG_DONE),
TAG_DONE),
@@ -247,12 +247,12 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat
PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL,
PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMEWIN],
PMIA_ID, CMID_FRAMEWIN,
- PMIA_UserData, nsurl_access(content_get_url(userdata)),
+ PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)),
TAG_DONE),
PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL,
PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMETAB],
PMIA_ID, CMID_FRAMETAB,
- PMIA_UserData, nsurl_access(content_get_url(userdata)),
+ PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)),
TAG_DONE),
PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL,
PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMESHOW],
@@ -273,7 +273,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat
PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL,
PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMECOPYURL],
PMIA_ID, CMID_FRAMECOPYURL,
- PMIA_UserData, nsurl_access(content_get_url(userdata)),
+ PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)),
TAG_DONE),
PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL,
PMIA_Title, ~0,
@@ -401,7 +401,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat
PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL,
PMIA_Title, (ULONG)ctxmenulab[CMID_COPYOBJ],
PMIA_ID, CMID_COPYOBJ,
- PMIA_UserData, nsurl_access(content_get_url(userdata)),
+ PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)),
TAG_DONE),
PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL,
PMIA_Title, (ULONG)ctxmenulab[CMID_CLIPOBJ],
@@ -757,30 +757,30 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
case CMID_FRAMEWIN:
case CMID_URLOPENWIN:
bw = browser_window_create(userdata, gwin->bw,
- nsurl_access(content_get_url(gwin->bw->current_content)), true, false);
+ nsurl_access(hlcache_handle_get_url(gwin->bw->current_content)), true, false);
break;
case CMID_FRAMETAB:
case CMID_URLOPENTAB:
bw = browser_window_create(userdata, gwin->bw,
- nsurl_access(content_get_url(gwin->bw->current_content)), true, true);
+ nsurl_access(hlcache_handle_get_url(gwin->bw->current_content)), true, true);
break;
case CMID_FRAMESAVE:
case CMID_SAVEURL:
browser_window_download(gwin->bw, userdata,
- nsurl_access(content_get_url(gwin->bw->current_content)));
+ nsurl_access(hlcache_handle_get_url(gwin->bw->current_content)));
break;
case CMID_FRAMESHOW:
case CMID_SHOWOBJ:
- browser_window_go(gwin->bw, nsurl_access(content_get_url(userdata)),
- nsurl_access(content_get_url(gwin->bw->current_content)), true);
+ browser_window_go(gwin->bw, nsurl_access(hlcache_handle_get_url(userdata)),
+ nsurl_access(hlcache_handle_get_url(gwin->bw->current_content)), true);
break;
case CMID_URLOPEN:
browser_window_go(gwin->bw, userdata,
- nsurl_access(content_get_url(gwin->bw->current_content)), true);
+ nsurl_access(hlcache_handle_get_url(gwin->bw->current_content)), true);
break;
case CMID_FRAMERELOAD:
@@ -794,7 +794,7 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
object = (struct hlcache_handle *)userdata;
if((bm = content_get_bitmap(object)))
{
- bm->url = (char *)nsurl_access(content_get_url(object));
+ bm->url = (char *)nsurl_access(hlcache_handle_get_url(object));
bm->title = (char *)content_get_title(object);
ami_easy_clipboard_bitmap(bm);
}