From e52aaecd7a70d02529d5d01f81b37d5be07d7209 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 3 Oct 2011 16:41:55 +0000 Subject: Fix up for nsurl changes. Untested. svn path=/trunk/netsurf/; revision=12928 --- amiga/arexx.c | 4 ++-- amiga/clipboard.c | 2 +- amiga/context_menu.c | 26 +++++++++++++------------- amiga/drag.c | 10 +++++----- amiga/gui.c | 4 ++-- amiga/gui_options.c | 2 +- amiga/iff_dr2d.c | 2 +- amiga/menu.c | 30 +++++++++++++++--------------- amiga/plugin_hack.c | 2 +- amiga/print.c | 2 +- 10 files changed, 42 insertions(+), 42 deletions(-) (limited to 'amiga') diff --git a/amiga/arexx.c b/amiga/arexx.c index ca1b1df39..157ba726c 100755 --- a/amiga/arexx.c +++ b/amiga/arexx.c @@ -278,7 +278,7 @@ STATIC VOID rx_save(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu FWrite(fh, source_data, 1, source_size); FClose(fh); - SetComment((char *)cmd->ac_ArgList[0], content_get_url(bw->current_content)); + SetComment((char *)cmd->ac_ArgList[0], nsurl_access(content_get_url(bw->current_content))); } ami_update_pointer(bw->window->shared->win,GUI_POINTER_DEFAULT); @@ -307,7 +307,7 @@ STATIC VOID rx_geturl(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((u if(bw && bw->current_content) { - strcpy(result, content_get_url(bw->current_content)); + strcpy(result, nsurl_access(content_get_url(bw->current_content))); } else { diff --git a/amiga/clipboard.c b/amiga/clipboard.c index 336dad323..01bcd87f1 100755 --- a/amiga/clipboard.c +++ b/amiga/clipboard.c @@ -426,7 +426,7 @@ bool ami_easy_clipboard_svg(struct hlcache_handle *c) if(!(OpenIFF(iffh,IFFF_WRITE))) { - ami_svg_to_dr2d(iffh, source_data, source_size, content_get_url(c)); + ami_svg_to_dr2d(iffh, source_data, source_size, nsurl_access(content_get_url(c))); CloseIFF(iffh); } diff --git a/amiga/context_menu.c b/amiga/context_menu.c index 347c824a3..595049183 100755 --- a/amiga/context_menu.c +++ b/amiga/context_menu.c @@ -258,7 +258,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, content_get_url(userdata), + PMIA_UserData, nsurl_access(content_get_url(userdata)), TAG_DONE), PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, PMIA_Title, (ULONG)ctxmenulab[CMID_CLIPOBJ], @@ -594,25 +594,25 @@ 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, - content_get_url(gwin->bw->current_content), true, false); + nsurl_access(content_get_url(gwin->bw->current_content)), true, false); break; case CMID_FRAMETAB: case CMID_URLOPENTAB: bw = browser_window_create(userdata, gwin->bw, - content_get_url(gwin->bw->current_content), true, true); + nsurl_access(content_get_url(gwin->bw->current_content)), true, true); break; case CMID_FRAMESAVE: case CMID_SAVEURL: browser_window_download(gwin->bw, userdata, - content_get_url(gwin->bw->current_content)); + nsurl_access(content_get_url(gwin->bw->current_content))); break; case CMID_FRAMESHOW: case CMID_SHOWOBJ: - browser_window_go(gwin->bw, content_get_url(userdata), - content_get_url(gwin->bw->current_content), true); + browser_window_go(gwin->bw, nsurl_access(content_get_url(userdata)), + nsurl_access(content_get_url(gwin->bw->current_content)), true); break; case CMID_FRAMERELOAD: @@ -626,7 +626,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 *)content_get_url(object); + bm->url = (char *)nsurl_access(content_get_url(object)); bm->title = (char *)content_get_title(object); ami_easy_clipboard_bitmap(bm); } @@ -644,7 +644,7 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved if(AslRequestTags(savereq, ASLFR_TitleText,messages_get("NetSurf"), ASLFR_Screen,scrn, - ASLFR_InitialFile,FilePart(content_get_url(object)), + ASLFR_InitialFile,FilePart(nsurl_access(content_get_url(object))), TAG_DONE)) { BPTR fh = 0; @@ -662,7 +662,7 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved FWrite(fh, source_data, 1, source_size); FClose(fh); - SetComment(fname, content_get_url(object)); + SetComment(fname, nsurl_access(content_get_url(object))); } } ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT); @@ -675,7 +675,7 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved if(AslRequestTags(savereq, ASLFR_TitleText,messages_get("NetSurf"), ASLFR_Screen,scrn, - ASLFR_InitialFile,FilePart(content_get_url(object)), + ASLFR_InitialFile,FilePart(nsurl_access(content_get_url(object))), TAG_DONE)) { BPTR fh = 0; @@ -685,16 +685,16 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved AddPart(fname,savereq->fr_File,1024); if((bm = content_get_bitmap(object))) { - bm->url = (char *)content_get_url(object); + bm->url = (char *)nsurl_access(content_get_url(object)); bm->title = (char *)content_get_title(object); if(bitmap_save(bm, fname, 0)) - SetComment(fname, content_get_url(object)); + SetComment(fname, nsurl_access(content_get_url(object))); } #ifdef WITH_NS_SVG else if(ami_mime_compare(object, "svg") == true) { if(ami_save_svg(object,fname)) - SetComment(fname, content_get_url(object)); + SetComment(fname, nsurl_access(content_get_url(object))); } #endif ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT); diff --git a/amiga/drag.c b/amiga/drag.c index 6afbd9388..b4089f6db 100644 --- a/amiga/drag.c +++ b/amiga/drag.c @@ -165,7 +165,7 @@ void ami_drag_save(struct Window *win) FWrite(fh, source_data, 1, source_size); FClose(fh); - SetComment(path, content_get_url(c)); + SetComment(path, nsurl_access(content_get_url(c))); } } break; @@ -190,7 +190,7 @@ void ami_drag_save(struct Window *win) { UnLock(lock); save_complete(c,path); - SetComment(path, content_get_url(c)); + SetComment(path, nsurl_access(content_get_url(c))); } ami_superimpose_favicon(path, drag_save_gui->favicon, NULL); @@ -205,16 +205,16 @@ void ami_drag_save(struct Window *win) AddPart(path, content_get_title(c), 1024); if(bm = content_get_bitmap(c)) { - bm->url = (char *)content_get_url(c); + bm->url = (char *)nsurl_access(content_get_url(c)); bm->title = (char *)content_get_title(c); if(bitmap_save(bm, path, 0)) - SetComment(path, content_get_url(c)); + SetComment(path, nsurl_access(content_get_url(c))); } #ifdef WITH_NS_SVG else if(ami_mime_compare(c, "svg") == true) { if(ami_save_svg(c, path)) - SetComment(path, content_get_url(c)); + SetComment(path, nsurl_access(content_get_url(c))); } #endif } diff --git a/amiga/gui.c b/amiga/gui.c index 5324fe7c7..6d587e7b5 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1616,7 +1616,7 @@ void ami_handle_msg(void) struct DiskObject *dobj; struct bitmap *bm; - bm = urldb_get_thumbnail(content_get_url(gwin->bw->current_content)); + bm = urldb_get_thumbnail(nsurl_access(content_get_url(gwin->bw->current_content))); if(!bm) bm = content_get_bitmap(gwin->bw->current_content); gwin->dobj = amiga_icon_from_bitmap(bm); HideWindow(gwin->win); @@ -2072,7 +2072,7 @@ void ami_switch_tab(struct gui_window_2 *gwin,bool redraw) gwin->redraw_scroll = false; browser_window_refresh_url_bar(gwin->bw, - content_get_url(gwin->bw->current_content), gwin->bw->frag_id); + nsurl_access(content_get_url(gwin->bw->current_content)), gwin->bw->frag_id); } } diff --git a/amiga/gui_options.c b/amiga/gui_options.c index e85600272..3a376342a 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -1698,7 +1698,7 @@ BOOL ami_gui_opts_event(void) case GID_OPTS_HOMEPAGE_CURRENT: if(curbw) RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_HOMEPAGE], gow->win, NULL, STRINGA_TextVal, - content_get_url(curbw->current_content), TAG_DONE); + nsurl_access(content_get_url(curbw->current_content)), TAG_DONE); break; case GID_OPTS_HOMEPAGE_BLANK: diff --git a/amiga/iff_dr2d.c b/amiga/iff_dr2d.c index 3f46ee933..65611e73b 100644 --- a/amiga/iff_dr2d.c +++ b/amiga/iff_dr2d.c @@ -322,7 +322,7 @@ bool ami_save_svg(struct hlcache_handle *c,char *filename) if((OpenIFF(iffh,IFFF_WRITE))) return false; if((source_data = content_get_source_data(c, &source_size))) - ami_svg_to_dr2d(iffh, source_data, source_size, content_get_url(c)); + ami_svg_to_dr2d(iffh, source_data, source_size, nsurl_access(content_get_url(c))); if(iffh) CloseIFF(iffh); if(iffh->iff_Stream) Close((BPTR)iffh->iff_Stream); 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 diff --git a/amiga/plugin_hack.c b/amiga/plugin_hack.c index 8809a7bea..5164e5bd0 100644 --- a/amiga/plugin_hack.c +++ b/amiga/plugin_hack.c @@ -249,7 +249,7 @@ void amiga_plugin_hack_execute(struct hlcache_handle *c) plugincmd = ami_mime_content_to_cmd(c); if(plugincmd == NULL) return; - full_cmd = ASPrintf("%s %s", lwc_string_data(plugincmd), content_get_url(c)); + full_cmd = ASPrintf("%s %s", lwc_string_data(plugincmd), nsurl_access(content_get_url(c))); if(full_cmd) { diff --git a/amiga/print.c b/amiga/print.c index 8dc4e32bf..c84025769 100644 --- a/amiga/print.c +++ b/amiga/print.c @@ -393,7 +393,7 @@ void ami_print(struct hlcache_handle *c, int copies) ami_print_info.PD = (struct PrinterData *)ami_print_info.PReq->io_Device; ami_print_info.PED = &ami_print_info.PD->pd_SegmentData->ps_PED; - ami_print_info.ps = print_make_settings(PRINT_DEFAULT, content_get_url(c), &nsfont); + ami_print_info.ps = print_make_settings(PRINT_DEFAULT, nsurl_access(content_get_url(c)), &nsfont); ami_print_info.ps->page_width = ami_print_info.PED->ped_MaxXDots; ami_print_info.ps->page_height = ami_print_info.PED->ped_MaxYDots; ami_print_info.ps->scale = scale; -- cgit v1.2.3