Added F3 as a find-next accelerator key, bug 579072

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

diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c
index 93959b37ab60444963ff94fd7520b7aabb50b7a3..91986f8c0948d950ca6fe7331819fc2bc8f52bc6 100644 (file)
--- a/shell/ev-sidebar-links.c
+++ b/shell/ev-sidebar-links.c
@@ -25,13 +25,14 @@
 #endif
 
 #include <string.h>
 #endif
 
 #include <string.h>

+

 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 

-#include "ev-sidebar-page.h"
-#include "ev-sidebar-links.h"
-#include "ev-job-queue.h"

 #include "ev-document-links.h"
 #include "ev-document-links.h"

+#include "ev-job-scheduler.h"
+#include "ev-sidebar-links.h"
+#include "ev-sidebar-page.h"

 #include "ev-window.h"
 
 struct _EvSidebarLinksPrivate {
 #include "ev-window.h"
 
 struct _EvSidebarLinksPrivate {


@@ -51,14 +52,14 @@ struct _EvSidebarLinksPrivate {
 enum {
        PROP_0,
        PROP_MODEL,
 enum {
        PROP_0,
        PROP_MODEL,

+       PROP_WIDGET,

 };
 
 };
 

+enum {
+       LINK_ACTIVATED,
+       N_SIGNALS
+};

 
 

-static void links_page_num_func                                (GtkTreeViewColumn *tree_column,
-                                                        GtkCellRenderer   *cell,
-                                                        GtkTreeModel      *tree_model,
-                                                        GtkTreeIter       *iter,
-                                                        EvSidebarLinks    *sidebar_links);

 static void update_page_callback                       (EvPageCache       *page_cache,
                                                         gint               current_page,
                                                         EvSidebarLinks    *sidebar_links);
 static void update_page_callback                       (EvPageCache       *page_cache,
                                                         gint               current_page,
                                                         EvSidebarLinks    *sidebar_links);


@@ -66,14 +67,16 @@ static void row_activated_callback                  (GtkTreeView *treeview,
                                                         GtkTreePath *arg1,
                                                         GtkTreeViewColumn *arg2,
                                                         gpointer user_data);
                                                         GtkTreePath *arg1,
                                                         GtkTreeViewColumn *arg2,
                                                         gpointer user_data);

+static void job_finished_callback                      (EvJobLinks     *job,
+                                                        EvSidebarLinks *sidebar_links);

 static void ev_sidebar_links_page_iface_init           (EvSidebarPageIface *iface);
 static void ev_sidebar_links_page_iface_init           (EvSidebarPageIface *iface);

-static void ev_sidebar_links_clear_document            (EvSidebarLinks *sidebar_links);

 static void ev_sidebar_links_set_document                      (EvSidebarPage  *sidebar_page,
                                                         EvDocument     *document);
 static gboolean ev_sidebar_links_support_document      (EvSidebarPage  *sidebar_page,
                                                         EvDocument     *document);
 static const gchar* ev_sidebar_links_get_label                 (EvSidebarPage *sidebar_page);
 
 static void ev_sidebar_links_set_document                      (EvSidebarPage  *sidebar_page,
                                                         EvDocument     *document);
 static gboolean ev_sidebar_links_support_document      (EvSidebarPage  *sidebar_page,
                                                         EvDocument     *document);
 static const gchar* ev_sidebar_links_get_label                 (EvSidebarPage *sidebar_page);
 

+static guint signals[N_SIGNALS];

 
 G_DEFINE_TYPE_EXTENDED (EvSidebarLinks, 
                         ev_sidebar_links, 
 
 G_DEFINE_TYPE_EXTENDED (EvSidebarLinks, 
                         ev_sidebar_links, 


@@ -86,15 +89,6 @@ G_DEFINE_TYPE_EXTENDED (EvSidebarLinks,
 #define EV_SIDEBAR_LINKS_GET_PRIVATE(object) \
        (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_SIDEBAR_LINKS, EvSidebarLinksPrivate))
 
 #define EV_SIDEBAR_LINKS_GET_PRIVATE(object) \
        (G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_SIDEBAR_LINKS, EvSidebarLinksPrivate))
 

-
-static void
-ev_sidebar_links_destroy (GtkObject *object)
-{
-       EvSidebarLinks *ev_sidebar_links = (EvSidebarLinks *) object;
-
-       ev_sidebar_links_clear_document (ev_sidebar_links);
-}
-

 static void
 ev_sidebar_links_set_property (GObject      *object,
                               guint         prop_id,
 static void
 ev_sidebar_links_set_property (GObject      *object,
                               guint         prop_id,


@@ -135,26 +129,80 @@ ev_sidebar_links_get_property (GObject    *object,
        case PROP_MODEL:
                g_value_set_object (value, ev_sidebar_links->priv->model);
                break;
        case PROP_MODEL:
                g_value_set_object (value, ev_sidebar_links->priv->model);
                break;

+       case PROP_WIDGET:
+               g_value_set_object (value, ev_sidebar_links->priv->tree_view);
+               break;

        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
                break;
        }
 }
 
        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
                break;
        }
 }
 

+static void
+ev_sidebar_links_dispose (GObject *object)
+{
+       EvSidebarLinks *sidebar = EV_SIDEBAR_LINKS (object);
+
+       if (sidebar->priv->job) {
+               g_signal_handlers_disconnect_by_func (sidebar->priv->job,
+                                                     job_finished_callback, sidebar);
+               ev_job_cancel (sidebar->priv->job);                                                   
+               g_object_unref (sidebar->priv->job);
+               sidebar->priv->job = NULL;
+       }
+
+       if (sidebar->priv->model) {
+               g_object_unref (sidebar->priv->model);
+               sidebar->priv->model = NULL;
+       }
+
+       if (sidebar->priv->document) {
+               g_object_unref (sidebar->priv->document);
+               sidebar->priv->document = NULL;
+               sidebar->priv->page_cache = NULL;
+       }
+
+       G_OBJECT_CLASS (ev_sidebar_links_parent_class)->dispose (object);
+}
+
+static void
+ev_sidebar_links_map (GtkWidget *widget)
+{
+       EvSidebarLinks *links;
+
+       links = EV_SIDEBAR_LINKS (widget);
+
+       GTK_WIDGET_CLASS (ev_sidebar_links_parent_class)->map (widget);
+
+       if (links->priv->model) {
+               update_page_callback (links->priv->page_cache,
+                                     ev_page_cache_get_current_page (links->priv->page_cache),
+                                     links);
+       }
+}

 
 static void
 ev_sidebar_links_class_init (EvSidebarLinksClass *ev_sidebar_links_class)
 {
 
 static void
 ev_sidebar_links_class_init (EvSidebarLinksClass *ev_sidebar_links_class)
 {

-       GObjectClass *g_object_class;
-       GtkObjectClass *gtk_object_class;
+       GObjectClass   *g_object_class;
+       GtkWidgetClass *widget_class;

 
        g_object_class = G_OBJECT_CLASS (ev_sidebar_links_class);
 
        g_object_class = G_OBJECT_CLASS (ev_sidebar_links_class);

-       gtk_object_class = GTK_OBJECT_CLASS (ev_sidebar_links_class);
+       widget_class = GTK_WIDGET_CLASS (ev_sidebar_links_class);

 
        g_object_class->set_property = ev_sidebar_links_set_property;
        g_object_class->get_property = ev_sidebar_links_get_property;
 
        g_object_class->set_property = ev_sidebar_links_set_property;
        g_object_class->get_property = ev_sidebar_links_get_property;

+       g_object_class->dispose = ev_sidebar_links_dispose;

 
 

-       gtk_object_class->destroy = ev_sidebar_links_destroy;
+       widget_class->map = ev_sidebar_links_map;
+
+       signals[LINK_ACTIVATED] = g_signal_new ("link-activated",
+                        G_TYPE_FROM_CLASS (g_object_class),
+                        G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                        G_STRUCT_OFFSET (EvSidebarLinksClass, link_activated),
+                        NULL, NULL,
+                        g_cclosure_marshal_VOID__OBJECT,
+                        G_TYPE_NONE, 1, G_TYPE_OBJECT);

 
        g_object_class_install_property (g_object_class,
                                         PROP_MODEL,
 
        g_object_class_install_property (g_object_class,
                                         PROP_MODEL,


@@ -163,6 +211,9 @@ ev_sidebar_links_class_init (EvSidebarLinksClass *ev_sidebar_links_class)
                                                              "Current Model",
                                                              GTK_TYPE_TREE_MODEL,
                                                              G_PARAM_READWRITE));
                                                              "Current Model",
                                                              GTK_TYPE_TREE_MODEL,
                                                              G_PARAM_READWRITE));

+       g_object_class_override_property (g_object_class,
+                                         PROP_WIDGET,
+                                         "main-widget");

 
        g_type_class_add_private (g_object_class, sizeof (EvSidebarLinksPrivate));
 }
 
        g_type_class_add_private (g_object_class, sizeof (EvSidebarLinksPrivate));
 }


