summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun McCance <shaunm@gnome.org>2010-03-31 10:40:19 -0500
committerShaun McCance <shaunm@gnome.org>2010-03-31 10:40:19 -0500
commit5094634be266f03348a27a83b73f2dce8e786e08 (patch)
tree20098d8576755240cdd777e60f4601d570d979a3
parent549cbaf550fc5b16be72e002c7c0d0dd5e2be2eb (diff)
downloadyelp-5094634be266f03348a27a83b73f2dce8e786e08.tar.gz
[yelp-uri] Use '#' to separate page and frag in file URIs
This is all internal bookkeeping. When we have to put both a page ID and a fragment identifier on a file URI, we previously separated them with a slash. But that interfered with the way we used leading slashes for special pages. So we just use a second hash instead.
-rw-r--r--libyelp/yelp-uri.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libyelp/yelp-uri.c b/libyelp/yelp-uri.c
index a06af45a..4ea70d56 100644
--- a/libyelp/yelp-uri.c
+++ b/libyelp/yelp-uri.c
@@ -972,7 +972,7 @@ resolve_xref_uri (YelpUri *uri)
priv->fulluri = g_strconcat (priv->docuri,
(priv->page_id || priv->frag_id) ? "#" : "",
priv->page_id ? priv->page_id : "",
- priv->frag_id ? "/" : "",
+ priv->frag_id ? "#" : "",
priv->frag_id,
NULL);
else
@@ -1041,7 +1041,7 @@ resolve_gfile (YelpUri *uri, const gchar *hash)
if (priv->tmptype == YELP_URI_DOCUMENT_TYPE_UNRESOLVED) {
gchar **splithash = NULL;
if (hash)
- splithash = g_strsplit (hash, "/", 2);
+ splithash = g_strsplit (hash, "#", 2);
priv->tmptype = YELP_URI_DOCUMENT_TYPE_EXTERNAL;
if (g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_STANDARD_TYPE) ==