]> www.fi.muni.cz Git - evince.git/blobdiff - shell/ev-jobs.c
Rework the jobs system in order to make it simpler and more extensible. It
[evince.git] / shell / ev-jobs.c
index 196bad682a2e7c4445cbf522d3bf49f864a923f5..7371dd1a0eb69a15f78ecc83cc53531209dc837f 100644 (file)
@@ -1,6 +1,26 @@
+/* this file is part of evince, a gnome document viewer
+ *
+ *  Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
+ *  Copyright (C) 2005 Red Hat, Inc
+ *
+ * Evince is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Evince is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ */
+
 #include <config.h>
+
 #include "ev-jobs.h"
-#include "ev-job-queue.h"
 #include "ev-document-thumbnails.h"
 #include "ev-document-links.h"
 #include "ev-document-images.h"
@@ -34,6 +54,7 @@ static void ev_job_print_init           (EvJobPrint          *job);
 static void ev_job_print_class_init     (EvJobPrintClass     *class);
 
 enum {
+       CANCELLED,
        FINISHED,
        LAST_SIGNAL
 };
@@ -43,10 +64,16 @@ enum {
        RENDER_LAST_SIGNAL
 };
 
+enum {
+       UPDATED,
+       FONTS_LAST_SIGNAL
+};
+
 static guint job_signals[LAST_SIGNAL] = { 0 };
 static guint job_render_signals[RENDER_LAST_SIGNAL] = { 0 };
+static guint job_fonts_signals[FONTS_LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (EvJob, ev_job, G_TYPE_OBJECT)
+G_DEFINE_ABSTRACT_TYPE (EvJob, ev_job, G_TYPE_OBJECT)
 G_DEFINE_TYPE (EvJobLinks, ev_job_links, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobRender, ev_job_render, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobThumbnail, ev_job_thumbnail, EV_TYPE_JOB)
@@ -55,7 +82,12 @@ G_DEFINE_TYPE (EvJobLoad, ev_job_load, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobSave, ev_job_save, EV_TYPE_JOB)
 G_DEFINE_TYPE (EvJobPrint, ev_job_print, EV_TYPE_JOB)
 
-static void ev_job_init (EvJob *job) { /* Do Nothing */ }
+/* EvJob */
+static void
+ev_job_init (EvJob *job)
+{
+       job->cancellable = g_cancellable_new ();
+}
 
 static void
 ev_job_dispose (GObject *object)
@@ -69,6 +101,16 @@ ev_job_dispose (GObject *object)
                job->document = NULL;
        }
 
+       if (job->cancellable) {
+               g_object_unref (job->cancellable);
+               job->cancellable = NULL;
+       }
+
+       if (job->error) {
+               g_error_free (job->error);
+               job->error = NULL;
+       }
+
        (* G_OBJECT_CLASS (ev_job_parent_class)->dispose) (object);
 }
 
@@ -81,18 +123,173 @@ ev_job_class_init (EvJobClass *class)
 
        oclass->dispose = ev_job_dispose;
 
+       job_signals[CANCELLED] =
+               g_signal_new ("cancelled",
+                             EV_TYPE_JOB,
+                             G_SIGNAL_RUN_LAST,
+                             G_STRUCT_OFFSET (EvJobClass, cancelled),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__VOID,
+                             G_TYPE_NONE, 0);
        job_signals [FINISHED] =
                g_signal_new ("finished",
                              EV_TYPE_JOB,
-                             G_SIGNAL_RUN_LAST,
+                             G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (EvJobClass, finished),
                              NULL, NULL,
                              g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 }
 
