1 files changed, 18 insertions, 173 deletions
diff --git a/libview/ev-jobs.c b/libview/ev-jobs.c
index 607bc2c2..ef4ae19d 100644
--- a/libview/ev-jobs.c
+++ b/libview/ev-jobs.c
@@ -24,7 +24,6 @@
 #include "ev-document-thumbnails.h"
 #include "ev-document-links.h"
 #include "ev-document-images.h"
-#include "ev-job-scheduler.h"
 #include "ev-document-forms.h"
 #include "ev-file-exporter.h"
 #include "ev-document-factory.h"
@@ -41,9 +40,6 @@
 #include "ev-debug.h"
 
 #include <gtk/gtk.h>
-#if ENABLE_EPUB
-#include <webkit2/webkit2.h>
-#endif
 #include <errno.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
@@ -63,8 +59,8 @@ static void ev_job_page_data_init (EvJobPageData *job);
 static void ev_job_page_data_class_init (EvJobPageDataClass *class);
 static void ev_job_thumbnail_init (EvJobThumbnail *job);
 static void ev_job_thumbnail_class_init (EvJobThumbnailClass *class);
-static void ev_job_load_init (EvJobLoad *job);
-static void ev_job_load_class_init (EvJobLoadClass *class);
+static void ev_job_load_init (EvJobLoad *job);
+static void ev_job_load_class_init (EvJobLoadClass *class);
 static void ev_job_save_init (EvJobSave *job);
 static void ev_job_save_class_init (EvJobSaveClass *class);
 static void ev_job_find_init (EvJobFind *job);
@@ -216,7 +212,7 @@ ev_job_run (EvJob *job)
 {
 EvJobClass *class = EV_JOB_GET_CLASS (job);
 
- return class-> run (job);
+ return class->run (job);
 }
 
 void
@@ -618,24 +614,6 @@ ev_job_render_run (EvJob *job)
 ev_document_fc_mutex_lock ();
 
 ev_page = ev_document_get_page (job->document, job_render->page);
-
- if ( job->document->iswebdocument == TRUE )
- {
- return TRUE;
- 
- if (g_cancellable_is_cancelled (job->cancellable)) {
- ev_document_fc_mutex_unlock ();
- ev_document_doc_mutex_unlock ();
- g_object_unref (rc);
-
- return FALSE;
- }
- 
- ev_document_fc_mutex_unlock ();
- ev_document_doc_mutex_unlock ();
- ev_job_succeeded (job);
- return FALSE;
- }
 rc = ev_render_context_new (ev_page, job_render->rotation, job_render->scale);
 g_object_unref (ev_page);
 
@@ -819,7 +797,7 @@ ev_job_page_data_new (EvDocument *document,
 static void
 ev_job_thumbnail_init (EvJobThumbnail *job)
 {
- EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
+ EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
 }
 
 static void
@@ -839,77 +817,6 @@ ev_job_thumbnail_dispose (GObject *object)
 (* G_OBJECT_CLASS (ev_job_thumbnail_parent_class)->dispose) (object);
 }
 
-#if ENABLE_EPUB
-static void
-snapshot_callback(WebKitWebView *webview,
- GAsyncResult *results,
- EvJobThumbnail *job_thumb)
-{
- GError *error = NULL;
-
- ev_document_doc_mutex_lock ();
-
- EvPage *page = ev_document_get_page (EV_JOB(job_thumb)->document, job_thumb->page);
- job_thumb->surface = webkit_web_view_get_snapshot_finish (webview,
- results,
- &error);
-
- if (error) {
- g_warning ("Error retrieving a snapshot: %s", error->message);
- }
-
- EvRenderContext *rc = ev_render_context_new (page, job_thumb->rotation, job_thumb->scale);
- EvPage *screenshotpage;
- screenshotpage = ev_page_new(job_thumb->page);
- screenshotpage->backend_page = (EvBackendPage)job_thumb->surface;
- screenshotpage->backend_destroy_func = (EvBackendPageDestroyFunc)cairo_surface_destroy;
- ev_render_context_set_page(rc,screenshotpage);
-
- job_thumb->thumbnail = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (EV_JOB(job_thumb)->document),
- rc, TRUE);
- g_object_unref(screenshotpage);
- g_object_unref(rc);
-
- ev_document_doc_mutex_unlock ();
- ev_job_succeeded (EV_JOB(job_thumb));
-
- gtk_widget_destroy (gtk_widget_get_toplevel (GTK_WIDGET (webview)));
-}
-
-static void
-web_thumbnail_get_screenshot_cb (WebKitWebView *webview,
- WebKitLoadEvent event,
- EvJobThumbnail *job_thumb)
-{
- if (event != WEBKIT_LOAD_FINISHED || ev_job_is_failed (EV_JOB(job_thumb))) {
- return;
- }
-
- webkit_web_view_get_snapshot (webview,
- WEBKIT_SNAPSHOT_REGION_VISIBLE,
- WEBKIT_SNAPSHOT_OPTIONS_NONE,
- NULL,
- (GAsyncReadyCallback)snapshot_callback,
- g_object_ref (job_thumb));
-}
-
-static gboolean
-webview_load_failed_cb (WebKitWebView *webview,
- WebKitLoadEvent event,
- gchar *failing_uri,
- gpointer error,
- EvJobThumbnail *job_thumb)
-{
- GError *e = (GError *) error;
- g_warning ("Error loading data from %s: %s", failing_uri, e->message);
- ev_job_failed_from_error (EV_JOB(job_thumb), e);
-
- gtk_widget_destroy (gtk_widget_get_toplevel (GTK_WIDGET (webview)));
- return TRUE;
-}
-
-#endif /* ENABLE_EPUB */
-
 static gboolean
 ev_job_thumbnail_run (EvJob *job)
 {
@@ -919,53 +826,19 @@ ev_job_thumbnail_run (EvJob *job)
 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);
 
