diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-12-04 14:55:23 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-12-04 14:55:23 +0000 |
commit | f2993e6ed037023e28837c7c666627380235bd14 (patch) | |
tree | 8d3d27a37e14a49a33a327074d08fb7177b3834c /riscos | |
parent | 890bb679939c9ecde30af7ed752e292bfe6feb28 (diff) | |
download | netsurf-f2993e6ed037023e28837c7c666627380235bd14.tar.gz netsurf-f2993e6ed037023e28837c7c666627380235bd14.tar.bz2 |
content_get_url -> hlcache_handle_get_url, content__get_url -> content_get_url
svn path=/trunk/netsurf/; revision=13236
Diffstat (limited to 'riscos')
-rw-r--r-- | riscos/gui.c | 2 | ||||
-rw-r--r-- | riscos/save.c | 6 | ||||
-rw-r--r-- | riscos/window.c | 44 |
3 files changed, 26 insertions, 26 deletions
diff --git a/riscos/gui.c b/riscos/gui.c index 62a4d900d..0ecb2bd76 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -2162,7 +2162,7 @@ void ro_gui_view_source(hlcache_handle *c) } /* try to load local files directly. */ - temp_name = url_to_path(nsurl_access(content_get_url(c))); + temp_name = url_to_path(nsurl_access(hlcache_handle_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 7c8a07540..f585ad5ea 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -271,7 +271,7 @@ void ro_gui_save_prepare(gui_save_type save_type, hlcache_handle *h, } ro_gui_save_set_state(h, save_type, - h ? nsurl_access(content_get_url(h)) : url, + h ? nsurl_access(hlcache_handle_get_url(h)) : url, name_buf + leaf_offset, FILENAME_MAX - leaf_offset, icon_buf, sizeof(icon_buf)); @@ -376,7 +376,7 @@ void gui_drag_save_object(gui_save_type save_type, hlcache_handle *c, return; } - ro_gui_save_set_state(c, save_type, nsurl_access(content_get_url(c)), + ro_gui_save_set_state(c, save_type, nsurl_access(hlcache_handle_get_url(c)), save_leafname, LEAFNAME_MAX, icon_buf, sizeof(icon_buf)); @@ -1159,7 +1159,7 @@ 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(nsurl_access(content_get_url(h)), + if (!ro_gui_save_link(nsurl_access(hlcache_handle_get_url(h)), content_get_title(h), LINK_ANT, buf)) return false; diff --git a/riscos/window.c b/riscos/window.c index 18aba8408..9dac13f56 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -1663,8 +1663,8 @@ void ro_gui_window_close(wimp_w w) h = g->bw->current_content; if (pointer.buttons & wimp_CLICK_ADJUST) { destroy = !ro_gui_shift_pressed(); - filename = (h && content_get_url(h)) ? - url_to_path(nsurl_access(content_get_url(h))) : + filename = (h && hlcache_handle_get_url(h)) ? + url_to_path(nsurl_access(hlcache_handle_get_url(h))) : NULL; if (filename) { temp_name = malloc(strlen(filename) + 32); @@ -1696,7 +1696,7 @@ 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, - nsurl_access(content_get_url( + nsurl_access(hlcache_handle_get_url( g->bw->current_content))); } } @@ -2454,28 +2454,28 @@ 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, - nsurl_access(content_get_url(h)), + nsurl_access(hlcache_handle_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, - nsurl_access(content_get_url(h)), + nsurl_access(hlcache_handle_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, - nsurl_access(content_get_url(h)), + nsurl_access(hlcache_handle_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, - nsurl_access(content_get_url( + nsurl_access(hlcache_handle_get_url( current_menu_object)), content_get_title(current_menu_object)); break; @@ -2483,7 +2483,7 @@ void ro_gui_window_menu_warning(wimp_w w, wimp_i i, wimp_menu *menu, case BROWSER_OBJECT_SAVE_URL_URL: if (current_menu_object != NULL) ro_gui_save_prepare(GUI_SAVE_LINK_URL, NULL, NULL, - nsurl_access(content_get_url( + nsurl_access(hlcache_handle_get_url( current_menu_object)), content_get_title(current_menu_object)); break; @@ -2491,7 +2491,7 @@ void ro_gui_window_menu_warning(wimp_w w, wimp_i i, wimp_menu *menu, case BROWSER_OBJECT_SAVE_URL_TEXT: if (current_menu_object != NULL) ro_gui_save_prepare(GUI_SAVE_LINK_TEXT, NULL, NULL, - nsurl_access(content_get_url( + nsurl_access(hlcache_handle_get_url( current_menu_object)), content_get_title(current_menu_object)); break; @@ -2732,12 +2732,12 @@ 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, - nsurl_access(content_get_url(h))); + nsurl_access(hlcache_handle_get_url(h))); break; case BROWSER_LINK_NEW_WINDOW: if (current_menu_url != NULL) browser_window_create(current_menu_url, bw, - nsurl_access(content_get_url(h)), + nsurl_access(hlcache_handle_get_url(h)), true, false); break; @@ -2832,7 +2832,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, - nsurl_access(content_get_url(h))); + nsurl_access(hlcache_handle_get_url(h))); break; case BROWSER_NAVIGATE_RELOAD_ALL: if (bw != NULL) @@ -3329,7 +3329,7 @@ void ro_gui_window_toolbar_click(void *data, save_type = GUI_SAVE_LINK_TEXT; ro_gui_drag_save_link(save_type, - nsurl_access(content_get_url(h)), + nsurl_access(hlcache_handle_get_url(h)), content_get_title(h), g); } @@ -3421,7 +3421,7 @@ 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, - nsurl_access(content_get_url( + nsurl_access(hlcache_handle_get_url( g->bw->current_content))); break; @@ -3434,7 +3434,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, - nsurl_access(content_get_url(h))); + nsurl_access(hlcache_handle_get_url(h))); } break; @@ -3558,11 +3558,11 @@ bool ro_gui_window_up_available(struct browser_window *bw) url_func_result res; if (bw != NULL && bw->current_content != NULL) { - res = url_parent(nsurl_access(content_get_url( + res = url_parent(nsurl_access(hlcache_handle_get_url( bw->current_content)), &parent); if (res == URL_FUNC_OK) { - res = url_compare(nsurl_access(content_get_url( + res = url_compare(nsurl_access(hlcache_handle_get_url( bw->current_content)), parent, false, &compare); if (res == URL_FUNC_OK) @@ -3599,7 +3599,7 @@ void ro_gui_window_prepare_pageinfo(struct gui_window *g) title = content_get_title(h); if (title == NULL) title = "-"; - url = nsurl_access(content_get_url(h)); + url = nsurl_access(hlcache_handle_get_url(h)); if (url == NULL) url = "-"; mime = content_get_mime_type(h); @@ -3654,7 +3654,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 = nsurl_access(content_get_url(object)); + url = nsurl_access(hlcache_handle_get_url(object)); if (url == NULL) url = "-"; mime = content_get_mime_type(object); @@ -3802,7 +3802,7 @@ void ro_gui_window_action_new_window(struct gui_window *g) return; browser_window_create(nsurl_access( - content_get_url(g->bw->current_content)), g->bw, + hlcache_handle_get_url(g->bw->current_content)), g->bw, 0, false, false); } @@ -3883,10 +3883,10 @@ void ro_gui_window_action_zoom(struct gui_window *g) void ro_gui_window_action_add_bookmark(struct gui_window *g) { if (g == NULL || g->bw == NULL || g->bw->current_content == NULL || - content_get_url(g->bw->current_content) == NULL) + hlcache_handle_get_url(g->bw->current_content) == NULL) return; - ro_gui_hotlist_add_page(nsurl_access(content_get_url(g->bw->current_content))); + ro_gui_hotlist_add_page(nsurl_access(hlcache_handle_get_url(g->bw->current_content))); } |