@@ -175,8 +226,6 @@ selection_changed_callback (GtkTreeSelection   *selection,
        GtkTreeModel *model;
        GtkTreeIter iter;
 
        GtkTreeModel *model;
        GtkTreeIter iter;
 

-       g_return_if_fail (EV_IS_SIDEBAR_LINKS (ev_sidebar_links));
-

        document = EV_DOCUMENT (ev_sidebar_links->priv->document);
        g_return_if_fail (ev_sidebar_links->priv->document != NULL);
 
        document = EV_DOCUMENT (ev_sidebar_links->priv->document);
        g_return_if_fail (ev_sidebar_links->priv->document != NULL);
 


@@ -192,10 +241,11 @@ selection_changed_callback (GtkTreeSelection   *selection,
 
                g_signal_handler_block (ev_sidebar_links->priv->page_cache,
                                        ev_sidebar_links->priv->page_changed_id);
 
                g_signal_handler_block (ev_sidebar_links->priv->page_cache,
                                        ev_sidebar_links->priv->page_changed_id);

-               /* FIXME: we should handle this better.  This breaks w/ URLs */
-               ev_page_cache_set_link (ev_sidebar_links->priv->page_cache, link);
+               g_signal_emit (ev_sidebar_links, signals[LINK_ACTIVATED], 0, link);

                g_signal_handler_unblock (ev_sidebar_links->priv->page_cache,
                                          ev_sidebar_links->priv->page_changed_id);
                g_signal_handler_unblock (ev_sidebar_links->priv->page_cache,
                                          ev_sidebar_links->priv->page_changed_id);

+
+               g_object_unref (link);

        }
 }
 
        }
 }
 


