diff options
| -rw-r--r-- | libview/ev-jobs.c | 36 | ||||
| -rw-r--r-- | shell/ev-sidebar-links.c | 34 |
2 files changed, 35 insertions, 35 deletions
diff --git a/libview/ev-jobs.c b/libview/ev-jobs.c index 82e32e40..de6a7182 100644 --- a/libview/ev-jobs.c +++ b/libview/ev-jobs.c @@ -347,6 +347,38 @@ ev_job_links_dispose (GObject *object) } static gboolean +fill_page_labels (GtkTreeModel *tree_model, + GtkTreePath *path, + GtkTreeIter *iter, + EvJob *job) +{ + 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 (job->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; +} + +static gboolean ev_job_links_run (EvJob *job) { EvJobLinks *job_links = EV_JOB_LINKS (job); @@ -357,7 +389,9 @@ ev_job_links_run (EvJob *job) ev_document_doc_mutex_lock (); job_links->model = ev_document_links_get_links_model (EV_DOCUMENT_LINKS (job->document)); ev_document_doc_mutex_unlock (); - + + gtk_tree_model_foreach (job_links->model, (GtkTreeModelForeachFunc)fill_page_labels, job); + ev_job_succeeded (job); return FALSE; diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c index c2174e68..0731f7d7 100644 --- a/shell/ev-sidebar-links.c +++ b/shell/ev-sidebar-links.c @@ -455,38 +455,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 +621,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); |