Rework the jobs system in order to make it simpler and more extensible. It

2008-08-03  Carlos Garcia Campos  <carlosgc@gnome.org>

	* libdocument/ev-document.[ch]: (ev_document_doc_mutex_trylock),
	(ev_document_fc_mutex_trylock):
	* shell/Makefile.am:
	* shell/ev-job-queue.[ch]:
	* shell/ev-job-scheduler.[ch]:
	* shell/ev-jobs.[ch]: (ev_job_init), (ev_job_dispose),
	(ev_job_class_init), (emit_finished), (ev_job_emit_finished),
	(ev_job_run), (ev_job_cancel), (ev_job_failed),
	(ev_job_failed_from_error), (ev_job_succeeded),
	(ev_job_is_finished), (ev_job_is_failed), (ev_job_get_run_mode),
	(ev_job_set_run_mode), (ev_job_links_init), (ev_job_links_run),
	(ev_job_links_class_init), (ev_job_render_init),
	(notify_page_ready), (ev_job_render_page_ready),
	(ev_job_render_run), (ev_job_render_class_init),
	(ev_job_thumbnail_init), (ev_job_thumbnail_run),
	(ev_job_thumbnail_class_init), (ev_job_fonts_init),
	(ev_job_fonts_run), (ev_job_fonts_class_init), (ev_job_load_init),
	(ev_job_load_run), (ev_job_load_class_init), (ev_job_save_init),
	(ev_job_save_dispose), (ev_job_save_run),
	(ev_job_save_class_init), (ev_job_print_init),
	(ev_job_print_dispose), (ev_job_print_run),
	(ev_job_print_class_init):
	* shell/ev-page-cache.c:
	* shell/ev-pixbuf-cache.[ch]: (dispose_cache_job_info),
	(check_job_size_and_unref), (move_one_job),
	(copy_job_to_job_info), (add_job),
	(ev_pixbuf_cache_add_jobs_if_needed):
	* shell/ev-properties-fonts.c: (ev_properties_fonts_dispose),
	(job_fonts_finished_cb), (job_fonts_updated_cb),
	(ev_properties_fonts_set_document):
	* shell/ev-sidebar-links.c: (ev_sidebar_links_dispose),
	(ev_sidebar_links_set_document):
	* shell/ev-sidebar-thumbnails.c: (clear_range), (add_range),
	(ev_sidebar_thumbnails_set_document),
	(ev_sidebar_thumbnails_clear_job):
	* shell/ev-view-private.h:
	* shell/ev-view.c:
	* shell/ev-window.c: (ev_window_clear_thumbnail_job),
	(ev_window_refresh_window_thumbnail), (password_dialog_response),
	(ev_window_clear_load_job), (ev_window_clear_reload_job),
	(ev_window_load_job_cb), (ev_window_reload_job_cb),
	(window_open_file_copy_ready_cb), (ev_window_open_uri),
	(ev_window_reload_document), (ev_window_clear_save_job),
	(ev_window_save_job_cb), (file_save_dialog_response_cb),
	(ev_window_clear_print_job), (ev_window_print_job_cb),
	(ev_window_print_dialog_response_cb):
	* shell/main.c: (main):

	Rework the jobs system in order to make it simpler and more
	extensible. It allows to run jobs in the main loop instead of
	using a thread when it's appropriate like the fonts job. Now it's
	also possible to cancel jobs that are currently running.

svn path=/trunk/; revision=3092

1 files changed, 23 insertions, 28 deletions

diff --git a/shell/ev-properties-fonts.c b/shell/ev-properties-fonts.c
index 54ed063..385cda1 100644
--- a/shell/ev-properties-fonts.c
+++ b/shell/ev-properties-fonts.c
@@ -25,7 +25,7 @@
 #include "ev-properties-fonts.h"
 #include "ev-document-fonts.h"
 #include "ev-jobs.h"
-#include "ev-job-queue.h"
+#include "ev-job-scheduler.h"
 
 #include <glib/gi18n.h>
 #include <gtk/gtktreeview.h>
@@ -63,12 +63,10 @@ ev_properties_fonts_dispose (GObject *object)
 	}
 	
 	if (properties->fonts_job) {
-
-		g_signal_handlers_disconnect_by_func
-				(properties->fonts_job, 
-				 job_fonts_finished_cb, 
-				 properties);
-		ev_job_queue_remove_job (properties->fonts_job);
+		g_signal_handlers_disconnect_by_func (properties->fonts_job, 
+						      job_fonts_finished_cb, 
+						      properties);
+		ev_job_cancel (properties->fonts_job);
 
 		g_object_unref (properties->fonts_job);		
 		properties->fonts_job = NULL;
@@ -161,29 +159,23 @@ update_progress_label (GtkWidget *label, double progress)
 
 static void
 job_fonts_finished_cb (EvJob *job, EvPropertiesFonts *properties)
-{	
-	EvDocumentFonts *document_fonts = EV_DOCUMENT_FONTS (job->document);
-	double progress;
-	
-	progress = ev_document_fonts_get_progress (document_fonts);
-	update_progress_label (properties->fonts_progress_label, progress);
+{
+	g_signal_handlers_disconnect_by_func (job, job_fonts_finished_cb, properties);
+	g_object_unref (properties->fonts_job);
+	properties->fonts_job = NULL;
+}
 
-	if (EV_JOB_FONTS (job)->scan_completed) {
-		g_signal_handlers_disconnect_by_func
-				(job, job_fonts_finished_cb, properties);
-		g_object_unref (properties->fonts_job);
-		properties->fonts_job = NULL;
-	} else {
-		GtkTreeModel *model;
+static void
+job_fonts_updated_cb (EvJobFonts *job, gdouble progress, EvPropertiesFonts *properties)
+{
+	GtkTreeModel *model;
+	EvDocumentFonts *document_fonts = EV_DOCUMENT_FONTS (properties->document);
 
-		model = gtk_tree_view_get_model
-				(GTK_TREE_VIEW (properties->fonts_treeview));
-		ev_document_doc_mutex_lock ();
-		ev_document_fonts_fill_model (document_fonts, model);
-		ev_document_doc_mutex_unlock ();
+	update_progress_label (properties->fonts_progress_label, progress);
 
-		ev_job_queue_add_job (job, EV_JOB_PRIORITY_LOW);
-	}
+	model = gtk_tree_view_get_model (GTK_TREE_VIEW (properties->fonts_treeview));
+	/* Documen lock is already held by the jop */
+	ev_document_fonts_fill_model (document_fonts, model);
 }
 
 void
@@ -200,10 +192,13 @@ ev_properties_fonts_set_document (EvPropertiesFonts *properties,
 	gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (list_store));
 
 	properties->fonts_job = ev_job_fonts_new (properties->document);
+	g_signal_connect (properties->fonts_job, "updated",
+			  G_CALLBACK (job_fonts_updated_cb),
+			  properties);
 	g_signal_connect (properties->fonts_job, "finished",
 			  G_CALLBACK (job_fonts_finished_cb),
 			  properties);
-	ev_job_queue_add_job (properties->fonts_job, EV_JOB_PRIORITY_LOW);
+	ev_job_scheduler_push_job (properties->fonts_job, EV_JOB_PRIORITY_NONE);
 }
 
 GtkWidget *