@@ -209,12 +259,15 @@ create_loading_model (void)
        /* Creates a fake model to indicate that we're loading */
        retval = (GtkTreeModel *)gtk_list_store_new (EV_DOCUMENT_LINKS_COLUMN_NUM_COLUMNS,
                                                     G_TYPE_STRING,
        /* Creates a fake model to indicate that we're loading */
        retval = (GtkTreeModel *)gtk_list_store_new (EV_DOCUMENT_LINKS_COLUMN_NUM_COLUMNS,
                                                     G_TYPE_STRING,

-                                                    G_TYPE_OBJECT);
+                                                    G_TYPE_OBJECT,
+                                                    G_TYPE_BOOLEAN,
+                                                    G_TYPE_STRING);

 
        gtk_list_store_append (GTK_LIST_STORE (retval), &iter);
        markup = g_strdup_printf ("<span size=\"larger\" style=\"italic\">%s</span>", _("Loading..."));
        gtk_list_store_set (GTK_LIST_STORE (retval), &iter,
                            EV_DOCUMENT_LINKS_COLUMN_MARKUP, markup,
 
        gtk_list_store_append (GTK_LIST_STORE (retval), &iter);
        markup = g_strdup_printf ("<span size=\"larger\" style=\"italic\">%s</span>", _("Loading..."));
        gtk_list_store_set (GTK_LIST_STORE (retval), &iter,
                            EV_DOCUMENT_LINKS_COLUMN_MARKUP, markup,

+                           EV_DOCUMENT_LINKS_COLUMN_EXPAND, FALSE,

                            EV_DOCUMENT_LINKS_COLUMN_LINK, NULL,
                            -1);
        g_free (markup);
                            EV_DOCUMENT_LINKS_COLUMN_LINK, NULL,
                            -1);
        g_free (markup);


