X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-sidebar-links.c;h=91986f8c0948d950ca6fe7331819fc2bc8f52bc6;hb=03f8853749d1303284b6cf47d98044af2e6d2e2b;hp=f623f1e2174ead95a538e7510cc1f827508d585f;hpb=1ae3aefb3948c59e79989a28797678dd985cd36a;p=evince.git diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c index f623f1e2..91986f8c 100644 --- a/shell/ev-sidebar-links.c +++ b/shell/ev-sidebar-links.c @@ -25,13 +25,14 @@ #endif #include + #include #include -#include "ev-sidebar-page.h" -#include "ev-sidebar-links.h" -#include "ev-job-queue.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 { @@ -145,7 +146,7 @@ ev_sidebar_links_dispose (GObject *object) if (sidebar->priv->job) { g_signal_handlers_disconnect_by_func (sidebar->priv->job, job_finished_callback, sidebar); - ev_job_queue_remove_job (sidebar->priv->job); + ev_job_cancel (sidebar->priv->job); g_object_unref (sidebar->priv->job); sidebar->priv->job = NULL; } @@ -438,11 +439,11 @@ ev_sidebar_links_construct (EvSidebarLinks *ev_sidebar_links) 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); - g_signal_connect (GTK_TREE_VIEW (priv->tree_view), + g_signal_connect (priv->tree_view, "popup_menu", G_CALLBACK (popup_menu_cb), ev_sidebar_links); @@ -657,7 +658,7 @@ job_finished_callback (EvJobLinks *job, sidebar_links); if (priv->row_activated_id <= 0) { priv->row_activated_id = - g_signal_connect (G_OBJECT (priv->tree_view), "row-activated", + g_signal_connect (priv->tree_view, "row-activated", G_CALLBACK (row_activated_callback), sidebar_links); } @@ -702,7 +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 */ - ev_job_queue_add_job (priv->job, EV_JOB_PRIORITY_LOW); + ev_job_scheduler_push_job (priv->job, EV_JOB_PRIORITY_NONE); } static gboolean