Mangling man URIs so that bookmarks are somewhat sensible

1 files changed, 11 insertions, 6 deletions

diff --git a/libyelp/yelp-document.c b/libyelp/yelp-document.c
index 215586e6..b1d17b8d 100644
--- a/libyelp/yelp-document.c
+++ b/libyelp/yelp-document.c
@@ -139,7 +139,7 @@ YelpDocument *
 yelp_document_get_for_uri (YelpUri *uri)
 {
     static GHashTable *documents = NULL;
-    gchar *docuri;
+    gchar *docuri = NULL;
     gchar *page_id, *tmp;
     YelpDocument *document = NULL;
 
@@ -149,10 +149,6 @@ yelp_document_get_for_uri (YelpUri *uri)
 
     g_return_val_if_fail (yelp_uri_is_resolved (uri), NULL);
 
-    docuri = yelp_uri_get_document_uri (uri);
-    if (docuri == NULL)
-        return NULL;
-
     switch (yelp_uri_get_document_type (uri)) {
     case YELP_URI_DOCUMENT_TYPE_TEXT:
     case YELP_URI_DOCUMENT_TYPE_HTML:
@@ -165,12 +161,21 @@ yelp_document_get_for_uri (YelpUri *uri)
         page_id = yelp_uri_get_page_id (uri);
         tmp = g_strconcat (docuri, "/", page_id, NULL);
         g_free (page_id);
-        g_free (docuri);
         docuri = tmp;
         break;
+    case YELP_URI_DOCUMENT_TYPE_MAN:
+        /* The document URI for man pages is just man:, so we use the
+         * full canonical URI to look these up.
+         */
+        docuri = yelp_uri_get_canonical_uri (uri);
+        break;
     default:
+        docuri = yelp_uri_get_document_uri (uri);
         break;
     }
+
+    if (docuri == NULL)
+        return NULL;
     document = g_hash_table_lookup (documents, docuri);
 
     if (document != NULL) {