@@ -235,30 +288,76 @@ print_section_cb (GtkWidget *menuitem, EvSidebarLinks *sidebar)
 
        if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
                EvLink *link;
 
        if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
                EvLink *link;

-               int first_page, last_page;
+               int first_page, last_page = -1;

 
                gtk_tree_model_get (model, &iter,
                                    EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
                                    -1);
 
                gtk_tree_model_get (model, &iter,
                                    EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
                                    -1);

-               first_page = ev_link_get_page (link) + 1;
+
+               if (!link)
+                       return;
+
+               first_page = ev_link_get_page (link);
+               if (first_page == -1) {
+                       g_object_unref (link);
+                       return;
+               }
+               
+               first_page++;
+               g_object_unref (link);

 
                if (gtk_tree_model_iter_next (model, &iter)) {
                        gtk_tree_model_get (model, &iter,
                                            EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
                                            -1);
 
                if (gtk_tree_model_iter_next (model, &iter)) {
                        gtk_tree_model_get (model, &iter,
                                            EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
                                            -1);

-                       last_page = ev_link_get_page (link);
+
+                       if (link) {
+                               last_page = ev_link_get_page (link);
+                               g_object_unref (link);
+                       }

                } else {
                } else {

-                       last_page = -1;
+                       last_page = ev_page_cache_get_n_pages (sidebar->priv->page_cache);

                }
                }

+
+               if (last_page == -1)
+                       last_page = ev_page_cache_get_n_pages (sidebar->priv->page_cache);

        
                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)) {

-                       ev_window_print_range (EV_WINDOW (window),
-                                              first_page, last_page);
+                       ev_window_print_range (EV_WINDOW (window), first_page, last_page);

                }
        }
 }
 
                }
        }
 }
 

+static GtkMenu *
+build_popup_menu (EvSidebarLinks *sidebar)
+{
+       GtkWidget *menu;
+       GtkWidget *item;
+
+       menu = gtk_menu_new ();
+       item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PRINT, NULL);
+       gtk_label_set_label (GTK_LABEL (GTK_BIN (item)->child), _("Print..."));
+       gtk_widget_show (item);
+       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+       g_signal_connect (item, "activate",
+                         G_CALLBACK (print_section_cb), sidebar);
+
+       return GTK_MENU (menu);
+}
+
+static void
+popup_menu_cb (GtkWidget *treeview, EvSidebarLinks *sidebar)
+{
+       GtkMenu *menu = build_popup_menu (sidebar);
+
+       gtk_menu_popup (menu, NULL, NULL,
+                       ev_gui_menu_position_tree_selection,
+                       sidebar->priv->tree_view, 0,
+                       gtk_get_current_event_time ());
+       gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
+}
+

 static gboolean
 button_press_cb (GtkWidget *treeview,
                  GdkEventButton *event,
 static gboolean
 button_press_cb (GtkWidget *treeview,
                  GdkEventButton *event,


@@ -272,25 +371,11 @@ button_press_cb (GtkWidget *treeview,
                                                   event->y,
                                                   &path,
                                                   NULL, NULL, NULL)) {
                                                   event->y,
                                                   &path,
                                                   NULL, NULL, NULL)) {

-                       GtkWidget *menu;
-                       GtkWidget *item;
-

                        gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview),
                                                  path, NULL, FALSE);
                        gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview),
                                                  path, NULL, FALSE);

-
-                       menu = gtk_menu_new ();
-                       item = gtk_image_menu_item_new_from_stock
-                                                       (GTK_STOCK_PRINT, NULL);
-                       gtk_label_set_label (GTK_LABEL (GTK_BIN (item)->child),
-                                            _("Print..."));
-                       gtk_widget_show (item);
-                       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-                       g_signal_connect (item, "activate",
-                                         G_CALLBACK (print_section_cb), sidebar);
-
-                       gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 2,
+                       gtk_menu_popup (build_popup_menu (sidebar), NULL,
+                                       NULL, NULL, NULL, event->button,

                                        gtk_get_current_event_time ());
                                        gtk_get_current_event_time ());