+static gboolean
+emit_finished (EvJob *job)
+{
+       ev_debug_message (DEBUG_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
 
-static void ev_job_links_init (EvJobLinks *job) { /* Do Nothing */ }
+       job->idle_finished_id = 0;
+       
+       if (job->cancelled) {
+               ev_debug_message (DEBUG_JOBS, "%s (%p) job was cancelled, do not emit finished", EV_GET_TYPE_NAME (job), job);
+       } else {
+               ev_profiler_stop (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+               g_signal_emit (job, job_signals[FINISHED], 0);
+       }
+       
+       return FALSE;
+}
+
+static void
+ev_job_emit_finished (EvJob *job)
+{
+       ev_debug_message (DEBUG_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+
+       if (g_cancellable_is_cancelled (job->cancellable)) {
+               ev_debug_message (DEBUG_JOBS, "%s (%p) job was cancelled, returning", EV_GET_TYPE_NAME (job), job);
+               return;
+       }
+       
+       job->finished = TRUE;
+       
+       if (job->run_mode == EV_JOB_RUN_THREAD) {
+               job->idle_finished_id =
+                       g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+                                        (GSourceFunc)emit_finished,
+                                        g_object_ref (job),
+                                        (GDestroyNotify)g_object_unref);
+       } else {
+               ev_profiler_stop (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+               g_signal_emit (job, job_signals[FINISHED], 0);
+       }
+}
+
+gboolean
+ev_job_run (EvJob *job)
+{
+       EvJobClass *class = EV_JOB_GET_CLASS (job);
+       
+       return class->run (job);
+}
+
+void
+ev_job_cancel (EvJob *job)
+{
+       if (job->cancelled || (job->finished && job->idle_finished_id == 0))
+               return;
+
+       ev_debug_message (DEBUG_JOBS, "job %s (%p) cancelled", EV_GET_TYPE_NAME (job), job);
+       ev_profiler_stop (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+       
+       /* This should never be called from a thread */
+       job->cancelled = TRUE;
+       g_cancellable_cancel (job->cancellable);
+       g_signal_emit (job, job_signals[CANCELLED], 0);
+}
+
+void
+ev_job_failed (EvJob       *job,
+              GQuark       domain,
+              gint         code,
+              const gchar *format,
+              ...)
+{
+       va_list args;
+       gchar  *message;
+       
+       if (job->failed || job->finished)
+               return;
+
+       ev_debug_message (DEBUG_JOBS, "job %s (%p) failed", EV_GET_TYPE_NAME (job), job);
+       
+       job->failed = TRUE;
+       
+       va_start (args, format);
+       message = g_strdup_vprintf (format, args);
+       va_end (args);
+       
+       job->error = g_error_new (domain, code, message);
+       g_free (message);
+       
+       ev_job_emit_finished (job);                                                                                                               
+}
+
+void
+ev_job_failed_from_error (EvJob  *job,
+                         GError *error)
+{
+       if (job->failed || job->finished)
+               return;
+       
+       ev_debug_message (DEBUG_JOBS, "job %s (%p) failed", EV_GET_TYPE_NAME (job), job);
+
+       job->failed = TRUE;
+       job->error = g_error_copy (error);
+
+       ev_job_emit_finished (job);
+}
+
+void
+ev_job_succeeded (EvJob *job)
+{
+       if (job->finished)
+               return;
+
+       ev_debug_message (DEBUG_JOBS, "job %s (%p) succeeded", EV_GET_TYPE_NAME (job), job);
+       
+       job->failed = FALSE;
+       ev_job_emit_finished (job);
+}
+
+gboolean
+ev_job_is_finished (EvJob *job)
+{
+       return job->finished;
+}
+
+gboolean
+ev_job_is_failed (EvJob *job)
+{
+       return job->failed;
+}
+
+EvJobRunMode
+ev_job_get_run_mode (EvJob *job)
+{
+       return job->run_mode;
+}
+
+void
+ev_job_set_run_mode (EvJob       *job,
+                    EvJobRunMode run_mode)
+{
+       job->run_mode = run_mode;
+}
+
+/* EvJobLinks */
+static void
+ev_job_links_init (EvJobLinks *job)
+{
+       EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
+}
 
 static void
 ev_job_links_dispose (GObject *object)
@@ -111,18 +308,52 @@ ev_job_links_dispose (GObject *object)
        (* G_OBJECT_CLASS (ev_job_links_parent_class)->dispose) (object);
 }
 
+static gboolean
+ev_job_links_run (EvJob *job)
+{
+       EvJobLinks *job_links = EV_JOB_LINKS (job);
+
+       ev_debug_message (DEBUG_JOBS, NULL);
+       ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), 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 ();
+       
+       ev_job_succeeded (job);
+       
+       return FALSE;
+}
+
 static void
 ev_job_links_class_init (EvJobLinksClass *class)
 {
-       GObjectClass *oclass;
-
-       oclass = G_OBJECT_CLASS (class);
+       GObjectClass *oclass = G_OBJECT_CLASS (class);
+       EvJobClass   *job_class = EV_JOB_CLASS (class);
 
        oclass->dispose = ev_job_links_dispose;
+       job_class->run = ev_job_links_run;
 }
 
+EvJob *
+ev_job_links_new (EvDocument *document)
+{
+       EvJob *job;
 
-static void ev_job_render_init (EvJobRender *job) { /* Do Nothing */ }
+       ev_debug_message (DEBUG_JOBS, NULL);
+
+       job = g_object_new (EV_TYPE_JOB_LINKS, NULL);
+       job->document = g_object_ref (document);
+       
+       return job;
+}
+
+/* EvJobRender */
+static void
+ev_job_render_init (EvJobRender *job)
+{
+       EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
+}
 
 static void
 ev_job_render_dispose (GObject *object)
@@ -132,7 +363,7 @@ ev_job_render_dispose (GObject *object)
        job = EV_JOB_RENDER (object);
 
        if (job->ev_page) {
-               ev_debug_message (DEBUG_JOBS, "page: %d", job->ev_page->index);
+               ev_debug_message (DEBUG_JOBS, "page: %d (%p)", job->ev_page->index, job);
                g_object_unref (job->ev_page);
                job->ev_page = NULL;
        }
@@ -155,132 +386,121 @@ ev_job_render_dispose (GObject *object)
        (* G_OBJECT_CLASS (ev_job_render_parent_class)->dispose) (object);
 }
 
-static void
-ev_job_render_class_init (EvJobRenderClass *class)
+static gboolean
+notify_page_ready (EvJobRender *job)
 {
-       GObjectClass *oclass;
-
-       oclass = G_OBJECT_CLASS (class);
+       ev_debug_message (DEBUG_JOBS, "%d (%p)", job->ev_page->index, job);
+       ev_profiler_stop (EV_PROFILE_JOBS, "Rendering page %d", job->ev_page->index);
 
-       job_render_signals [PAGE_READY] =
-               g_signal_new ("page-ready",
-                             EV_TYPE_JOB_RENDER,
-                             G_SIGNAL_RUN_LAST,
-                             G_STRUCT_OFFSET (EvJobRenderClass, page_ready),
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__VOID,
-                             G_TYPE_NONE, 0);
+       if (EV_JOB (job)->cancelled) {
+               ev_debug_message (DEBUG_JOBS, "%s (%p) job was cancelled, do not emit page_ready", EV_GET_TYPE_NAME (job), job);
+       } else {
+               g_signal_emit (job, job_render_signals[PAGE_READY], 0);
+       }
 
-       oclass->dispose = ev_job_render_dispose;
+       return FALSE;
 }
 
-static void ev_job_thumbnail_init (EvJobThumbnail *job) { /* Do Nothing */ }
-
 static void
-ev_job_thumbnail_dispose (GObject *object)
+ev_job_render_page_ready (EvJobRender *job)
 {
-       EvJobThumbnail *job;
-
-       job = EV_JOB_THUMBNAIL (object);
-
-       ev_debug_message (DEBUG_JOBS, "%d", job->page);
+       ev_debug_message (DEBUG_JOBS, "%d (%p)", job->ev_page->index, job);
        
-       if (job->thumbnail) {
-               g_object_unref (job->thumbnail);
-               job->thumbnail = NULL;
-       }
-
-       (* G_OBJECT_CLASS (ev_job_thumbnail_parent_class)->dispose) (object);
+       job->page_ready = TRUE;
+       g_idle_add_full (G_PRIORITY_HIGH_IDLE,
+                        (GSourceFunc)notify_page_ready,
+                        g_object_ref (job),
+                        (GDestroyNotify)g_object_unref);
 }
 
-static void
-ev_job_thumbnail_class_init (EvJobThumbnailClass *class)
+static gboolean
+ev_job_render_run (EvJob *job)
 {
-       GObjectClass *oclass;
-
-       oclass = G_OBJECT_CLASS (class);
-
-       oclass->dispose = ev_job_thumbnail_dispose;
-}
-
-static void ev_job_print_init (EvJobPrint *job) { /* Do Nothing */ }
+       EvJobRender     *job_render = EV_JOB_RENDER (job);
+       EvRenderContext *rc;
 
-static void
-ev_job_print_dispose (GObject *object)
-{
-       EvJobPrint *job;
+       ev_debug_message (DEBUG_JOBS, "page: %d (%p)", job_render->page, job);
+       ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+       
+       ev_document_doc_mutex_lock ();
 
-       job = EV_JOB_PRINT (object);
+       ev_profiler_start (EV_PROFILE_JOBS, "Rendering page %d", job_render->page);
+               
+       ev_document_fc_mutex_lock ();
 
-       ev_debug_message (DEBUG_JOBS, NULL);
-       
-       if (job->temp_file) {
-               g_unlink (job->temp_file);
-               g_free (job->temp_file);
-               job->temp_file = NULL;
-       }
+       job_render->ev_page = ev_document_get_page (job->document, job_render->page);
+       rc = ev_render_context_new (job_render->ev_page, job_render->rotation, job_render->scale);
+               
+       job_render->surface = ev_document_render (job->document, rc);
+       /* If job was cancelled during the page rendering,
+        * we return now, so that the thread is finished ASAP
+        */
+       if (g_cancellable_is_cancelled (job->cancellable)) {
+               ev_document_fc_mutex_unlock ();
+               ev_document_doc_mutex_unlock ();
+               g_object_unref (rc);
 
-       if (job->error) {
-               g_error_free (job->error);
-               job->error = NULL;
+               return FALSE;
        }
-
-       if (job->ranges) {
-               g_free (job->ranges);
-               job->ranges = NULL;
-               job->n_ranges = 0;
+       
+       if ((job_render->flags & EV_RENDER_INCLUDE_SELECTION) && EV_IS_SELECTION (job->document)) {
+               ev_selection_render_selection (EV_SELECTION (job->document),
+                                              rc,
+                                              &(job_render->selection),
+                                              &(job_render->selection_points),
+                                              NULL,
+                                              job_render->selection_style,
+                                              &(job_render->text), &(job_render->base));
+               job_render->selection_region =
+                       ev_selection_get_selection_region (EV_SELECTION (job->document),
+                                                          rc,
+                                                          job_render->selection_style,
+                                                          &(job_render->selection_points));
        }
 
-       (* G_OBJECT_CLASS (ev_job_print_parent_class)->dispose) (object);
-}
-
-static void
-ev_job_print_class_init (EvJobPrintClass *class)
-{
-       GObjectClass *oclass;
-
-       oclass = G_OBJECT_CLASS (class);
-
-       oclass->dispose = ev_job_print_dispose;
-}
-
-/* Public functions */
-void
-ev_job_finished (EvJob *job)
-{
-       ev_debug_message (DEBUG_JOBS, EV_GET_TYPE_NAME (job));
-       ev_profiler_stop (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+       ev_job_render_page_ready (job_render);
+               
+       ev_document_fc_mutex_unlock ();
+               
+       if ((job_render->flags & EV_RENDER_INCLUDE_TEXT) && EV_IS_SELECTION (job->document))
+               job_render->text_mapping =
+                       ev_selection_get_selection_map (EV_SELECTION (job->document), rc);
+       if ((job_render->flags & EV_RENDER_INCLUDE_LINKS) && EV_IS_DOCUMENT_LINKS (job->document))
+               job_render->link_mapping =
+                       ev_document_links_get_links (EV_DOCUMENT_LINKS (job->document), job_render->page);
+       if ((job_render->flags & EV_RENDER_INCLUDE_FORMS) && EV_IS_DOCUMENT_FORMS (job->document))
+               job_render->form_field_mapping =
+                       ev_document_forms_get_form_fields (EV_DOCUMENT_FORMS (job->document),
+                                                          job_render->ev_page);
+       if ((job_render->flags & EV_RENDER_INCLUDE_IMAGES) && EV_IS_DOCUMENT_IMAGES (job->document))
+               job_render->image_mapping =
+                       ev_document_images_get_image_mapping (EV_DOCUMENT_IMAGES (job->document),
+                                                             job_render->page);
+       g_object_unref (rc);
+       ev_document_doc_mutex_unlock ();
        
-       g_return_if_fail (EV_IS_JOB (job));
+       ev_job_succeeded (job);
        
-       g_signal_emit (job, job_signals[FINISHED], 0);
+       return FALSE;
 }
 
-EvJob *
-ev_job_links_new (EvDocument *document)
+static void
+ev_job_render_class_init (EvJobRenderClass *class)
 {
-       EvJob *job;
-
-       ev_debug_message (DEBUG_JOBS, NULL);
-       
-       job = g_object_new (EV_TYPE_JOB_LINKS, NULL);
-       job->document = g_object_ref (document);
-
-       return job;
-}
+       GObjectClass *oclass = G_OBJECT_CLASS (class);
+       EvJobClass   *job_class = EV_JOB_CLASS (class);
 
-void
-ev_job_links_run (EvJobLinks *job)
-{
-       ev_debug_message (DEBUG_JOBS, NULL);
-       ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
-       
-       g_return_if_fail (EV_IS_JOB_LINKS (job));
+       job_render_signals [PAGE_READY] =
+               g_signal_new ("page-ready",
+                             EV_TYPE_JOB_RENDER,
+                             G_SIGNAL_RUN_LAST,
+                             G_STRUCT_OFFSET (EvJobRenderClass, page_ready),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__VOID,
+                             G_TYPE_NONE, 0);
 
-       ev_document_doc_mutex_lock ();
-       job->model = ev_document_links_get_links_model (EV_DOCUMENT_LINKS (EV_JOB (job)->document));
-       EV_JOB (job)->finished = TRUE;
-       ev_document_doc_mutex_unlock ();
+       oclass->dispose = ev_job_render_dispose;
+       job_class->run = ev_job_render_run;
 }
 
 EvJob *
@@ -306,10 +526,6 @@ ev_job_render_new (EvDocument   *document,
        job->target_height = height;
        job->flags = flags;
 
-       if (EV_IS_ASYNC_RENDERER (document)) {  
-               EV_JOB (job)->async = TRUE;
-       }
-
        return EV_JOB (job);
 }
 
@@ -328,111 +544,64 @@ ev_job_render_set_selection_info (EvJobRender     *job,
        job->base = *base;
 }
 
+/* EvJobThumbnail */
 static void
-render_finished_cb (EvDocument      *document,
-                   GdkPixbuf       *pixbuf,
-                   EvJobRender     *job)
+ev_job_thumbnail_init (EvJobThumbnail *job)
 {
-       g_signal_handlers_disconnect_by_func (EV_JOB (job)->document,
-                                             render_finished_cb, job);
-
-       job->surface = ev_document_misc_surface_from_pixbuf (pixbuf);
-       job->page_ready = TRUE;
-       g_signal_emit (job, job_render_signals[PAGE_READY], 0);
-       EV_JOB (job)->finished = TRUE;
-       ev_job_finished (EV_JOB (job));
+       EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
 }
 
-static gboolean
-notify_page_ready (EvJobRender *job)
+static void
+ev_job_thumbnail_dispose (GObject *object)
 {
-       ev_debug_message (DEBUG_JOBS, "%d", job->ev_page->index);
-       ev_profiler_stop (EV_PROFILE_JOBS, "Rendering page %d", job->ev_page->index);
-       
-       g_signal_emit (job, job_render_signals[PAGE_READY], 0);
+       EvJobThumbnail *job;
 
-       return FALSE;
-}
+       job = EV_JOB_THUMBNAIL (object);
 
-static void
-ev_job_render_page_ready (EvJobRender *job)
-{
-       ev_debug_message (DEBUG_JOBS, "%d", job->ev_page->index);
+       ev_debug_message (DEBUG_JOBS, "%d (%p)", job->page, job);
        
-       job->page_ready = TRUE;
-       g_idle_add_full (G_PRIORITY_HIGH_IDLE,
-                        (GSourceFunc)notify_page_ready,
-                        g_object_ref (job),
-                        (GDestroyNotify)g_object_unref);
+       if (job->thumbnail) {
+               g_object_unref (job->thumbnail);
+               job->thumbnail = NULL;
+       }
+
+       (* G_OBJECT_CLASS (ev_job_thumbnail_parent_class)->dispose) (object);
 }
 
-void
-ev_job_render_run (EvJobRender *job)
+static gboolean
+ev_job_thumbnail_run (EvJob *job)
 {
-       g_return_if_fail (EV_IS_JOB_RENDER (job));
+       EvJobThumbnail  *job_thumb = EV_JOB_THUMBNAIL (job);
+       EvRenderContext *rc;
+       EvPage          *page;
 
-       ev_debug_message (DEBUG_JOBS, "page: %d", job->page);
+       ev_debug_message (DEBUG_JOBS, "%d (%p)", job_thumb->page, job);
        ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
        
        ev_document_doc_mutex_lock ();
 
-       if (EV_JOB (job)->async) {
-               EvAsyncRenderer *renderer = EV_ASYNC_RENDERER (EV_JOB (job)->document);
-               ev_async_renderer_render_pixbuf (renderer, job->page, job->scale,
-                                                job->rotation);
-               g_signal_connect (EV_JOB (job)->document, "render_finished",
-                                 G_CALLBACK (render_finished_cb), job);
-       } else {
-               EvRenderContext *rc;
-
-               ev_profiler_start (EV_PROFILE_JOBS, "Rendering page %d", job->page);
-               
-               ev_document_fc_mutex_lock ();
+       page = ev_document_get_page (job->document, job_thumb->page);
+       rc = ev_render_context_new (page, job_thumb->rotation, job_thumb->scale);
+       g_object_unref (page);
 
-               job->ev_page = ev_document_get_page (EV_JOB (job)->document, job->page);
+       job_thumb->thumbnail = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (job->document),
+                                                                    rc, TRUE);
+       g_object_unref (rc);
+       ev_document_doc_mutex_unlock ();
 
-               rc = ev_render_context_new (job->ev_page, job->rotation, job->scale);
-               
-               job->surface = ev_document_render (EV_JOB (job)->document, rc);
-               if ((job->flags & EV_RENDER_INCLUDE_SELECTION) && EV_IS_SELECTION (EV_JOB (job)->document)) {
-                       ev_selection_render_selection (EV_SELECTION (EV_JOB (job)->document),
-                                                      rc,
-                                                      &(job->selection),
-                                                      &(job->selection_points),
-                                                      NULL,
-                                                      job->selection_style,
-                                                      &(job->text), &(job->base));
-                       job->selection_region =
-                               ev_selection_get_selection_region (EV_SELECTION (EV_JOB (job)->document),
-                                                                  rc,
-                                                                  job->selection_style,
-                                                                  &(job->selection_points));
-               }
+       ev_job_succeeded (job);
+       
+       return FALSE;
+}
 
-               ev_job_render_page_ready (job);
-               
-               ev_document_fc_mutex_unlock ();
-               
-               if ((job->flags & EV_RENDER_INCLUDE_TEXT) && EV_IS_SELECTION (EV_JOB (job)->document))
-                       job->text_mapping =
-                               ev_selection_get_selection_map (EV_SELECTION (EV_JOB (job)->document), rc);
-               if ((job->flags & EV_RENDER_INCLUDE_LINKS) && EV_IS_DOCUMENT_LINKS (EV_JOB (job)->document))
-                       job->link_mapping =
-                               ev_document_links_get_links (EV_DOCUMENT_LINKS (EV_JOB (job)->document), job->page);
-               if ((job->flags & EV_RENDER_INCLUDE_FORMS) && EV_IS_DOCUMENT_FORMS (EV_JOB (job)->document))
-                       job->form_field_mapping =
-                               ev_document_forms_get_form_fields (EV_DOCUMENT_FORMS (EV_JOB (job)->document),
-                                                                  job->ev_page);
-               if ((job->flags & EV_RENDER_INCLUDE_IMAGES) && EV_IS_DOCUMENT_IMAGES (EV_JOB (job)->document))
-                       job->image_mapping =
-                               ev_document_images_get_image_mapping (EV_DOCUMENT_IMAGES (EV_JOB (job)->document),
-                                                                     job->page);
-               g_object_unref (rc);
-               
-               EV_JOB (job)->finished = TRUE;
-       }
+static void
+ev_job_thumbnail_class_init (EvJobThumbnailClass *class)
+{
+       GObjectClass *oclass = G_OBJECT_CLASS (class);
+       EvJobClass   *job_class = EV_JOB_CLASS (class);
 
-       ev_document_doc_mutex_unlock ();
+       oclass->dispose = ev_job_thumbnail_dispose;
+       job_class->run = ev_job_thumbnail_run;
 }
 
 EvJob *
@@ -455,35 +624,64 @@ ev_job_thumbnail_new (EvDocument *document,
        return EV_JOB (job);
 }
 
-void
-ev_job_thumbnail_run (EvJobThumbnail *job)
+/* EvJobFonts */
+static void
+ev_job_fonts_init (EvJobFonts *job)
 {
-       EvRenderContext *rc;
-       EvPage          *page;
+       EV_JOB (job)->run_mode = EV_JOB_RUN_MAIN_LOOP;
+}
 
-       ev_debug_message (DEBUG_JOBS, "%d", job->page);
-       ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+static gboolean
+ev_job_fonts_run (EvJob *job)
+{
+       EvJobFonts      *job_fonts = EV_JOB_FONTS (job);
+       EvDocumentFonts *fonts = EV_DOCUMENT_FONTS (job->document);
+
+       ev_debug_message (DEBUG_JOBS, NULL);
+       
+       /* Do not block the main loop */
+       if (!ev_document_doc_mutex_trylock ())
+               return TRUE;
        
-       g_return_if_fail (EV_IS_JOB_THUMBNAIL (job));
+       if (!ev_document_fc_mutex_trylock ())
+               return TRUE;
 
-       ev_document_doc_mutex_lock ();
+#ifdef EV_ENABLE_DEBUG
+       /* We use the #ifdef in this case because of the if */
+       if (ev_document_fonts_get_progress (fonts) == 0)
+               ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+#endif
 
-       page = ev_document_get_page (EV_JOB (job)->document, job->page);
-       rc = ev_render_context_new (page, job->rotation, job->scale);
-       g_object_unref (page);
+       job_fonts->scan_completed = !ev_document_fonts_scan (fonts, 20);
+       g_signal_emit (job_fonts, job_fonts_signals[UPDATED], 0,
+                      ev_document_fonts_get_progress (fonts));
 
-       job->thumbnail =
-               ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (EV_JOB (job)->document),
-                                                     rc, TRUE);
-       g_object_unref (rc);
+       ev_document_fc_mutex_unlock ();
        ev_document_doc_mutex_unlock ();
+
+       if (job_fonts->scan_completed)
+               ev_job_succeeded (job);
        
-       EV_JOB (job)->finished = TRUE;
+       return !job_fonts->scan_completed;
 }
 
-static void ev_job_fonts_init (EvJobFonts *job) { /* Do Nothing */ }
-
-static void ev_job_fonts_class_init (EvJobFontsClass *class) { /* Do Nothing */ }
+static void
+ev_job_fonts_class_init (EvJobFontsClass *class)
+{
+       EvJobClass *job_class = EV_JOB_CLASS (class);
+       
+       job_class->run = ev_job_fonts_run;
+       
+       job_fonts_signals[UPDATED] =
+               g_signal_new ("updated",
+                             EV_TYPE_JOB_FONTS,
+                             G_SIGNAL_RUN_LAST,
+                             G_STRUCT_OFFSET (EvJobFontsClass, updated),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__DOUBLE,
+                             G_TYPE_NONE,
+                             1, G_TYPE_DOUBLE);
+}
 
 EvJob *
 ev_job_fonts_new (EvDocument *document)
@@ -499,30 +697,13 @@ ev_job_fonts_new (EvDocument *document)
        return EV_JOB (job);
 }
 
-void
-ev_job_fonts_run (EvJobFonts *job)
+/* EvJobLoad */
+static void
+ev_job_load_init (EvJobLoad *job)
 {
-       EvDocumentFonts *fonts;
-
-       ev_debug_message (DEBUG_JOBS, NULL);
-       ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
-       
-       g_return_if_fail (EV_IS_JOB_FONTS (job));
-
-       ev_document_doc_mutex_lock ();
-       
-       fonts = EV_DOCUMENT_FONTS (EV_JOB (job)->document);
-       ev_document_fc_mutex_lock ();
-       job->scan_completed = !ev_document_fonts_scan (fonts, 20);
-       ev_document_fc_mutex_unlock ();
-       
-       EV_JOB (job)->finished = TRUE;
-
-       ev_document_doc_mutex_unlock ();
+       EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
 }
 
-static void ev_job_load_init (EvJobLoad *job) { /* Do Nothing */ }
-
 static void
 ev_job_load_dispose (GObject *object)
 {
@@ -535,11 +716,6 @@ ev_job_load_dispose (GObject *object)
                job->uri = NULL;
        }
 
-       if (job->error) {
-               g_error_free (job->error);
-               job->error = NULL;
-       }
-
        if (job->dest) {
                g_object_unref (job->dest);
                job->dest = NULL;
@@ -553,17 +729,52 @@ ev_job_load_dispose (GObject *object)
        (* G_OBJECT_CLASS (ev_job_load_parent_class)->dispose) (object);
 }
 
+static gboolean
+ev_job_load_run (EvJob *job)
+{
+       EvJobLoad *job_load = EV_JOB_LOAD (job);
+       GError    *error = NULL;
+       
+       ev_debug_message (DEBUG_JOBS, "%s", job_load->uri);
+       ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
+       
+       ev_document_fc_mutex_lock ();
+
+       /* TODO: reuse the job!!! */
+       /* This job may already have a document even if the job didn't complete
+          because, e.g., a password is required - if so, just reload rather than
+          creating a new instance */
+       if (job->document) {
+               ev_document_load (job->document,
+                                 job_load->uri,
+                                 &error);
+       } else {
+               job->document = ev_document_factory_get_document (job_load->uri,
+                                                                 &error);
+       }
+
+       ev_document_fc_mutex_unlock ();
+
+       if (error) {
+               ev_job_failed_from_error (job, error);
+               g_error_free (error);
+       } else {
+               ev_job_succeeded (job);
+       }
+
+       return FALSE;
+}
+
 static void
 ev_job_load_class_init (EvJobLoadClass *class)
 {
-       GObjectClass *oclass;
-
-       oclass = G_OBJECT_CLASS (class);
+       GObjectClass *oclass = G_OBJECT_CLASS (class);
+       EvJobClass   *job_class = EV_JOB_CLASS (class);
 
        oclass->dispose = ev_job_load_dispose;
+       job_class->run = ev_job_load_run;
 }
 
-
 EvJob *
 ev_job_load_new (const gchar    *uri,
                 EvLinkDest     *dest,
@@ -577,12 +788,9 @@ ev_job_load_new (const gchar    *uri,
        job = g_object_new (EV_TYPE_JOB_LOAD, NULL);
 
        job->uri = g_strdup (uri);
-       if (dest)
-               job->dest = g_object_ref (dest);
-
+       job->dest = dest ? g_object_ref (dest) : NULL;
        job->mode = mode;
-       if (search_string)
-               job->search_string = g_strdup (search_string);
+       job->search_string = search_string ? g_strdup (search_string) : NULL;
 
        return EV_JOB (job);
 }
@@ -597,40 +805,13 @@ ev_job_load_set_uri (EvJobLoad *job, const gchar *uri)
        job->uri = g_strdup (uri);
 }
 
-void
-ev_job_load_run (EvJobLoad *job)
+/* EvJobSave */
+static void
+ev_job_save_init (EvJobSave *job)
 {
-       g_return_if_fail (EV_IS_JOB_LOAD (job));
-
-       ev_debug_message (DEBUG_JOBS, "%s", job->uri);
-       ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
-       
-       if (job->error) {
-               g_error_free (job->error);
-               job->error = NULL;
-       }
-
-       ev_document_fc_mutex_lock ();
-       
-       /* This job may already have a document even if the job didn't complete
-          because, e.g., a password is required - if so, just reload rather than
-          creating a new instance */
-       if (EV_JOB (job)->document) {
-               ev_document_load (EV_JOB (job)->document,
-                                 job->uri,
-                                 &job->error);
-       } else {
-               EV_JOB(job)->document =
-                       ev_document_factory_get_document (job->uri,
-                                                         &job->error);
-       }
-
-       ev_document_fc_mutex_unlock ();
-       EV_JOB (job)->finished = TRUE;
+       EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
 }
 
-static void ev_job_save_init (EvJobSave *job) { /* Do Nothing */ }
-
 static void
 ev_job_save_dispose (GObject *object)
 {
@@ -648,52 +829,20 @@ ev_job_save_dispose (GObject *object)
                job->document_uri = NULL;
        }
 
-       if (job->error) {
-               g_error_free (job->error);
-               job->error = NULL;
-       }
-
        (* G_OBJECT_CLASS (ev_job_save_parent_class)->dispose) (object);
 }
 
