Redesigned the thumbnail code for ePub

No more crashes when searching with the sidebar open, will probably add a pixbuf cache as well to speed it up even further.

The process which I earlier thought was not possible without separate jobs, work just fine as a single job, if I change the run mode of the thumbnail job, and incorporate a trylock() in case of epub.

1 files changed, 1 insertions, 22 deletions

diff --git a/libview/ev-jobs.h b/libview/ev-jobs.h
index 87365672..fdc23bae 100644
--- a/libview/ev-jobs.h
+++ b/libview/ev-jobs.h
@@ -292,6 +292,7 @@ struct _EvJobThumbnail
 	gint page;
 	gint rotation;
 	gdouble scale;
+	cairo_surface_t *surface;
 	GdkPixbuf *thumbnail;
 };
 
@@ -300,22 +301,6 @@ struct _EvJobThumbnailClass
 	EvJobClass parent_class;
 };
 
-struct _EvJobWebThumbnail
-{
-	EvJob parent;
-	GtkWidget *webview;
-	GtkWidget *offscreenwindow;
-	gboolean  *completed;
-	GRWLock screenlock;
-	cairo_surface_t **surface;
-	gchar* page;
-};
-
-struct _EvJobWebThumbnailClass
-{
-	EvJobClass parent_class;
-};
-
 struct _EvJobFonts
 {
 	EvJob parent;
@@ -474,12 +459,6 @@ EvJob          *ev_job_thumbnail_new      (EvDocument      *document,
 					   gint             rotation,
 					   gdouble          scale);
 
-/* EvJobWebThumbnail */
-GType           ev_job_web_thumbnail_get_type (void) G_GNUC_CONST;
-EvJob          *ev_job_web_thumbnail_new      (EvDocument      *document,
-                                               gboolean        *completed,
-                                               gchar           *webpage,
-                                               cairo_surface_t **surface);
 /* EvJobFonts */
 GType 		ev_job_fonts_get_type 	  (void) G_GNUC_CONST;
 EvJob 	       *ev_job_fonts_new 	  (EvDocument      *document);