X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2Fev-properties-fonts.c;h=783a5657aa14ad9d28b990257947a0010aaaf40a;hb=0be3be0d4166be324d628802772e99cacd336f11;hp=5a792072b172d31063a46152352071e66e24579a;hpb=dccf9855895c5f35bb0899bbd9c093baef02efc7;p=evince.git

diff --git a/shell/ev-properties-fonts.c b/shell/ev-properties-fonts.c
index 5a792072..783a5657 100644
--- a/shell/ev-properties-fonts.c
+++ b/shell/ev-properties-fonts.c
@@ -22,15 +22,15 @@
 #include "config.h"
 #endif
 
-#include "ev-properties-fonts.h"
-#include "ev-document-fonts.h"
-#include "ev-jobs.h"
-#include "ev-job-queue.h"
-
 #include <glib/gi18n.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 
+#include "ev-document-fonts.h"
+#include "ev-job-scheduler.h"
+#include "ev-jobs.h"
+#include "ev-properties-fonts.h"
+
 struct _EvPropertiesFonts {
 	GtkVBox base_instance;
 
@@ -38,6 +38,7 @@ struct _EvPropertiesFonts {
 
 	GtkWidget *fonts_treeview;
 	GtkWidget *fonts_progress_label;
+	EvJob     *fonts_job;
 
 	EvDocument *document;
 };
@@ -46,6 +47,9 @@ struct _EvPropertiesFontsClass {
 	GtkVBoxClass base_class;
 };
 
+static void
+job_fonts_finished_cb (EvJob *job, EvPropertiesFonts *properties);
+
 G_DEFINE_TYPE (EvPropertiesFonts, ev_properties_fonts, GTK_TYPE_VBOX)
 
 static void
@@ -57,6 +61,18 @@ ev_properties_fonts_dispose (GObject *object)
 		g_object_unref (properties->xml);
 		properties->xml = NULL;
 	}
+	
+	if (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;
+	}
+
+	G_OBJECT_CLASS (ev_properties_fonts_parent_class)->dispose (object);
 }
 
 static void
@@ -143,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;
+{
+	g_signal_handlers_disconnect_by_func (job, job_fonts_finished_cb, properties);
+	g_object_unref (properties->fonts_job);
+	properties->fonts_job = NULL;
+}
+
+static void
+job_fonts_updated_cb (EvJobFonts *job, gdouble progress, EvPropertiesFonts *properties)
+{
+	GtkTreeModel *model;
+	EvDocumentFonts *document_fonts = EV_DOCUMENT_FONTS (properties->document);
 
-	progress = ev_document_fonts_get_progress (document_fonts);
 	update_progress_label (properties->fonts_progress_label, progress);
 
-	if (EV_JOB_FONTS (job)->scan_completed) {
-		g_signal_handlers_disconnect_by_func
-				(job, job_fonts_finished_cb, properties);
-	} else {
-		GtkTreeModel *model;
-		EvJob *new_job;
-
-		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 ();
-		new_job = ev_job_fonts_new (job->document);
-		ev_job_queue_add_job (job, EV_JOB_PRIORITY_LOW);
-		g_object_unref (new_job);
-	}
+	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
@@ -174,7 +184,6 @@ ev_properties_fonts_set_document (EvPropertiesFonts *properties,
 {
 	GtkTreeView *tree_view = GTK_TREE_VIEW (properties->fonts_treeview);
 	GtkListStore *list_store;
-	EvJob *job;
 
 	properties->document = document;
 
@@ -182,12 +191,14 @@ ev_properties_fonts_set_document (EvPropertiesFonts *properties,
 					 G_TYPE_STRING, G_TYPE_STRING);
 	gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (list_store));
 
-	job = ev_job_fonts_new (properties->document);
-	g_signal_connect_object (job, "finished",
-			         G_CALLBACK (job_fonts_finished_cb),
-				 properties, 0);
-	ev_job_queue_add_job (job, EV_JOB_PRIORITY_LOW);
-	g_object_unref (job);
+	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_scheduler_push_job (properties->fonts_job, EV_JOB_PRIORITY_NONE);
 }
 
 GtkWidget *