From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Mon, 3 Sep 2007 16:35:01 +0000 (+0000)
Subject: Make sure not to use the history with documents not supporting links.
X-Git-Tag: EVINCE_2_19_92~2
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=62df36db729c222cf47774268a0fb83dabc8c65a;p=evince.git

Make sure not to use the history with documents not supporting links.

2007-09-03  Carlos Garcia Campos  <carlosgc@gnome.org>
	* shell/ev-window.c: (ev_window_add_history):
	Make sure not to use the history with documents not supporting
	links. Fixes bug #468954.

svn path=/trunk/; revision=2660
---

diff --git a/ChangeLog b/ChangeLog
index 5c51c9f7..0c596c93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-03  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+	* shell/ev-window.c: (ev_window_add_history):
+
+	Make sure not to use the history with documents not supporting
+	links. Fixes bug #468954.
+	
 2007-09-03  Carlos Garcia Campos  <carlosgc@gnome.org>
 
 	* shell/ev-window.c: (ev_window_load_job_cb):
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 7ef19c55..34e94eb0 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -704,6 +704,9 @@ ev_window_add_history (EvWindow *window, gint page, EvLink *link)
 	
 	if (window->priv->history == NULL)
 		return;
+
+	if (!EV_IS_DOCUMENT_LINKS (window->priv->document))
+		return;
 	
 	if (link) {
 		action = g_object_ref (ev_link_get_action (link));
@@ -722,8 +725,7 @@ ev_window_add_history (EvWindow *window, gint page, EvLink *link)
 	find_task.page_label = page_label;
 	find_task.chapter = NULL;
 	
-	if (EV_IS_DOCUMENT_LINKS (window->priv->document) && 
-	    ev_document_links_has_document_links (EV_DOCUMENT_LINKS (window->priv->document))) {
+	if (ev_document_links_has_document_links (EV_DOCUMENT_LINKS (window->priv->document))) {
 		GtkTreeModel *model;
 	
 		g_object_get (G_OBJECT (window->priv->sidebar_links), "model", &model, NULL);