-

                        gtk_tree_path_free (path);
 
                        return TRUE;
                        gtk_tree_path_free (path);
 
                        return TRUE;


@@ -324,7 +409,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);


@@ -349,14 +434,19 @@ ev_sidebar_links_construct (EvSidebarLinks *ev_sidebar_links)
        
        renderer = gtk_cell_renderer_text_new ();
        gtk_tree_view_column_pack_end (GTK_TREE_VIEW_COLUMN (column), renderer, FALSE);
        
        renderer = gtk_cell_renderer_text_new ();
        gtk_tree_view_column_pack_end (GTK_TREE_VIEW_COLUMN (column), renderer, FALSE);

-       gtk_tree_view_column_set_cell_data_func (GTK_TREE_VIEW_COLUMN (column), renderer,
-                                                (GtkTreeCellDataFunc) links_page_num_func,
-                                                ev_sidebar_links, NULL);
+       gtk_tree_view_column_set_attributes (GTK_TREE_VIEW_COLUMN (column), renderer,
+                                            "text", EV_DOCUMENT_LINKS_COLUMN_PAGE_LABEL,
+                                            NULL);
+       g_object_set (G_OBJECT (renderer), "style", PANGO_STYLE_ITALIC, NULL);

 
 

-       g_signal_connect (GTK_TREE_VIEW (priv->tree_view),
+       g_signal_connect (priv->tree_view,

                          "button_press_event",
                          G_CALLBACK (button_press_cb),
                          ev_sidebar_links);
                          "button_press_event",
                          G_CALLBACK (button_press_cb),
                          ev_sidebar_links);

+       g_signal_connect (priv->tree_view,
+                         "popup_menu",
+                         G_CALLBACK (popup_menu_cb),
+                         ev_sidebar_links);

 }
 
 static void
 }
 
 static void


@@ -367,39 +457,38 @@ ev_sidebar_links_init (EvSidebarLinks *ev_sidebar_links)
        ev_sidebar_links_construct (ev_sidebar_links);
 }
 
        ev_sidebar_links_construct (ev_sidebar_links);
 }
 

-static void
-links_page_num_func (GtkTreeViewColumn *tree_column,
-                    GtkCellRenderer   *cell,
-                    GtkTreeModel      *tree_model,
-                    GtkTreeIter       *iter,
-                    EvSidebarLinks    *sidebar_links)
+static gboolean
+fill_page_labels (GtkTreeModel *tree_model,
+                  GtkTreePath *path,
+                  GtkTreeIter *iter,
+                 EvSidebarLinks    *sidebar_links)

 {
        EvLink *link;
 {
        EvLink *link;

+       gint page;
+       gchar *page_label;

 
        gtk_tree_model_get (tree_model, iter,
                            EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
                            -1);
 
        gtk_tree_model_get (tree_model, iter,
                            EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
                            -1);

-       
-       if (link != NULL &&
-           ev_link_get_link_type (link) == EV_LINK_TYPE_PAGE) {
-               gchar *page_label;
-               gchar *page_string;

 
 

-               page_label = ev_page_cache_get_page_label (sidebar_links->priv->page_cache, ev_link_get_page (link));
-               page_string = g_markup_printf_escaped ("<i>%s</i>", page_label);
+       if (!link)
+               return FALSE;

 
 

-               g_object_set (cell,
-                             "markup", page_string,
-                             "visible", TRUE,
-                             NULL);
+       page = ev_link_get_page (link);

 
 

-               g_free (page_label);
-               g_free (page_string);
-       } else {
-               g_object_set (cell,
-                             "visible", FALSE,
-                             NULL);
-       }
+       if (page < 0) 
+               return FALSE;
+       
+       page_label = ev_page_cache_get_page_label (sidebar_links->priv->page_cache,
+                                                  page);
+       gtk_tree_store_set (GTK_TREE_STORE (tree_model), iter,
+                           EV_DOCUMENT_LINKS_COLUMN_PAGE_LABEL, page_label, 
+                           -1);
+
+       g_free (page_label);
+
+       g_object_unref (link);
+       return FALSE;

 }
 
 /* Public Functions */
 }
 
 /* Public Functions */


