X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-sidebar.c;h=f042f0c5b3612beb92c6c2e72a46abb13c707b54;hb=d8ee8d47ba0982593a9774bb326944349a784b89;hp=780f9f6a73811371777b39450d5b483c4e116411;hpb=37ca059dda89fecb22f6297d337ea393b2069605;p=evince.git

diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c
index 780f9f6a..f042f0c5 100644
--- a/shell/ev-sidebar.c
+++ b/shell/ev-sidebar.c
@@ -28,7 +28,10 @@
 #include <gtk/gtk.h>
 
 #include "ev-sidebar.h"
+#include "ev-document-thumbnails.h"
+#include "ev-document-bookmarks.h"
 #include "ev-sidebar-bookmarks.h"
+#include "ev-sidebar-thumbnails.h"
 
 typedef struct
 {
@@ -77,7 +80,7 @@ ev_sidebar_init (EvSidebar *ev_sidebar)
 {
 	GtkWidget *hbox;
 	GtkCellRenderer *renderer;
-
+	
 	ev_sidebar->priv = EV_SIDEBAR_GET_PRIVATE (ev_sidebar);
 	gtk_box_set_spacing (GTK_BOX (ev_sidebar), 6);
 
@@ -100,6 +103,7 @@ ev_sidebar_init (EvSidebar *ev_sidebar)
 	gtk_box_pack_start (GTK_BOX (hbox),
 			    ev_sidebar->priv->option_menu,
 			    FALSE, FALSE, 0);
+	
 	renderer = gtk_cell_renderer_text_new ();
 	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (ev_sidebar->priv->option_menu),
 				    renderer, TRUE);
@@ -172,6 +176,10 @@ ev_sidebar_add_page (EvSidebar   *ev_sidebar,
 					   PAGE_COLUMN_MAIN_WIDGET, main_widget,
 					   PAGE_COLUMN_NOTEBOOK_INDEX, index,
 					   -1);
+
+	/* 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);
 }
 
 void
@@ -199,12 +207,18 @@ 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... */
+		else if (EV_IS_SIDEBAR_THUMBNAILS (widget) &&
+			 EV_IS_DOCUMENT_THUMBNAILS (document))
+			ev_sidebar_thumbnails_set_document (EV_SIDEBAR_THUMBNAILS (widget),
+							    document);
+				
+
+		  
 	}