diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2011-10-03 16:41:55 +0000 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2011-10-03 16:41:55 +0000 |
commit | e52aaecd7a70d02529d5d01f81b37d5be07d7209 (patch) | |
tree | fd1ac8662d17d1cec61ad37a5e9a41f62db6f289 /amiga/menu.c | |
parent | bba4c426f3a8a415a07e1583d5fd76e63660753e (diff) | |
download | netsurf-e52aaecd7a70d02529d5d01f81b37d5be07d7209.tar.gz netsurf-e52aaecd7a70d02529d5d01f81b37d5be07d7209.tar.bz2 |
Fix up for nsurl changes. Untested.
svn path=/trunk/netsurf/; revision=12928
Diffstat (limited to 'amiga/menu.c')
-rwxr-xr-x | amiga/menu.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/amiga/menu.c b/amiga/menu.c index e4e084bc9..c421227f2 100755 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -522,7 +522,7 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item) if(AslRequestTags(savereq, ASLFR_TitleText,messages_get("NetSurf"), ASLFR_Screen,scrn, - ASLFR_InitialFile,FilePart(content_get_url(gwin->bw->current_content)), + ASLFR_InitialFile,FilePart(nsurl_access(content_get_url(gwin->bw->current_content))), TAG_DONE)) { strlcpy(fname,savereq->fr_Drawer,1024); @@ -537,7 +537,7 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item) content_get_source_data(gwin->bw->current_content, &source_size))) FWrite(fh,source_data, 1, source_size); FClose(fh); - SetComment(fname, content_get_url(gwin->bw->current_content)); + SetComment(fname, nsurl_access(content_get_url(gwin->bw->current_content))); } } ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT); @@ -548,7 +548,7 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item) if(AslRequestTags(savereq, ASLFR_TitleText,messages_get("NetSurf"), ASLFR_Screen,scrn, - ASLFR_InitialFile,FilePart(content_get_url(gwin->bw->current_content)), + ASLFR_InitialFile,FilePart(nsurl_access(content_get_url(gwin->bw->current_content))), TAG_DONE)) { strlcpy(fname,savereq->fr_Drawer,1024); @@ -558,7 +558,7 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item) if(ami_download_check_overwrite(fname, gwin->win, 0)) { save_as_text(gwin->bw->current_content,fname); - SetComment(fname,content_get_url(gwin->bw->current_content)); + SetComment(fname,nsurl_access(content_get_url(gwin->bw->current_content))); } ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT); } @@ -568,7 +568,7 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item) if(AslRequestTags(savereq, ASLFR_TitleText,messages_get("NetSurf"), ASLFR_Screen,scrn, - ASLFR_InitialFile,FilePart(content_get_url(gwin->bw->current_content)), + ASLFR_InitialFile,FilePart(nsurl_access(content_get_url(gwin->bw->current_content))), TAG_DONE)) { strlcpy(fname,savereq->fr_Drawer,1024); @@ -580,7 +580,7 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item) { UnLock(lock); save_complete(gwin->bw->current_content,fname); - SetComment(fname,content_get_url(gwin->bw->current_content)); + SetComment(fname,nsurl_access(content_get_url(gwin->bw->current_content))); ami_superimpose_favicon(fname, gwin->bw->window->favicon, NULL); } @@ -594,7 +594,7 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item) if(AslRequestTags(savereq, ASLFR_TitleText,messages_get("NetSurf"), ASLFR_Screen,scrn, - ASLFR_InitialFile,FilePart(content_get_url(gwin->bw->current_content)), + ASLFR_InitialFile,FilePart(nsurl_access(content_get_url(gwin->bw->current_content))), TAG_DONE)) { strlcpy(&fname,savereq->fr_Drawer,1024); @@ -602,7 +602,7 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item) ami_update_pointer(gwin->win,GUI_POINTER_WAIT); if(save_as_pdf(gwin->bw->current_content,fname)) { - SetComment(fname, content_get_url(gwin->bw->current_content)); + SetComment(fname, nsurl_access(content_get_url(gwin->bw->current_content))); ami_superimpose_favicon(fname, gwin->bw->window->favicon, "pdf"); } @@ -615,7 +615,7 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item) if(AslRequestTags(savereq, ASLFR_TitleText,messages_get("NetSurf"), ASLFR_Screen,scrn, - ASLFR_InitialFile,FilePart(content_get_url(gwin->bw->current_content)), + ASLFR_InitialFile,FilePart(nsurl_access(content_get_url(gwin->bw->current_content))), TAG_DONE)) { strlcpy(fname,savereq->fr_Drawer,1024); @@ -623,16 +623,16 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item) ami_update_pointer(gwin->win,GUI_POINTER_WAIT); if((bm = content_get_bitmap(gwin->bw->current_content))) { - bm->url = (char *)content_get_url(gwin->bw->current_content); + bm->url = (char *)nsurl_access(content_get_url(gwin->bw->current_content)); bm->title = (char *)content_get_title(gwin->bw->current_content); if(bitmap_save(bm, fname, 0)) - SetComment(fname, content_get_url(gwin->bw->current_content)); + SetComment(fname, nsurl_access(content_get_url(gwin->bw->current_content))); } #ifdef WITH_NS_SVG else if(ami_mime_compare(gwin->bw->current_content, "svg") == true) { if(ami_save_svg(gwin->bw->current_content,fname)) - SetComment(fname, content_get_url(gwin->bw->current_content)); + SetComment(fname, nsurl_access(content_get_url(gwin->bw->current_content))); } #endif ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT); @@ -716,7 +716,7 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item) } else if(bm = content_get_bitmap(gwin->bw->current_content)) { - bm->url = (char *)content_get_url(gwin->bw->current_content); + bm->url = (char *)nsurl_access(content_get_url(gwin->bw->current_content)); bm->title = (char *)content_get_title(gwin->bw->current_content); ami_easy_clipboard_bitmap(bm); } @@ -798,10 +798,10 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item) if (bw == NULL || bw->current_content == NULL || - content_get_url(bw->current_content) == NULL) + nsurl_access(content_get_url(bw->current_content)) == NULL) break; - hotlist_add_page(content_get_url(bw->current_content)); + hotlist_add_page(nsurl_access(content_get_url(bw->current_content))); break; case 1: // show |