@@ -414,24 +503,6 @@ ev_sidebar_links_new (void)
        return ev_sidebar_links;
 }
 
        return ev_sidebar_links;
 }
 

-static void
-ev_sidebar_links_clear_document (EvSidebarLinks *sidebar_links)
-{
-       EvSidebarLinksPrivate *priv;
-
-       g_return_if_fail (EV_IS_SIDEBAR_LINKS (sidebar_links));
-
-       priv = sidebar_links->priv;
-
-       if (priv->document) {
-               g_object_unref (priv->document);
-               priv->document = NULL;
-               priv->page_cache = NULL;
-       }
-
-       gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree_view), NULL);
-}
-

 static gboolean
 update_page_callback_foreach (GtkTreeModel *model,
                              GtkTreePath  *path,
 static gboolean
 update_page_callback_foreach (GtkTreeModel *model,
                              GtkTreePath  *path,


@@ -445,21 +516,25 @@ update_page_callback_foreach (GtkTreeModel *model,
                            EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
                            -1);
 
                            EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
                            -1);
 

-       if (link && ev_link_get_link_type (link) == EV_LINK_TYPE_PAGE) {
+       if (link) {

                int current_page;
                int current_page;

+               int dest_page;

 
 

+               dest_page = ev_link_get_page (link);
+               g_object_unref (link);
+               

                current_page = ev_page_cache_get_current_page (sidebar_links->priv->page_cache);
                current_page = ev_page_cache_get_current_page (sidebar_links->priv->page_cache);

-               if (ev_link_get_page (link) == current_page) {
-                       GtkTreeSelection *selection;
-
-                       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (sidebar_links->priv->tree_view));
-
-                       gtk_tree_selection_select_path (selection, path);
-
+                        
+               if (dest_page == current_page) {
+                       gtk_tree_view_expand_to_path (GTK_TREE_VIEW (sidebar_links->priv->tree_view),
+                                                     path);
+                       gtk_tree_view_set_cursor (GTK_TREE_VIEW (sidebar_links->priv->tree_view),
+                                                 path, NULL, FALSE);
+                       

                        return TRUE;
                }
        }
                        return TRUE;
                }
        }

-       
+

        return FALSE;
 }
 
        return FALSE;
 }
 


@@ -469,83 +544,128 @@ update_page_callback (EvPageCache    *page_cache,
                      EvSidebarLinks *sidebar_links)
 {
        GtkTreeSelection *selection;
                      EvSidebarLinks *sidebar_links)
 {
        GtkTreeSelection *selection;

+       GtkTreeModel *model;
+       GtkTreeIter iter;
+
+       /* Widget is not currently visible */
+       if (!GTK_WIDGET_MAPPED (sidebar_links))
+               return;
+       
+       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (sidebar_links->priv->tree_view));
+
+       if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
+               EvLink *link;
+
+               gtk_tree_model_get (model, &iter,
+                                   EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
+                                   -1);
+               if (link) {
+                       gint dest_page;
+
+                       dest_page = ev_link_get_page (link);
+                       g_object_unref (link);
+                       
+                       if (dest_page == current_page)
+                               return;
+               }
+       }               
+

        /* We go through the tree linearly looking for the first page that
         * matches.  This is pretty inefficient.  We can do something neat with
         * a GtkTreeModelSort here to make it faster, if it turns out to be
         * slow.
         */
        /* We go through the tree linearly looking for the first page that
         * matches.  This is pretty inefficient.  We can do something neat with
         * a GtkTreeModelSort here to make it faster, if it turns out to be
         * slow.
         */

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

        g_signal_handler_block (selection, sidebar_links->priv->selection_id);
        g_signal_handler_block (sidebar_links->priv->tree_view, sidebar_links->priv->row_activated_id);
 
        g_signal_handler_block (selection, sidebar_links->priv->selection_id);
        g_signal_handler_block (sidebar_links->priv->tree_view, sidebar_links->priv->row_activated_id);
 

