content_get_url -> hlcache_handle_get_url, content__get_url -> content_get_url

svn path=/trunk/netsurf/; revision=13236

11 files changed, 29 insertions, 29 deletions

diff --git a/amiga/arexx.c b/amiga/arexx.c
index 157ba726c..4809ef1c3 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], nsurl_access(content_get_url(bw->current_content)));
+		SetComment((char *)cmd->ac_ArgList[0], nsurl_access(hlcache_handle_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, nsurl_access(content_get_url(bw->current_content)));
+		strcpy(result, nsurl_access(hlcache_handle_get_url(bw->current_content)));
 	}
 	else
 	{
diff --git a/amiga/clipboard.c b/amiga/clipboard.c
index 30e768a6a..09d95f8f5 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, nsurl_access(content_get_url(c)));
+		ami_svg_to_dr2d(iffh, source_data, source_size, nsurl_access(hlcache_handle_get_url(c)));
 		CloseIFF(iffh);
 	}
 
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);
 				}
diff --git a/amiga/file.c b/amiga/file.c
index bcf05c5e5..4bae9734f 100644
--- a/amiga/file.c
+++ b/amiga/file.c
@@ -150,7 +150,7 @@ void ami_file_save(int type, char *fname, struct Window *win,
 			case AMINS_SAVE_IFF:
 				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);
 					bitmap_save(bm, fname, 0);
 				}
@@ -166,7 +166,7 @@ void ami_file_save(int type, char *fname, struct Window *win,
 				selection_save_text(sel, fname);
 			break;
 		}
-		if(object) SetComment(fname, nsurl_access(content_get_url(object)));
+		if(object) SetComment(fname, nsurl_access(hlcache_handle_get_url(object)));
 	}
 
 	ami_update_pointer(win, GUI_POINTER_DEFAULT);
@@ -180,7 +180,7 @@ void ami_file_save_req(int type, struct gui_window_2 *gwin,
 	if(AslRequestTags(savereq,
 			ASLFR_TitleText, messages_get("NetSurf"),
 			ASLFR_Screen, scrn,
-			ASLFR_InitialFile, object ? FilePart(nsurl_access(content_get_url(object))) : "",
+			ASLFR_InitialFile, object ? FilePart(nsurl_access(hlcache_handle_get_url(object))) : "",
 			TAG_DONE))
 	{
 		strlcpy(fname, savereq->fr_Drawer, 1024);
diff --git a/amiga/gui.c b/amiga/gui.c
index c3b52616f..610834acf 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1707,7 +1707,7 @@ void ami_handle_msg(void)
 					struct DiskObject *dobj;
 					struct bitmap *bm;
 
-					bm = urldb_get_thumbnail(nsurl_access(content_get_url(gwin->bw->current_content)));
+					bm = urldb_get_thumbnail(nsurl_access(hlcache_handle_get_url(gwin->bw->current_content)));
 					if(!bm) bm = content_get_bitmap(gwin->bw->current_content);
 					gwin->dobj = amiga_icon_from_bitmap(bm);
 					amiga_icon_superimpose_favicon_internal(gwin->bw->window->favicon,
@@ -2084,7 +2084,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);
+			hlcache_handle_get_url(gwin->bw->current_content), gwin->bw->frag_id);
 	}
 }
 
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index 3a376342a..6b0becaaa 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,
-							nsurl_access(content_get_url(curbw->current_content)), TAG_DONE);
+							nsurl_access(hlcache_handle_get_url(curbw->current_content)), TAG_DONE);
 					break;
 
 					case GID_OPTS_HOMEPAGE_BLANK:
diff --git a/amiga/icon.c b/amiga/icon.c
index 7cf6841e3..e4d0cde2f 100644
--- a/amiga/icon.c
+++ b/amiga/icon.c
@@ -149,7 +149,7 @@ bool amiga_icon_convert(struct content *c)
 	ULONG trans, pals1;
 	struct ColorRegister *pal1;
 
-	url = nsurl_access(content__get_url(c));
+	url = nsurl_access(content_get_url(c));
 	filename = url_to_path(url);
 
 	/* This loader will only work on local files, so fail if not a local path */
diff --git a/amiga/iff_dr2d.c b/amiga/iff_dr2d.c
index 65611e73b..d2254faab 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, nsurl_access(content_get_url(c)));
+		ami_svg_to_dr2d(iffh, source_data, source_size, nsurl_access(hlcache_handle_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 f55bedd30..d7e7e0d00 100755
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -571,7 +571,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 *)nsurl_access(content_get_url(gwin->bw->current_content));
+						bm->url = (char *)nsurl_access(hlcache_handle_get_url(gwin->bw->current_content));
 						bm->title = (char *)content_get_title(gwin->bw->current_content);
 						ami_easy_clipboard_bitmap(bm);
 					}
@@ -653,10 +653,10 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item)
 
 					if (bw == NULL ||
 						bw->current_content == NULL ||
-						nsurl_access(content_get_url(bw->current_content)) == NULL)
+						nsurl_access(hlcache_handle_get_url(bw->current_content)) == NULL)
 					break;
 
-					hotlist_add_page(nsurl_access(content_get_url(bw->current_content)));
+					hotlist_add_page(nsurl_access(hlcache_handle_get_url(bw->current_content)));
 				break;
 
 				case 1: // show
diff --git a/amiga/plugin_hack.c b/amiga/plugin_hack.c
index 2b1239143..5fc45915e 100644
--- a/amiga/plugin_hack.c
+++ b/amiga/plugin_hack.c
@@ -175,7 +175,7 @@ void amiga_plugin_hack_open(struct content *c, struct browser_window *bw,
 	struct content *page, struct box *box,
 	struct object_params *params)
 {
-	LOG(("amiga_plugin_hack_open %s", nsurl_access(content__get_url(c))));
+	LOG(("amiga_plugin_hack_open %s", nsurl_access(content_get_url(c))));
 
 	if(c && box)
 	{
@@ -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), nsurl_access(content_get_url(c)));
+	full_cmd = ASPrintf("%s %s", lwc_string_data(plugincmd), nsurl_access(hlcache_handle_get_url(c)));
 
 	if(full_cmd)
 	{
diff --git a/amiga/print.c b/amiga/print.c
index c84025769..9a2bd54d9 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, nsurl_access(content_get_url(c)), &nsfont);
+	ami_print_info.ps = print_make_settings(PRINT_DEFAULT, nsurl_access(hlcache_handle_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;