X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-sidebar.c;h=d21a13add609455e0932c8d81c36ec0fb7c9c494;hb=8dbcee6be49013edc9821096288e2c078169e349;hp=a1f4178102372eebacab5f6e7edcdeafa5b12aa9;hpb=51a7800b9832073f1b1c640d7991e6495b2614e0;p=evince.git diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c index a1f41781..d21a13ad 100644 --- a/shell/ev-sidebar.c +++ b/shell/ev-sidebar.c @@ -29,8 +29,8 @@ #include "ev-sidebar.h" #include "ev-document-thumbnails.h" -#include "ev-document-bookmarks.h" -#include "ev-sidebar-bookmarks.h" +#include "ev-document-links.h" +#include "ev-sidebar-links.h" #include "ev-sidebar-thumbnails.h" typedef struct @@ -179,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), 1); + gtk_combo_box_set_active (GTK_COMBO_BOX (ev_sidebar->priv->option_menu), 0); } void @@ -207,18 +207,15 @@ ev_sidebar_set_document (EvSidebar *sidebar, PAGE_COLUMN_MAIN_WIDGET, &widget, -1); - 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); + if (EV_IS_SIDEBAR_LINKS (widget) + && EV_IS_DOCUMENT_LINKS (document) + && ev_document_links_has_document_links (EV_DOCUMENT_LINKS (document))) + ev_sidebar_links_set_document (EV_SIDEBAR_LINKS (widget), + document); else if (EV_IS_SIDEBAR_THUMBNAILS (widget) && EV_IS_DOCUMENT_THUMBNAILS (document)) ev_sidebar_thumbnails_set_document (EV_SIDEBAR_THUMBNAILS (widget), document); - - - }