-       gtk_tree_selection_unselect_all (selection);
-       gtk_tree_model_foreach (sidebar_links->priv->model,
+       gtk_tree_model_foreach (model,

                                update_page_callback_foreach,
                                sidebar_links);
                                update_page_callback_foreach,
                                sidebar_links);

-
+       

        g_signal_handler_unblock (selection, sidebar_links->priv->selection_id);
        g_signal_handler_unblock (sidebar_links->priv->tree_view, sidebar_links->priv->row_activated_id);
 }
 
 static void 
        g_signal_handler_unblock (selection, sidebar_links->priv->selection_id);
        g_signal_handler_unblock (sidebar_links->priv->tree_view, sidebar_links->priv->row_activated_id);
 }
 
 static void 

-row_activated_callback                         (GtkTreeView *treeview,
-                                         GtkTreePath *arg1,
-                                         GtkTreeViewColumn *arg2,
-                                         gpointer user_data)
-{      
+row_activated_callback (GtkTreeView       *treeview,
+                       GtkTreePath       *arg1,
+                       GtkTreeViewColumn *arg2,
+                       gpointer           user_data)
+{

        if (gtk_tree_view_row_expanded (GTK_TREE_VIEW (treeview), arg1)) {
        if (gtk_tree_view_row_expanded (GTK_TREE_VIEW (treeview), arg1)) {

-                   gtk_tree_view_collapse_row (GTK_TREE_VIEW (treeview), arg1);
+               gtk_tree_view_collapse_row (GTK_TREE_VIEW (treeview), arg1);

        } else {
        } else {

-                   gtk_tree_view_expand_row (GTK_TREE_VIEW (treeview), arg1, FALSE);
+               gtk_tree_view_expand_row (GTK_TREE_VIEW (treeview), arg1, FALSE);

        }
        }

-       
-        return;

 }
 }

+
+static void
+expand_open_links (GtkTreeView *tree_view, GtkTreeModel *model, GtkTreeIter *parent)
+{
+       GtkTreeIter iter;
+       gboolean expand;
+
+       if (gtk_tree_model_iter_children (model, &iter, parent)) {
+               do {
+                       gtk_tree_model_get (model, &iter,
+                                           EV_DOCUMENT_LINKS_COLUMN_EXPAND, &expand,
+                                           -1);
+                       if (expand) {
+                               GtkTreePath *path;

                                
                                

+                               path = gtk_tree_model_get_path (model, &iter);
+                               gtk_tree_view_expand_row (tree_view, path, FALSE);
+                               gtk_tree_path_free (path);
+                       }
+
+                       expand_open_links (tree_view, model, &iter);
+               } while (gtk_tree_model_iter_next (model, &iter));
+       }
+}
+       

 static void
 job_finished_callback (EvJobLinks     *job,
                       EvSidebarLinks *sidebar_links)
 {
        EvSidebarLinksPrivate *priv;
        GtkTreeSelection *selection;
 static void
 job_finished_callback (EvJobLinks     *job,
                       EvSidebarLinks *sidebar_links)
 {
        EvSidebarLinksPrivate *priv;
        GtkTreeSelection *selection;

-       GtkTreeIter iter;
-       GtkTreePath *path;
-       gboolean result;

 
        priv = sidebar_links->priv;
 
        priv = sidebar_links->priv;

-
-       priv->model = g_object_ref (job->model);
+       
+       priv->model = job->model;

        g_object_notify (G_OBJECT (sidebar_links), "model");
        g_object_notify (G_OBJECT (sidebar_links), "model");

+       
+       gtk_tree_model_foreach (priv->model, (GtkTreeModelForeachFunc)fill_page_labels, sidebar_links);

 
        gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree_view), job->model);
 
        gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree_view), job->model);

+       

        g_object_unref (job);
        g_object_unref (job);

+       priv->job = NULL;
+
+       expand_open_links (GTK_TREE_VIEW (priv->tree_view), priv->model, NULL);

 
 

