Merge branch 'gnome-2-30' into webkitwebkit

1 files changed, 4 insertions, 1 deletions

diff --git a/src/yelp-window.c b/src/yelp-window.c
index e2a31cf6..67b640cb 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -1140,6 +1140,8 @@ yelp_window_load (YelpWindow *window, const gchar *uri)
            because right now we're outputting "#page_id/section_id".
          */
         faux_frag_id = g_strdup (frag_id);
+        if ( priv->current_type == YELP_RRN_TYPE_MAL )
+        {
         slash = strchr (faux_frag_id, '/');
         if (slash)
             *slash = '\0';
@@ -1157,6 +1159,7 @@ yelp_window_load (YelpWindow *window, const gchar *uri)
             g_free (slash);
             frag_id = new_frag_id;
         }
+        }
 	window_setup_window (window, type, real_uri, frag_id,
 			     (gchar *) uri, current_base, need_hist);
         priv->current_request = yelp_document_get_page (doc,
@@ -2347,7 +2350,7 @@ history_load_entry (YelpWindow *window, YelpHistoryEntry *entry)
            be scrolling to the section as well.
          */
         slash = strchr (entry->frag_id, '/');
-        if (slash)
+        if (entry->type == YELP_RRN_TYPE_MAL && slash)
             frag_id = g_strndup (entry->frag_id, slash - entry->frag_id);
         else
             frag_id = g_strdup (entry->frag_id);