X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-page-cache.c;h=ebf0de7f9b69f8d2409e51d69f75dabb0438d4aa;hb=217797d63b2d3b1c9a7a0511af1bbf3d99f0d482;hp=3dd8c9a7f1c1c9c29174d0f0079f452a35938b89;hpb=e2137316b9264832a019b3f26411d10cb46a9598;p=evince.git

diff --git a/shell/ev-page-cache.c b/shell/ev-page-cache.c
index 3dd8c9a7..ebf0de7f 100644
--- a/shell/ev-page-cache.c
+++ b/shell/ev-page-cache.c
@@ -45,11 +45,13 @@ struct _EvPageCacheClass
 	GObjectClass parent_class;
 
 	void (* page_changed) (EvPageCache *page_cache, gint page);
+	void (* history_changed) (EvPageCache *page_cache, gint page);
 };
 
 enum
 {
 	PAGE_CHANGED,
+	HISTORY_CHANGED,
 	N_SIGNALS,
 };
 
@@ -87,6 +89,16 @@ ev_page_cache_class_init (EvPageCacheClass *class)
 			      G_TYPE_NONE, 1,
 			      G_TYPE_INT);
 
+	signals [HISTORY_CHANGED] =
+		g_signal_new ("history-changed",
+			      EV_TYPE_PAGE_CACHE,
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (EvPageCacheClass, history_changed),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__INT,
+			      G_TYPE_NONE, 1,
+			      G_TYPE_INT);
+
 }
 
 static void
@@ -96,12 +108,43 @@ ev_page_cache_finalize (GObject *object)
 
 	page_cache = EV_PAGE_CACHE (object);
 
-	g_free (page_cache->title);
-	g_free (page_cache->size_cache);
-	g_free (page_cache->height_to_page);
-	g_free (page_cache->dual_height_to_page);
+	if (page_cache->title) {
+		g_free (page_cache->title);
+		page_cache->title = NULL;
+	}
+
+	if (page_cache->size_cache) {
+		g_free (page_cache->size_cache);
+		page_cache->size_cache = NULL;
+	}
+
+	if (page_cache->height_to_page) {
+		g_free (page_cache->height_to_page);
+		page_cache->height_to_page = NULL;
+	}
+
+	if (page_cache->dual_height_to_page) {
+		g_free (page_cache->dual_height_to_page);
+		page_cache->dual_height_to_page = NULL;
+	}
+
+	if (page_cache->page_labels) {
+		gint i;
+
+		for (i = 0; i < page_cache->n_pages; i++) {
+			if (page_cache->page_labels[i])
+				g_free (page_cache->page_labels[i]);
+		}
+		g_free (page_cache->page_labels);
+		page_cache->page_labels = NULL;
+	}
 
-	ev_document_info_free (page_cache->page_info);
+	if (page_cache->page_info) {
+		ev_document_info_free (page_cache->page_info);
+		page_cache->page_info = NULL;
+	}
+
+	G_OBJECT_CLASS (ev_page_cache_parent_class)->finalize (object);
 }
 
 static void
@@ -323,6 +366,16 @@ ev_page_cache_set_current_page (EvPageCache *page_cache,
 	g_signal_emit (page_cache, signals[PAGE_CHANGED], 0, page);
 }
 
+void
+ev_page_cache_set_current_page_history (EvPageCache *page_cache,
+					int          page)
+{
+	if (abs (page - page_cache->current_page) > 1)
+		g_signal_emit (page_cache, signals [HISTORY_CHANGED], 0, page);
+	
+	ev_page_cache_set_current_page (page_cache, page);
+}
+
 gboolean
 ev_page_cache_set_page_label (EvPageCache *page_cache,
 			      const char  *page_label)
@@ -352,8 +405,7 @@ ev_page_cache_set_page_label (EvPageCache *page_cache,
 		/* convert from a page label to a page offset */
 		page --;
 		if (page >= 0 &&
-		    page < page_cache->n_pages &&
-		    page_cache->page_labels[page] == NULL) {
+		    page < page_cache->n_pages) {
 			ev_page_cache_set_current_page (page_cache, page);
 			return TRUE;
 		}