From ad6fcea6b008638ca532436ecf8ba9fe7e41ffdd Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sun, 3 Feb 2008 12:04:48 +0000 Subject: Add url_fragment to extract fragment from URL Optionally allow url_compare to ignore fragments in comparison Fix handling of url_compare result in a few places Fix redirects which contain fragments in the Location header svn path=/trunk/netsurf/; revision=3826 --- riscos/menus.c | 6 ++++-- riscos/window.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'riscos') diff --git a/riscos/menus.c b/riscos/menus.c index ff4537179..adfb9a109 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -1989,8 +1989,10 @@ void ro_gui_menu_prepare_action(wimp_w owner, menu_action action, if (result) { res = url_parent(c->url, &parent); if (res == URL_FUNC_OK) { - res = url_compare(c->url, parent, &compare); - result = !compare; + res = url_compare(c->url, parent, + false, &compare); + if (res == URL_FUNC_OK) + result = !compare; free(parent); } else { result = false; diff --git a/riscos/window.c b/riscos/window.c index 7824bbe7a..21e57b9f8 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -3329,8 +3329,8 @@ bool ro_gui_window_navigate_up(struct gui_window *g, const char *url) { res = url_parent(url, &parent); if (res == URL_FUNC_OK) { - res = url_compare(url, parent, &compare); - if (!compare && (res == URL_FUNC_OK)) + res = url_compare(url, parent, false, &compare); + if ((res == URL_FUNC_OK) && !compare) browser_window_go(g->bw, parent, 0, true); free(parent); } -- cgit v1.2.3