Updated (British) English translation

[evince.git] / shell / ev-sidebar-links.c

diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c
index 5a139aac6bb5d6867fe37f35a15c37a504c4a22f..4f677e67fdbfc777d78ab384bb59a06ba5bc00cf 100644 (file)
--- a/shell/ev-sidebar-links.c
+++ b/shell/ev-sidebar-links.c
@@ -33,7 +33,6 @@
 #include "ev-job-queue.h"
 #include "ev-document-links.h"
 #include "ev-window.h"
 #include "ev-job-queue.h"
 #include "ev-document-links.h"
 #include "ev-window.h"

-#include "ev-gui.h"

 
 struct _EvSidebarLinksPrivate {
        GtkWidget *tree_view;
 
 struct _EvSidebarLinksPrivate {
        GtkWidget *tree_view;


@@ -305,7 +304,7 @@ print_section_cb (GtkWidget *menuitem, EvSidebarLinks *sidebar)
                if (!link)
                        return;
 
                if (!link)
                        return;
 

-               first_page = get_page_from_link (link) + 1;
+               first_page = get_page_from_link (link);

                if (first_page == -1) {
                        g_object_unref (link);
                        return;
                if (first_page == -1) {
                        g_object_unref (link);
                        return;


@@ -332,7 +331,7 @@ print_section_cb (GtkWidget *menuitem, EvSidebarLinks *sidebar)
        
                window = gtk_widget_get_toplevel (GTK_WIDGET (sidebar));
                if (EV_IS_WINDOW (window)) {
        
                window = gtk_widget_get_toplevel (GTK_WIDGET (sidebar));
                if (EV_IS_WINDOW (window)) {

-#ifdef WITH_GNOME_PRINT
+#ifdef WITH_PRINT

                        ev_window_print_range (EV_WINDOW (window),
                                               first_page, last_page);
 #endif
                        ev_window_print_range (EV_WINDOW (window),
                                               first_page, last_page);
 #endif


@@ -420,7 +419,7 @@ ev_sidebar_links_construct (EvSidebarLinks *ev_sidebar_links)
        loading_model = create_loading_model ();
        priv->tree_view = gtk_tree_view_new_with_model (loading_model);
        g_object_unref (loading_model);
        loading_model = create_loading_model ();
        priv->tree_view = gtk_tree_view_new_with_model (loading_model);
        g_object_unref (loading_model);

-
+       

        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree_view));
        gtk_tree_selection_set_mode (selection, GTK_SELECTION_NONE);
        gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->tree_view), FALSE);
        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree_view));
        gtk_tree_selection_set_mode (selection, GTK_SELECTION_NONE);
        gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->tree_view), FALSE);


@@ -549,12 +548,10 @@ update_page_callback_foreach (GtkTreeModel *model,
                current_page = ev_page_cache_get_current_page (sidebar_links->priv->page_cache);
                         
                if (dest_page == current_page) {
                current_page = ev_page_cache_get_current_page (sidebar_links->priv->page_cache);
                         
                if (dest_page == current_page) {

-                       GtkTreeSelection *selection;
-
-                       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (sidebar_links->priv->tree_view));

                        gtk_tree_view_expand_to_path (GTK_TREE_VIEW (sidebar_links->priv->tree_view),
                                                      path);
                        gtk_tree_view_expand_to_path (GTK_TREE_VIEW (sidebar_links->priv->tree_view),
                                                      path);

-                       gtk_tree_selection_select_path (selection, path);
+                       gtk_tree_view_set_cursor (GTK_TREE_VIEW (sidebar_links->priv->tree_view),
+                                                 path, NULL, FALSE);

                        
                        return TRUE;
                }
                        
                        return TRUE;
                }