[dualscreen] fix crash on ctrl+w and fix control window closing

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

diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c
index 3d6885dffbc71ed32275baeacdf6d137387def2c..28a4fddc66d2db03e7e5cbb19b000bde20dabbdc 100644 (file)
--- a/shell/ev-sidebar-links.c
+++ b/shell/ev-sidebar-links.c
@@ -435,7 +435,10 @@ ev_sidebar_links_construct (EvSidebarLinks *ev_sidebar_links)
        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_object_set (G_OBJECT (renderer),
+                      "style", PANGO_STYLE_ITALIC,
+                      "xalign", 1.0,
+                      NULL);
 
        g_signal_connect (priv->tree_view,
                          "button_press_event",
@@ -455,38 +458,6 @@ ev_sidebar_links_init (EvSidebarLinks *ev_sidebar_links)
        ev_sidebar_links_construct (ev_sidebar_links);
 }
 
-static gboolean
-fill_page_labels (GtkTreeModel   *tree_model,
-                  GtkTreePath    *path,
-                  GtkTreeIter    *iter,
-                 EvSidebarLinks *sidebar_links)
-{
-       EvDocumentLinks *document_links;
-       EvLink          *link;
-       gchar           *page_label;
-
-       gtk_tree_model_get (tree_model, iter,
-                           EV_DOCUMENT_LINKS_COLUMN_LINK, &link,
-                           -1);
-
-       if (!link)
-               return FALSE;
-
-       document_links = EV_DOCUMENT_LINKS (sidebar_links->priv->document);
-       page_label = ev_document_links_get_link_page_label (document_links, link);
-       if (!page_label)
-               return FALSE;
-
-       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 */
 
 GtkWidget *
@@ -653,8 +624,6 @@ job_finished_callback (EvJobLinks     *job,
 
        ev_sidebar_links_set_links_model (sidebar_links, job->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);
        
        g_object_unref (job);