diff options
| author | Mikael Hallendal <micke@codefactory.se> | 2002-08-20 22:23:38 +0000 |
|---|---|---|
| committer | Mikael Hallendal <hallski@src.gnome.org> | 2002-08-20 22:23:38 +0000 |
| commit | dc251cc2eb0368ff4f0783a2f57b28e10341d747 (patch) | |
| tree | b98e43b26c6e9a1d08aa9a39d4fe11d0b0c52b7d | |
| parent | 8604706495fc1e4fe79e1142ec17ffe76d76de13 (diff) | |
| download | yelp-dc251cc2eb0368ff4f0783a2f57b28e10341d747.tar.gz | |
- Don't use the full base-uri for resolving relative links. Instead use
2002-08-21 Mikael Hallendal <micke@codefactory.se>
* src/yelp-html-gtkhtml2.c (html_url_requested_cb):
- Don't use the full base-uri for resolving relative
links. Instead use the path part of the base-uri. Fixes #91199
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/yelp-html-gtkhtml2.c | 6 |
2 files changed, 8 insertions, 6 deletions
@@ -1,4 +1,10 @@ -2002-08-19 Ross Burton <ross@burtonini.com> +2002-08-21 Mikael Hallendal <micke@codefactory.se> + + * src/yelp-html-gtkhtml2.c (html_url_requested_cb): + - Don't use the full base-uri for resolving relative + links. Instead use the path part of the base-uri. Fixes #91199 + +2002-08-20 Ross Burton <ross@burtonini.com> * yelp.desktop.in: - Fix the desktop file so that it validates correctly. diff --git a/src/yelp-html-gtkhtml2.c b/src/yelp-html-gtkhtml2.c index 52d75c43..11154e24 100644 --- a/src/yelp-html-gtkhtml2.c +++ b/src/yelp-html-gtkhtml2.c @@ -169,7 +169,6 @@ html_url_requested_cb (HtmlDocument *doc, gchar buffer[BUFFER_SIZE]; GnomeVFSFileSize read_len; gchar *absolute_url; - gchar *str_uri; html = YELP_HTML (data); priv = html->priv; @@ -178,10 +177,7 @@ html_url_requested_cb (HtmlDocument *doc, d(g_print ("URL REQUESTED: %s\n", url)); - str_uri = yelp_uri_to_string (priv->base_uri); - absolute_url = yelp_util_resolve_relative_url (str_uri, url); - g_free (str_uri); - + absolute_url = yelp_util_resolve_relative_url (yelp_uri_get_path (priv->base_uri), url); result = gnome_vfs_open (&handle, absolute_url, GNOME_VFS_OPEN_READ); |