-static void
-ev_job_save_class_init (EvJobSaveClass *class)
-{
-       GObjectClass *oclass;
-
-       oclass = G_OBJECT_CLASS (class);
-
-       oclass->dispose = ev_job_save_dispose;
-}
-
-EvJob *
-ev_job_save_new (EvDocument  *document,
-                const gchar *uri,
-                const gchar *document_uri)
-{
-       EvJobSave *job;
-
-       ev_debug_message (DEBUG_JOBS, "uri: %s, document_uri: %s", uri, document_uri);
-
-       job = g_object_new (EV_TYPE_JOB_SAVE, NULL);
-
-       EV_JOB (job)->document = g_object_ref (document);
-       job->uri = g_strdup (uri);
-       job->document_uri = g_strdup (document_uri);
-       job->error = NULL;
-
-       return EV_JOB (job);
-}
-
-void
-ev_job_save_run (EvJobSave *job)
+static gboolean
+ev_job_save_run (EvJob *job)
 {
-       gint   fd;
-       gchar *filename;
-       gchar *tmp_filename;
-       gchar *local_uri;
-
-       ev_debug_message (DEBUG_JOBS, "uri: %s, document_uri: %s", job->uri, job->document_uri);
+       EvJobSave *job_save = EV_JOB_SAVE (job);
+       gint       fd;
+       gchar     *filename;
+       gchar     *tmp_filename;
+       gchar     *local_uri;
+       GError    *error = NULL;
+       
+       ev_debug_message (DEBUG_JOBS, "uri: %s, document_uri: %s", job_save->uri, job_save->document_uri);
        ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
        
        filename = ev_tmp_filename ("saveacopy");
@@ -706,53 +855,55 @@ ev_job_save_run (EvJobSave *job)
                gint   save_errno = errno;
 
                display_name = g_filename_display_name (tmp_filename);
-               g_set_error (&(job->error),
-                            G_FILE_ERROR,
-                            g_file_error_from_errno (save_errno),
-                            _("Failed to create file ā€œ%sā€: %s"),
-                            display_name, g_strerror (save_errno));
+               ev_job_failed (job,
+                              G_FILE_ERROR,
+                              g_file_error_from_errno (save_errno),
+                              _("Failed to create file ā€œ%sā€: %s"),
+                              display_name, g_strerror (save_errno));
                g_free (display_name);
                g_free (tmp_filename);
 
-               return;
+               return FALSE;
        }
 
        ev_document_doc_mutex_lock ();
 
        /* Save document to temp filename */
        local_uri = g_filename_to_uri (tmp_filename, NULL, NULL);
