From bba4c426f3a8a415a07e1583d5fd76e63660753e Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 3 Oct 2011 16:30:08 +0000 Subject: Update for content_get_url returning a nsurl. svn path=/trunk/netsurf/; revision=12927 --- riscos/gui.c | 2 +- riscos/save.c | 11 ++++++----- riscos/window.c | 52 +++++++++++++++++++++++++++++++--------------------- 3 files changed, 38 insertions(+), 27 deletions(-) diff --git a/riscos/gui.c b/riscos/gui.c index ee67d576a..e39538c8d 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -2195,7 +2195,7 @@ void ro_gui_view_source(hlcache_handle *c) } /* try to load local files directly. */ - temp_name = url_to_path(content_get_url(c)); + temp_name = url_to_path(nsurl_access(content_get_url(c))); if (temp_name) { error = xosfile_read_no_path(temp_name, &objtype, 0, 0, 0, 0); if ((!error) && (objtype == osfile_IS_FILE)) { diff --git a/riscos/save.c b/riscos/save.c index b1b743e59..5031173fa 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -269,7 +269,8 @@ void ro_gui_save_prepare(gui_save_type save_type, hlcache_handle *h, name_buf[leaf_offset++] = '.'; } - ro_gui_save_set_state(h, save_type, h ? content_get_url(h) : url, + ro_gui_save_set_state(h, save_type, + h ? nsurl_access(content_get_url(h)) : url, name_buf + leaf_offset, icon_buf); ro_gui_set_icon_sprite(dialog_saveas, ICON_SAVE_ICON, saveas_area, @@ -373,8 +374,8 @@ void gui_drag_save_object(gui_save_type save_type, hlcache_handle *c, return; } - ro_gui_save_set_state(c, save_type, content_get_url(c), save_leafname, - icon_buf); + ro_gui_save_set_state(c, save_type, nsurl_access(content_get_url(c)), + save_leafname, icon_buf); gui_current_drag_type = GUI_DRAG_SAVE; @@ -1153,8 +1154,8 @@ bool ro_gui_save_complete(hlcache_handle *h, char *path) /* save URL file with original URL */ snprintf(buf, sizeof buf, "%s.URL", path); - if (!ro_gui_save_link(content_get_url(h), content_get_title(h), - LINK_ANT, buf)) + if (!ro_gui_save_link(nsurl_access(content_get_url(h)), + content_get_title(h), LINK_ANT, buf)) return false; return save_complete(h, path); diff --git a/riscos/window.c b/riscos/window.c index f3fd79e67..73ffe98b0 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1661,7 +1661,8 @@ void ro_gui_window_close(wimp_w w) if (pointer.buttons & wimp_CLICK_ADJUST) { destroy = !ro_gui_shift_pressed(); filename = (h && content_get_url(h)) ? - url_to_path(content_get_url(h)) : NULL; + url_to_path(nsurl_access(content_get_url(h))) : + NULL; if (filename) { temp_name = malloc(strlen(filename) + 32); if (temp_name) { @@ -1692,8 +1693,8 @@ void ro_gui_window_close(wimp_w w) if (!destroy && g->bw != NULL && g->bw->current_content != NULL) ro_gui_window_navigate_up(g->bw->window, - content_get_url( - g->bw->current_content)); + nsurl_access(content_get_url( + g->bw->current_content))); } } else @@ -2451,42 +2452,45 @@ void ro_gui_window_menu_warning(wimp_w w, wimp_i i, wimp_menu *menu, case BROWSER_SAVE_URL_URI: if (h != NULL) ro_gui_save_prepare(GUI_SAVE_LINK_URI, NULL, NULL, - content_get_url(h), + nsurl_access(content_get_url(h)), content_get_title(h)); break; case BROWSER_SAVE_URL_URL: if (h != NULL) ro_gui_save_prepare(GUI_SAVE_LINK_URL, NULL, NULL, - content_get_url(h), + nsurl_access(content_get_url(h)), content_get_title(h)); break; case BROWSER_SAVE_URL_TEXT: if (h != NULL) ro_gui_save_prepare(GUI_SAVE_LINK_TEXT, NULL, NULL, - content_get_url(h), + nsurl_access(content_get_url(h)), content_get_title(h)); break; case BROWSER_OBJECT_SAVE_URL_URI: if (current_menu_object != NULL) ro_gui_save_prepare(GUI_SAVE_LINK_URI, NULL, NULL, - content_get_url(current_menu_object), + nsurl_access(content_get_url( + current_menu_object)), content_get_title(current_menu_object)); break; case BROWSER_OBJECT_SAVE_URL_URL: if (current_menu_object != NULL) ro_gui_save_prepare(GUI_SAVE_LINK_URL, NULL, NULL, - content_get_url(current_menu_object), + nsurl_access(content_get_url( + current_menu_object)), content_get_title(current_menu_object)); break; case BROWSER_OBJECT_SAVE_URL_TEXT: if (current_menu_object != NULL) ro_gui_save_prepare(GUI_SAVE_LINK_TEXT, NULL, NULL, - content_get_url(current_menu_object), + nsurl_access(content_get_url( + current_menu_object)), content_get_title(current_menu_object)); break; @@ -2726,12 +2730,13 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, case BROWSER_LINK_DOWNLOAD: if (current_menu_url != NULL) browser_window_download(bw, current_menu_url, - content_get_url(h)); + nsurl_access(content_get_url(h))); break; case BROWSER_LINK_NEW_WINDOW: if (current_menu_url != NULL) browser_window_create(current_menu_url, bw, - content_get_url(h), true, false); + nsurl_access(content_get_url(h)), + true, false); break; /* save actions */ @@ -2825,7 +2830,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, case BROWSER_NAVIGATE_UP: if (bw != NULL && h != NULL) ro_gui_window_navigate_up(bw->window, - content_get_url(h)); + nsurl_access(content_get_url(h))); break; case BROWSER_NAVIGATE_RELOAD_ALL: if (bw != NULL) @@ -3401,7 +3406,8 @@ void ro_gui_window_toolbar_click(void *data, else save_type = GUI_SAVE_LINK_TEXT; - ro_gui_drag_save_link(save_type, content_get_url(h), + ro_gui_drag_save_link(save_type, + nsurl_access(content_get_url(h)), content_get_title(h), g); } @@ -3493,7 +3499,8 @@ void ro_gui_window_toolbar_click(void *data, case TOOLBAR_BUTTON_UP: if (g->bw != NULL && g->bw->current_content != NULL) ro_gui_window_navigate_up(g->bw->window, - content_get_url(g->bw->current_content)); + nsurl_access(content_get_url( + g->bw->current_content))); break; case TOOLBAR_BUTTON_UP_NEW: @@ -3505,7 +3512,7 @@ void ro_gui_window_toolbar_click(void *data, /* do it without loading the content * into the new window */ ro_gui_window_navigate_up(new_bw->window, - content_get_url(h)); + nsurl_access(content_get_url(h))); } break; @@ -3629,10 +3636,12 @@ bool ro_gui_window_up_available(struct browser_window *bw) url_func_result res; if (bw != NULL && bw->current_content != NULL) { - res = url_parent(content_get_url(bw->current_content), &parent); + res = url_parent(nsurl_access(content_get_url( + bw->current_content)), &parent); if (res == URL_FUNC_OK) { - res = url_compare(content_get_url(bw->current_content), + res = url_compare(nsurl_access(content_get_url( + bw->current_content)), parent, false, &compare); if (res == URL_FUNC_OK) result = !compare; @@ -3668,7 +3677,7 @@ void ro_gui_window_prepare_pageinfo(struct gui_window *g) title = content_get_title(h); if (title == NULL) title = "-"; - url = content_get_url(h); + url = nsurl_access(content_get_url(h)); if (url == NULL) url = "-"; mime = content_get_mime_type(h); @@ -3723,7 +3732,7 @@ void ro_gui_window_prepare_objectinfo(hlcache_handle *object, const char *href) if (!ro_gui_wimp_sprite_exists(icon_buf)) sprintf(icon_buf, "file_xxx"); - url = content_get_url(object); + url = nsurl_access(content_get_url(object)); if (url == NULL) url = "-"; mime = content_get_mime_type(object); @@ -3870,7 +3879,8 @@ void ro_gui_window_action_new_window(struct gui_window *g) if (g == NULL || g->bw == NULL || g->bw->current_content == NULL) return; - browser_window_create(content_get_url(g->bw->current_content), g->bw, + browser_window_create(nsurl_access( + content_get_url(g->bw->current_content)), g->bw, 0, false, false); } @@ -3954,7 +3964,7 @@ void ro_gui_window_action_add_bookmark(struct gui_window *g) content_get_url(g->bw->current_content) == NULL) return; - hotlist_add_page(content_get_url(g->bw->current_content)); + hotlist_add_page(nsurl_access(content_get_url(g->bw->current_content))); } -- cgit v1.2.3