-       /* Expand one level of the tree */
-       path = gtk_tree_path_new_first ();
-       for (result = gtk_tree_model_get_iter_first (priv->model, &iter);
-            result;
-            result = gtk_tree_model_iter_next (priv->model, &iter)) {
-               gtk_tree_view_expand_row (GTK_TREE_VIEW (priv->tree_view), path, FALSE);
-               gtk_tree_path_next (path);
-       }
-       gtk_tree_path_free (path);
-       

        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree_view));
        gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree_view));
        gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);

-       priv->selection_id = g_signal_connect (selection, "changed",
-                                              G_CALLBACK (selection_changed_callback),
-                                              sidebar_links);
-       priv->page_changed_id = g_signal_connect (priv->page_cache, "page-changed",
+       
+       if (priv->selection_id <= 0) {
+               priv->selection_id =
+                       g_signal_connect (selection, "changed",
+                                         G_CALLBACK (selection_changed_callback),
+                                         sidebar_links);
+       }
+       priv->page_changed_id = g_signal_connect (priv->page_cache, "page-changed",

                                                  G_CALLBACK (update_page_callback),
                                                  sidebar_links);
                                                  G_CALLBACK (update_page_callback),
                                                  sidebar_links);

-       priv->row_activated_id = g_signal_connect (G_OBJECT (priv->tree_view), "row-activated",
-                                                   G_CALLBACK (row_activated_callback), sidebar_links);
+       if (priv->row_activated_id <= 0) {
+               priv->row_activated_id =
+                       g_signal_connect (priv->tree_view, "row-activated",
+                                         G_CALLBACK (row_activated_callback),
+                                         sidebar_links);
+       }
+       

        update_page_callback (priv->page_cache,
                              ev_page_cache_get_current_page (priv->page_cache),
                              sidebar_links);
        update_page_callback (priv->page_cache,
                              ev_page_cache_get_current_page (priv->page_cache),
                              sidebar_links);

-

 }
 
 static void
 }
 
 static void


@@ -562,10 +682,20 @@ ev_sidebar_links_set_document (EvSidebarPage  *sidebar_page,
 
        priv = sidebar_links->priv;
 
 
        priv = sidebar_links->priv;
 

-       g_object_ref (document);
+       if (priv->document) {
+               gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree_view), NULL);
+               g_object_unref (priv->document);
+       }
+
+       priv->document = g_object_ref (document);
+       priv->page_cache = ev_page_cache_get (document);

 
 

-       priv->document = document;
-       priv->page_cache = ev_document_get_page_cache (document);
+       if (priv->job) {
+               g_signal_handlers_disconnect_by_func (priv->job,
+                                                     job_finished_callback,
+                                                     sidebar_links);
+               g_object_unref (priv->job);
+       }

 
        priv->job = ev_job_links_new (document);
        g_signal_connect (priv->job,
 
        priv->job = ev_job_links_new (document);
        g_signal_connect (priv->job,


@@ -573,8 +703,7 @@ ev_sidebar_links_set_document (EvSidebarPage  *sidebar_page,
                          G_CALLBACK (job_finished_callback),
                          sidebar_links);
        /* The priority doesn't matter for this job */
                          G_CALLBACK (job_finished_callback),
                          sidebar_links);
        /* The priority doesn't matter for this job */

-       ev_job_queue_add_job (priv->job, EV_JOB_PRIORITY_LOW);
-
+       ev_job_scheduler_push_job (priv->job, EV_JOB_PRIORITY_NONE);

 }
 
 static gboolean
 }
 
 static gboolean


@@ -591,12 +720,6 @@ ev_sidebar_links_get_label (EvSidebarPage *sidebar_page)
     return _("Index");
 }
 
     return _("Index");
 }
 

-GtkWidget *
-ev_sidebar_links_get_treeview (EvSidebarLinks *sidebar)
-{
-       return sidebar->priv->tree_view;
-}
-

 static void
 ev_sidebar_links_page_iface_init (EvSidebarPageIface *iface)
 {
 static void
 ev_sidebar_links_page_iface_init (EvSidebarPageIface *iface)
 {