-       ev_document_save (EV_JOB (job)->document, local_uri, &(job->error));
+       ev_document_save (job->document, local_uri, &error);
        close (fd);
 
        ev_document_doc_mutex_unlock ();
 
-       if (job->error) {
+       if (error) {
                g_free (local_uri);
-               return;
+               ev_job_failed_from_error (job, error);
+               g_error_free (error);
+               
+               return FALSE;
        }
 
        /* If original document was compressed,
         * compress it again before saving
         */
-       if (g_object_get_data (G_OBJECT (EV_JOB (job)->document),
-                              "uri-uncompressed")) {
+       if (g_object_get_data (G_OBJECT (job->document), "uri-uncompressed")) {
                EvCompressionType ctype = EV_COMPRESSION_NONE;
                const gchar      *ext;
                gchar            *uri_comp;
                
-               ext = g_strrstr (job->document_uri, ".gz");
+               ext = g_strrstr (job_save->document_uri, ".gz");
                if (ext && g_ascii_strcasecmp (ext, ".gz") == 0)
                        ctype = EV_COMPRESSION_GZIP;
                
-               ext = g_strrstr (job->document_uri, ".bz2");
+               ext = g_strrstr (job_save->document_uri, ".bz2");
                if (ext && g_ascii_strcasecmp (ext, ".bz2") == 0)
                        ctype = EV_COMPRESSION_BZIP2;
 
-               uri_comp = ev_file_compress (local_uri, ctype, &(job->error));
+               uri_comp = ev_file_compress (local_uri, ctype, &error);
                g_free (local_uri);
                ev_tmp_filename_unlink (tmp_filename);
 
-               if (!uri_comp || job->error) {
+               if (!uri_comp || error) {
                        local_uri = NULL;
                } else {
                        local_uri = uri_comp;
@@ -761,63 +912,87 @@ ev_job_save_run (EvJobSave *job)
 
        g_free (tmp_filename);
        
-       if (job->error) {
+       if (error) {
                g_free (local_uri);
-               return;
+               ev_job_failed_from_error (job, error);
+               g_error_free (error);
+               
+               return FALSE;
        }
 
        if (!local_uri)
-               return;
+               return FALSE;
 
-       ev_xfer_uri_simple (local_uri, job->uri, &(job->error));
+       ev_xfer_uri_simple (local_uri, job_save->uri, &error);
        ev_tmp_uri_unlink (local_uri);
+
+       if (error) {
+               ev_job_failed_from_error (job, error);
+               g_error_free (error);
+       } else {
+               ev_job_succeeded (job);
+       }
+       
+       return FALSE;
+}
+
+static void
+ev_job_save_class_init (EvJobSaveClass *class)
+{
+       GObjectClass *oclass = G_OBJECT_CLASS (class);
+       EvJobClass   *job_class = EV_JOB_CLASS (class);
+
+       oclass->dispose = ev_job_save_dispose;
+       job_class->run = ev_job_save_run;
 }
 
 EvJob *
-ev_job_print_new (EvDocument    *document,
-                 const gchar   *format,
-                 gdouble        width,
-                 gdouble        height,
-                 EvPrintRange  *ranges,
-                 gint           n_ranges,
-                 EvPrintPageSet page_set,
-                 gint           pages_per_sheet,
-                 gint           copies,
-                 gdouble        collate,
-                 gdouble        reverse)
+ev_job_save_new (EvDocument  *document,
+                const gchar *uri,
+                const gchar *document_uri)
 {
-       EvJobPrint *job;
+       EvJobSave *job;
 
-       ev_debug_message (DEBUG_JOBS, "format: %s, width: %f, height:%f,"
-                         "n_ranges: %d, pages_per_sheet: %d, copies: %d,"
-                         "collate: %s, reverse: %s",
-                         format, width, height, n_ranges, pages_per_sheet, copies,
-                         collate ? "True" : "False", reverse  ? "True" : "False");
+       ev_debug_message (DEBUG_JOBS, "uri: %s, document_uri: %s", uri, document_uri);
 
-       job = g_object_new (EV_TYPE_JOB_PRINT, NULL);
+       job = g_object_new (EV_TYPE_JOB_SAVE, NULL);
 
        EV_JOB (job)->document = g_object_ref (document);
+       job->uri = g_strdup (uri);
+       job->document_uri = g_strdup (document_uri);
 
-       job->format = format;
-       
-       job->temp_file = NULL;
-       job->error = NULL;
+       return EV_JOB (job);
+}
 
-       job->width = width;
-       job->height = height;
+/* EvJobPrint */
+static void
+ev_job_print_init (EvJobPrint *job)
+{
+       EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
+}
 
-       job->ranges = ranges;
-       job->n_ranges = n_ranges;
+static void
+ev_job_print_dispose (GObject *object)
+{
+       EvJobPrint *job;
 
-       job->page_set = page_set;
+       job = EV_JOB_PRINT (object);
 
-       job->pages_per_sheet = CLAMP (pages_per_sheet, 1, 16);
-       
-       job->copies = copies;
-       job->collate = collate;
-       job->reverse = reverse;
+       ev_debug_message (DEBUG_JOBS, NULL);
        
-       return EV_JOB (job);
+       if (job->temp_file) {
+               g_unlink (job->temp_file);
+               g_free (job->temp_file);
+               job->temp_file = NULL;
+       }
+
+       if (job->ranges) {
+               g_free (job->ranges);
+               job->ranges = NULL;
+               job->n_ranges = 0;
+       }
+
+       (* G_OBJECT_CLASS (ev_job_print_parent_class)->dispose) (object);
 }
 
 static gint
@@ -933,10 +1108,11 @@ ev_job_print_get_page_list (EvJobPrint *job,
        return page_list;
 }
 
-void
-ev_job_print_run (EvJobPrint *job)
+static gboolean
+ev_job_print_run (EvJob *job)
 {
        EvDocument            *document = EV_JOB (job)->document;
+       EvJobPrint            *job_print = EV_JOB_PRINT (job);
        EvFileExporterContext  fc;
        EvRenderContext       *rc;
        gint                   fd;
@@ -946,68 +1122,67 @@ ev_job_print_run (EvJobPrint *job)
        gint                   first_page;
        gint                   i, j;
        gchar                 *filename;
+       GError                *error = NULL;
        
-       g_return_if_fail (EV_IS_JOB_PRINT (job));
-
        ev_debug_message (DEBUG_JOBS, NULL);
        ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
        
-       if (job->temp_file)
-               g_free (job->temp_file);
-       job->temp_file = NULL;
+       if (job_print->temp_file)
+               g_free (job_print->temp_file);
+       job_print->temp_file = NULL;
        
-       if (job->error)
-               g_error_free (job->error);
-       job->error = NULL;
-
-       filename = g_strdup_printf ("evince_print.%s.XXXXXX", job->format);
-       fd = g_file_open_tmp (filename, &job->temp_file, &job->error);
+       filename = g_strdup_printf ("evince_print.%s.XXXXXX", job_print->format);
+       fd = g_file_open_tmp (filename, &job_print->temp_file, &error);
        g_free (filename);
        if (fd <= -1) {
-               EV_JOB (job)->finished = TRUE;
-               return;
+               ev_job_failed_from_error (job, error);
+               g_error_free (error);
+               
+               return FALSE;
        }
 
-       page_list = ev_job_print_get_page_list (job, &n_pages);
+       page_list = ev_job_print_get_page_list (job_print, &n_pages);
        if (n_pages == 0) {
                close (fd);
-               EV_JOB (job)->finished = TRUE;
-               return;
+               /* TODO: error */
+               ev_job_succeeded (job);
+               
+               return FALSE;
        }
 
-       first_page = ev_print_job_get_first_page (job);
-       last_page = ev_print_job_get_last_page (job);
+       first_page = ev_print_job_get_first_page (job_print);
+       last_page = ev_print_job_get_last_page (job_print);
 
-       fc.format = g_ascii_strcasecmp (job->format, "pdf") == 0 ?
+       fc.format = g_ascii_strcasecmp (job_print->format, "pdf") == 0 ?
                EV_FILE_FORMAT_PDF : EV_FILE_FORMAT_PS;
-       fc.filename = job->temp_file;
+       fc.filename = job_print->temp_file;
        fc.first_page = MIN (first_page, last_page);
        fc.last_page = MAX (first_page, last_page);
-       fc.paper_width = job->width;
-       fc.paper_height = job->height;
+       fc.paper_width = job_print->width;
+       fc.paper_height = job_print->height;
        fc.duplex = FALSE;
-       fc.pages_per_sheet = MAX (1, job->pages_per_sheet);
+       fc.pages_per_sheet = MAX (1, job_print->pages_per_sheet);
 
        rc = ev_render_context_new (NULL, 0, 1.0);
 
        ev_document_doc_mutex_lock ();
        ev_file_exporter_begin (EV_FILE_EXPORTER (document), &fc);
 
-       for (i = 0; i < job->copies; i++) {
+       for (i = 0; i < job_print->copies; i++) {
                gint page, step;
                gint n_copies;
                
-               step = job->reverse ? -1 * job->pages_per_sheet : job->pages_per_sheet;
-               page = job->reverse ? ((n_pages - 1) / job->pages_per_sheet) * job->pages_per_sheet : 0;
-               n_copies = job->collate ? 1 : job->copies;
+               step = job_print->reverse ? -1 * job_print->pages_per_sheet : job_print->pages_per_sheet;
+               page = job_print->reverse ? ((n_pages - 1) / job_print->pages_per_sheet) * job_print->pages_per_sheet : 0;
+               n_copies = job_print->collate ? 1 : job_print->copies;
 
-               while ((job->reverse && (page >= 0)) || (!job->reverse && (page < n_pages))) {
+               while ((job_print->reverse && (page >= 0)) || (!job_print->reverse && (page < n_pages))) {
                        gint k;
 
                        for (k = 0; k < n_copies; k++) {
                                ev_file_exporter_begin_page (EV_FILE_EXPORTER (document));
                                
-                               for (j = 0; j < job->pages_per_sheet; j++) {
+                               for (j = 0; j < job_print->pages_per_sheet; j++) {
                                        EvPage *ev_page;
                                        
                                        gint p = page + j;
@@ -1028,7 +1203,7 @@ ev_job_print_run (EvJobPrint *job)
                        page += step;
                }
 
-               if (!job->collate)
+               if (!job_print->collate)
                        break;
        }
 
@@ -1039,5 +1214,64 @@ ev_job_print_run (EvJobPrint *job)
        close (fd);
        g_object_unref (rc);
        
-       EV_JOB (job)->finished = TRUE;
+       ev_job_succeeded (job);
+       
+       return FALSE;
+}
+
+static void
+ev_job_print_class_init (EvJobPrintClass *class)
+{
+       GObjectClass *oclass = G_OBJECT_CLASS (class);
+       EvJobClass   *job_class = EV_JOB_CLASS (class);
+
+       oclass->dispose = ev_job_print_dispose;
+       job_class->run = ev_job_print_run;
+}
+
+EvJob *
+ev_job_print_new (EvDocument    *document,
+                 const gchar   *format,
+                 gdouble        width,
+                 gdouble        height,
+                 EvPrintRange  *ranges,
+                 gint           n_ranges,
+                 EvPrintPageSet page_set,
+                 gint           pages_per_sheet,
+                 gint           copies,
+                 gdouble        collate,
+                 gdouble        reverse)
+{
+       EvJobPrint *job;
+
+       ev_debug_message (DEBUG_JOBS, "format: %s, width: %f, height:%f,"
+                         "n_ranges: %d, pages_per_sheet: %d, copies: %d,"
+                         "collate: %s, reverse: %s",
+                         format, width, height, n_ranges, pages_per_sheet, copies,
+                         collate ? "True" : "False", reverse  ? "True" : "False");
+
+       job = g_object_new (EV_TYPE_JOB_PRINT, NULL);
+
+       EV_JOB (job)->document = g_object_ref (document);
+
+       job->format = format;
+       
+       job->temp_file = NULL;
+
+       job->width = width;
+       job->height = height;
+
+       job->ranges = ranges;
+       job->n_ranges = n_ranges;
+
+       job->page_set = page_set;
+
+       job->pages_per_sheet = CLAMP (pages_per_sheet, 1, 16);
+       
+       job->copies = copies;
+       job->collate = collate;
+       job->reverse = reverse;
+       
+       return EV_JOB (job);
 }
+