From 51a7800b9832073f1b1c640d7991e6495b2614e0 Mon Sep 17 00:00:00 2001
From: Jonathan Blandford <jrb@redhat.com>
Date: Fri, 24 Dec 2004 05:50:50 +0000
Subject: * backend/ev-document-bookmarks.h: * pdf/xpdf/Makefile.am: *

Fri Dec 24 00:48:44 2004  Jonathan Blandford  <jrb@redhat.com>

        * backend/ev-document-bookmarks.c:
        (ev_document_bookmarks_get_child): *
        backend/ev-document-bookmarks.h: * pdf/xpdf/Makefile.am: *
        pdf/xpdf/pdf-document.cc: * pdf/xpdf/pdf-document.h: *
        shell/Makefile.am: * shell/ev-sidebar-bookmarks.c:
        (ev_sidebar_bookmarks_destroy),
        (ev_sidebar_bookmarks_class_init),
        (ev_sidebar_bookmarks_construct), (stack_data_free),
        (do_one_iteration), (populate_bookmarks_idle),
        (ev_sidebar_bookmarks_clear_document),
        (ev_sidebar_bookmarks_set_document): *
        shell/ev-sidebar-bookmarks.h: * shell/ev-sidebar.c:
        (ev_sidebar_add_page),
        (ev_sidebar_set_document): * shell/ev-window.c: (ev_window_open):
        Initial stab at a bookmarks sidebar.  It doesn't navigate yet, but
        it displays both the topics and the page numbers.
---
(limited to 'shell/ev-sidebar.c')

diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c
index 98beaa5..a1f4178 100644
--- a/shell/ev-sidebar.c
+++ b/shell/ev-sidebar.c
@@ -29,6 +29,7 @@
 
 #include "ev-sidebar.h"
 #include "ev-document-thumbnails.h"
+#include "ev-document-bookmarks.h"
 #include "ev-sidebar-bookmarks.h"
 #include "ev-sidebar-thumbnails.h"
 
@@ -178,7 +179,7 @@ ev_sidebar_add_page (EvSidebar   *ev_sidebar,
 
 	/* Set the first item added as active */
 	if (gtk_combo_box_get_active (GTK_COMBO_BOX (ev_sidebar->priv->option_menu)))
-		gtk_combo_box_set_active (GTK_COMBO_BOX (ev_sidebar->priv->option_menu), 0);
+		gtk_combo_box_set_active (GTK_COMBO_BOX (ev_sidebar->priv->option_menu), 1);
 }
 
 void
@@ -206,9 +207,9 @@ ev_sidebar_set_document (EvSidebar   *sidebar,
 				    PAGE_COLUMN_MAIN_WIDGET, &widget,
 				    -1);
 
-		if (EV_IS_SIDEBAR_BOOKMARKS (widget))
-			/* && EV_IS_BOOKMARKS (document)
-			   && ev_bookmarks_has_bookmarks (document)... */
+		if (EV_IS_SIDEBAR_BOOKMARKS (widget)
+		    && EV_IS_DOCUMENT_BOOKMARKS (document)
+		    && ev_document_bookmarks_has_document_bookmarks (EV_DOCUMENT_BOOKMARKS (document)))
 			ev_sidebar_bookmarks_set_document (EV_SIDEBAR_BOOKMARKS (widget),
 							   document);
 		else if (EV_IS_SIDEBAR_THUMBNAILS (widget) &&
--
cgit v0.9.1