- if (job->document->iswebdocument) {
- /* Do not block the main loop */
- if (!ev_document_doc_mutex_trylock ())
- return TRUE;
- } else {
- ev_document_doc_mutex_lock ();
- }
+ ev_document_doc_mutex_lock ();
 
 page = ev_document_get_page (job->document, job_thumb->page);
 ev_document_doc_mutex_unlock ();
 
- if (job->document->iswebdocument == TRUE ) {
- rc = ev_render_context_new (page, 0, job_thumb->scale);
- } else {
- rc = ev_render_context_new (page, job_thumb->rotation, job_thumb->scale);
- }
+ rc = ev_render_context_new (page, job_thumb->rotation, job_thumb->scale);
 g_object_unref (page);
 
-#if ENABLE_EPUB
- if (job->document->iswebdocument == TRUE) {
- GtkWidget *webview;
- GtkWidget *offscreenwindow;
- 
- webview = webkit_web_view_new ();
- offscreenwindow = gtk_offscreen_window_new ();
-
- gtk_container_add (GTK_CONTAINER(offscreenwindow), GTK_WIDGET (webview));
- gtk_window_set_default_size (GTK_WINDOW(offscreenwindow), 800, 1080);
- gtk_widget_show_all (offscreenwindow);
-
- g_signal_connect (WEBKIT_WEB_VIEW (webview), "load-changed",
- G_CALLBACK (web_thumbnail_get_screenshot_cb),
- g_object_ref (job_thumb));
- g_signal_connect (WEBKIT_WEB_VIEW(webview), "load-failed",
- G_CALLBACK(webview_load_failed_cb),
- g_object_ref (job_thumb));
- webkit_web_view_load_uri (WEBKIT_WEB_VIEW (webview), (gchar*) rc->page->backend_page);
- }
- else 
-#endif /* ENABLE_EPUB */
- {
- ev_document_doc_mutex_lock ();
- job_thumb->thumbnail = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (job->document),
- rc, TRUE);
- ev_document_doc_mutex_unlock ();
- ev_job_succeeded (job);
- }
+ ev_document_doc_mutex_lock ();
+ job_thumb->thumbnail = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (job->document),
+ rc, TRUE);
+ ev_document_doc_mutex_unlock ();
+ ev_job_succeeded (job);
 g_object_unref (rc);
 
 return FALSE;
@@ -1372,10 +1245,6 @@ ev_job_find_dispose (GObject *object)
 g_free (job->pages);
 job->pages = NULL;
 }
-
- if (job->results) {
- g_free(job->results);
- }
 
 (* G_OBJECT_CLASS (ev_job_find_parent_class)->dispose) (object);
 }
@@ -1387,6 +1256,7 @@ ev_job_find_run (EvJob *job)
 EvDocumentFind *find = EV_DOCUMENT_FIND (job->document);
 EvPage *ev_page;
 GList *matches;
+
 ev_debug_message (DEBUG_JOBS, NULL);
 
 /* Do not block the main loop */
@@ -1400,30 +1270,16 @@ ev_job_find_run (EvJob *job)
 #endif
 
 ev_page = ev_document_get_page (job->document, job_find->current_page);
-
- if (job->document->iswebdocument) {
- job_find->results[job_find->current_page] = ev_document_find_check_for_hits(find, ev_page, job_find->text,
- job_find->case_sensitive);
- }else {
- matches = ev_document_find_find_text (find, ev_page, job_find->text,
- job_find->case_sensitive); 
- }
- 
+ matches = ev_document_find_find_text (find, ev_page, job_find->text,
+ job_find->case_sensitive);
 g_object_unref (ev_page);
 
 ev_document_doc_mutex_unlock ();
 
- if (!job_find->has_results && !job->document->iswebdocument) {
+ if (!job_find->has_results)
 job_find->has_results = (matches != NULL);
- }
- else if (!job_find->has_results && job->document->iswebdocument){
- job_find->has_results = (job_find->results[job_find->current_page] > 0);
- }
-
- if (job->document->iswebdocument == FALSE) {
- job_find->pages[job_find->current_page] = matches;
- }
 
+ job_find->pages[job_find->current_page] = matches;
 g_signal_emit (job_find, job_find_signals[FIND_UPDATED], 0, job_find->current_page);
 
 job_find->current_page = (job_find->current_page + 1) % job_find->n_pages;
@@ -1473,13 +1329,7 @@ ev_job_find_new (EvDocument *document,
 job->start_page = start_page;
 job->current_page = start_page;
 job->n_pages = n_pages;
-
- if (document->iswebdocument) {
- job->results = g_malloc0 (sizeof(guint) *n_pages);
- }
- else {
- job->pages = g_new0 (GList *, n_pages);
- }
+ job->pages = g_new0 (GList *, n_pages);
 job->text = g_strdup (text);
 job->case_sensitive = case_sensitive;
 job->has_results = FALSE;
@@ -1491,12 +1341,7 @@ gint
 ev_job_find_get_n_results (EvJobFind *job,
 gint page)
 {
- if (EV_JOB(job)->document->iswebdocument) {
- return job->results[page];
- }
- else {
- return g_list_length (job->pages[page]);
- }
+ return g_list_length (job->pages[page]);
 }
 
 gdouble