From: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Date: Sun, 19 Nov 2006 01:42:57 +0000 (+0000)
Subject: Use page labels instead of numbers.
X-Git-Tag: EVINCE_0_7_0~56
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=f00567758aaf39b2003f26b81fff6de6b213f23e;p=evince.git

Use page labels instead of numbers.

2006-11-19  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>

	* shell/ev-history.c: (ev_history_add_page):
	* shell/ev-history.h:
	* shell/ev-window.c: (page_changed_cb):

	Use page labels instead of numbers.
---

diff --git a/ChangeLog b/ChangeLog
index 09618d18..36dd1e93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-19  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+	* shell/ev-history.c: (ev_history_add_page):
+	* shell/ev-history.h:
+	* shell/ev-window.c: (page_changed_cb):
+	
+	Use page labels instead of numbers.
+
 2006-11-19  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
 	* data/evince-toolbar.xml:
diff --git a/shell/ev-history.c b/shell/ev-history.c
index 2029d3c3..c316c841 100644
--- a/shell/ev-history.c
+++ b/shell/ev-history.c
@@ -164,7 +164,7 @@ ev_history_add_link (EvHistory *history, EvLink *link)
 }
 
 void
-ev_history_add_page (EvHistory *history, int page)
+ev_history_add_page (EvHistory *history, int page, const gchar *label)
 {
 	EvLink *link;
 	EvLinkDest *dest;
@@ -172,7 +172,8 @@ ev_history_add_page (EvHistory *history, int page)
 	gchar *title;
 
 	g_return_if_fail (EV_IS_HISTORY (history));
-	title = g_strdup_printf (_("Page: %d"), page);
+	
+	title = g_strdup_printf (_("Page: %s"), label);
 
 	dest = ev_link_dest_new_page (page);
 	action = ev_link_action_new_dest (dest);
diff --git a/shell/ev-history.h b/shell/ev-history.h
index a815f93b..4f1ec1aa 100644
--- a/shell/ev-history.h
+++ b/shell/ev-history.h
@@ -55,7 +55,8 @@ EvHistory      *ev_history_new			(void);
 void		ev_history_add_link		(EvHistory  *history,
 						 EvLink     *linkk);
 void		ev_history_add_page		(EvHistory  *history,
-						 int         page);
+						 int         page,
+						 const gchar *label);
 EvLink	       *ev_history_get_link_nth		(EvHistory  *history,
 					 	 int         index);
 int		ev_history_get_n_links		(EvHistory  *history);
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 7fb90b2e..c7d39cdf 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -617,10 +617,15 @@ page_changed_cb (EvPageCache *page_cache,
 		 gint         page,
 		 EvWindow    *ev_window)
 {
+	gchar *label;
+	
 	ev_window_update_actions (ev_window);
 	
-	if (ev_window->priv->history)
-		ev_history_add_page (ev_window->priv->history, page);
+	if (ev_window->priv->history) {
+		label = ev_page_cache_get_page_label (ev_window->priv->page_cache, page);
+		ev_history_add_page (ev_window->priv->history, page, label);
+		g_free (label);
+	}
 
 	if (!ev_window_is_empty (ev_window))
 		ev_metadata_manager_set_int (ev_window->priv->uri, "page", page);