From 07ccb9d89438b6f242f058e0e5078dfd5dbdb495 Mon Sep 17 00:00:00 2001 From: Don Scorgie Date: Wed, 13 Jun 2007 18:14:24 +0000 Subject: Make bookmarks work in the New World Order * src/yelp-window.c: Make bookmarks work in the New World Order svn path=/branches/yelp-spoon/; revision=2825 --- ChangeLog | 3 +++ src/yelp-window.c | 14 ++------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 586448d6..81db0190 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-06-13 Don Scorgie + * src/yelp-window.c: + Make bookmarks work in the New World Order + * src/yelp-base.c: start loading yelp-toc at start of base to take advantage of threading diff --git a/src/yelp-window.c b/src/yelp-window.c index 73638f05..163ac1a6 100644 --- a/src/yelp-window.c +++ b/src/yelp-window.c @@ -2985,25 +2985,15 @@ window_go_toc_cb (GtkAction *action, YelpWindow *window) static void window_add_bookmark_cb (GtkAction *action, YelpWindow *window) { -#if 0 - gchar *uri; YelpWindowPriv *priv = window->priv; debug_print (DB_FUNCTION, "entering\n"); - uri = yelp_doc_info_get_uri (priv->current_doc, priv->current_frag, - YELP_URI_TYPE_NO_FILE); - if (!uri) - uri = yelp_doc_info_get_uri (priv->current_doc, priv->current_frag, - YELP_URI_TYPE_FILE); - - if (!uri) + if (!priv->req_uri) return; - yelp_bookmarks_add (uri, window); + yelp_bookmarks_add (priv->req_uri, window); - g_free (uri); -#endif } static void window_copy_link_cb (GtkAction *action, YelpWindow *window) -- cgit v1.2.1