Move EvView specific code to a libeviview library so that it can be

2009-01-18  Carlos Garcia Campos  <carlosgc@gnome.org>

	* configure.ac:
	* Makefile.am:
	* libdocument/Makefile.am:
	* libview/Makefile.am:
	* libview/ev-job-scheduler.[ch]:
	* libview/ev-jobs.[ch]:
	* libview/ev-page-cache.[ch]:
	* libview/ev-pixbuf-cache.[ch]:
	* libview/ev-timeline.[ch]:
	* libview/ev-transition-animation.[ch]:
	* libview/ev-view-accessible.[ch]:
	* libview/ev-view-marshal.list:
	* libview/ev-view.[ch]:
	* shell/Makefile.am:

	Move EvView specific code to a libeviview library so that it can
	be embbeded in other applications. Based on patches by Tomeu
	Vizoso. Fixes bug #567751.

svn path=/trunk/; revision=3348

19 files changed, 2 insertions, 12406 deletions

diff --git a/shell/Makefile.am b/shell/Makefile.am
index d5abcb0..ab09ef9 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES=							\
 	-I$(top_srcdir)/cut-n-paste/evmountoperation/		\
 	-I$(top_srcdir)/cut-n-paste/smclient/			\
 	-I$(top_srcdir)/libdocument				\
+	-I$(top_srcdir)/libview					\
 	-I$(top_srcdir)/properties				\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"			\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 		\
@@ -30,10 +31,6 @@ evince_SOURCES=				\
 	eggfindbar.h			\
 	ev-application.c		\
 	ev-application.h		\
-	ev-job-scheduler.h		\
-	ev-job-scheduler.c		\
-	ev-jobs.h			\
-	ev-jobs.c			\
 	ev-file-monitor.h		\
 	ev-file-monitor.c		\
 	ev-history.c			\
@@ -55,12 +52,8 @@ evince_SOURCES=				\
 	ev-page-action.h		\
 	ev-page-action-widget.c		\
 	ev-page-action-widget.h		\
-	ev-page-cache.h			\
-	ev-page-cache.c			\
 	ev-password-view.h		\
 	ev-password-view.c		\
-	ev-pixbuf-cache.c		\
-	ev-pixbuf-cache.h		\
 	ev-print-operation.h		\
 	ev-print-operation.c		\
 	ev-progress-message-area.h	\
@@ -73,11 +66,6 @@ evince_SOURCES=				\
 	ev-open-recent-action.h		\
 	ev-utils.c			\
 	ev-utils.h			\
-	ev-view-accessible.c		\
-	ev-view-accessible.h		\
-	ev-view-private.h		\
-	ev-view.c			\
-	ev-view.h			\
 	ev-window.c			\
 	ev-window.h			\
 	ev-window-title.c		\
@@ -96,10 +84,6 @@ evince_SOURCES=				\
 	ev-sidebar-thumbnails.h		\
 	ev-stock-icons.c		\
 	ev-stock-icons.h		\
-	ev-timeline.c			\
-	ev-timeline.h			\
-	ev-transition-animation.c	\
-	ev-transition-animation.h	\
 	main.c
 
 evince_LDADD=										\
@@ -112,6 +96,7 @@ evince_LDADD=										\
 	$(top_builddir)/cut-n-paste/smclient/libsmclient.la				\
 	$(top_builddir)/properties/libevproperties.la					\
 	$(top_builddir)/libdocument/libevbackend.la					\
+	$(top_builddir)/libview/libevview.la						\
 	$(SHELL_LIBS)
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
diff --git a/shell/ev-job-scheduler.c b/shell/ev-job-scheduler.c
deleted file mode 100644
index 900714e..0000000
--- a/shell/ev-job-scheduler.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/* ev-job-scheduler.c
- *  this file is part of evince, a gnome document viewer
- *
- * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
- *
- * 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 "ev-debug.h"
-#include "ev-job-scheduler.h"
-
-typedef struct _EvSchedulerJob {
-	EvJob         *job;
-	EvJobPriority  priority;
-	GSList        *job_link;
-} EvSchedulerJob;
-
-G_LOCK_DEFINE_STATIC(job_list);
-static GSList *job_list = NULL;
-
-static gpointer ev_job_thread_proxy               (gpointer        data);
-static void     ev_scheduler_thread_job_cancelled (EvSchedulerJob *job,
-						   GCancellable   *cancellable);
-
-/* EvJobQueue */
-static GQueue queue_urgent = G_QUEUE_INIT;
-static GQueue queue_high = G_QUEUE_INIT;
-static GQueue queue_low = G_QUEUE_INIT;
-static GQueue queue_none = G_QUEUE_INIT;
-
-static GCond *job_queue_cond = NULL;
-static GMutex *job_queue_mutex = NULL;
-static GQueue *job_queue[EV_JOB_N_PRIORITIES] = {
-	&queue_urgent,
-	&queue_high,
-	&queue_low,
-	&queue_none
-};
-
-static void
-ev_job_queue_push (EvSchedulerJob *job,
-		   EvJobPriority   priority)
-{
-	ev_debug_message (DEBUG_JOBS, "%s priority %d", EV_GET_TYPE_NAME (job->job), priority);
-	
-	g_mutex_lock (job_queue_mutex);
-
-	g_queue_push_tail (job_queue[priority], job);
-	g_cond_broadcast (job_queue_cond);
-	
-	g_mutex_unlock (job_queue_mutex);
-}
-
-static EvSchedulerJob *
-ev_job_queue_get_next_unlocked (void)
-{
-	gint i;
-	EvSchedulerJob *job = NULL;
-	
-	for (i = EV_JOB_PRIORITY_URGENT; i < EV_JOB_N_PRIORITIES; i++) {
-		job = (EvSchedulerJob *) g_queue_pop_head (job_queue[i]);
-		if (job)
-			break;
-	}
-
-	ev_debug_message (DEBUG_JOBS, "%s", job ? EV_GET_TYPE_NAME (job->job) : "No jobs in queue");
-
-	return job;
-}
-
-static gpointer
-ev_job_scheduler_init (gpointer data)
-{
-	job_queue_cond = g_cond_new ();
-	job_queue_mutex = g_mutex_new ();
-	g_thread_create (ev_job_thread_proxy, NULL, FALSE, NULL);
-	
-	return NULL;
-}
-
-static void
-ev_scheduler_job_list_add (EvSchedulerJob *job)
-{
-	ev_debug_message (DEBUG_JOBS, "%s", EV_GET_TYPE_NAME (job->job));
-	
-	G_LOCK (job_list);
-
-	job_list = g_slist_prepend (job_list, job);
-	job->job_link = job_list;
-	
-	G_UNLOCK (job_list);
-}
-
-static void
-ev_scheduler_job_list_remove (EvSchedulerJob *job)
-{
-	ev_debug_message (DEBUG_JOBS, "%s", EV_GET_TYPE_NAME (job->job));
-	
-	G_LOCK (job_list);
-
-	job_list = g_slist_delete_link (job_list, job->job_link);
-	
-	G_UNLOCK (job_list);
-}
-
-static void
-ev_scheduler_job_free (EvSchedulerJob *job)
-{
-	if (!job)
-		return;
-
-	g_object_unref (job->job);
-	g_free (job);
-}
-
-static void
-ev_scheduler_job_destroy (EvSchedulerJob *job)
-{
-	ev_debug_message (DEBUG_JOBS, "%s", EV_GET_TYPE_NAME (job->job));
-
-	if (job->job->run_mode == EV_JOB_RUN_MAIN_LOOP) {
-		g_signal_handlers_disconnect_by_func (job->job, 
-						      G_CALLBACK (ev_scheduler_job_destroy),
-						      job);
-	} else {
-		g_signal_handlers_disconnect_by_func (job->job->cancellable,
-						      G_CALLBACK (ev_scheduler_thread_job_cancelled),
-						      job);
-	}
-	
-	ev_scheduler_job_list_remove (job);
-	ev_scheduler_job_free (job);
-}
-
-static void
-ev_scheduler_thread_job_cancelled (EvSchedulerJob *job,
-				   GCancellable   *cancellable)
-{
-	GList   *list;
-	
-	ev_debug_message (DEBUG_JOBS, "%s", EV_GET_TYPE_NAME (job->job));
-
-	g_mutex_lock (job_queue_mutex);
-
-	/* If the job is not still running,
-	 * remove it from the job queue and job list.
-	 * If the job is currently running, it will be
-	 * destroyed as soon as it finishes. 
-	 */
-	list = g_queue_find (job_queue[job->priority], job);
-	if (list) {
-		g_queue_delete_link (job_queue[job->priority], list);
-		g_mutex_unlock (job_queue_mutex);
-		ev_scheduler_job_destroy (job);
-	} else {
-		g_mutex_unlock (job_queue_mutex);
-	}
-}
-
-static void
-ev_job_thread (EvJob *job)
-{
-	gboolean result;
-
-	ev_debug_message (DEBUG_JOBS, "%s", EV_GET_TYPE_NAME (job));
-
-	do {
-		if (g_cancellable_is_cancelled (job->cancellable))
-			result = FALSE;
-		else
-			result = ev_job_run (job);
-	} while (result);
-}
-
-static gboolean
-ev_job_idle (EvJob *job)
-{
-	ev_debug_message (DEBUG_JOBS, "%s", EV_GET_TYPE_NAME (job));
-
-	if (g_cancellable_is_cancelled (job->cancellable))
-		return FALSE;
-
-	return ev_job_run (job);
-}
-
-static gpointer
-ev_job_thread_proxy (gpointer data)
-{
-	while (TRUE) {
-		EvSchedulerJob *job;
-
-		g_mutex_lock (job_queue_mutex);
-		job = ev_job_queue_get_next_unlocked ();
-		if (!job) {
-			g_cond_wait (job_queue_cond, job_queue_mutex);
-			g_mutex_unlock (job_queue_mutex);
-			continue;
-		}
-		g_mutex_unlock (job_queue_mutex);
-		
-		ev_job_thread (job->job);
-		ev_scheduler_job_destroy (job);
-	}
-
-	return NULL;
-}
-
-void
-ev_job_scheduler_push_job (EvJob         *job,
-			   EvJobPriority  priority)
-{
-	static GOnce once_init = G_ONCE_INIT;
-	EvSchedulerJob *s_job;
-
-	g_once (&once_init, ev_job_scheduler_init, NULL);
-
-	ev_debug_message (DEBUG_JOBS, "%s pirority %d", EV_GET_TYPE_NAME (job), priority);
-
-	s_job = g_new0 (EvSchedulerJob, 1);
-	s_job->job = g_object_ref (job);
-	s_job->priority = priority;
-
-	ev_scheduler_job_list_add (s_job);
-	
-	switch (ev_job_get_run_mode (job)) {
-	case EV_JOB_RUN_THREAD:
-		g_signal_connect_swapped (job->cancellable, "cancelled",
-					  G_CALLBACK (ev_scheduler_thread_job_cancelled),
-					  s_job);
-		ev_job_queue_push (s_job, priority);
-		break;
-	case EV_JOB_RUN_MAIN_LOOP:
-		g_signal_connect_swapped (job, "finished",
-					  G_CALLBACK (ev_scheduler_job_destroy),
-					  s_job);
-		g_signal_connect_swapped (job, "cancelled",
-					  G_CALLBACK (ev_scheduler_job_destroy),
-					  s_job);
-		g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
-				 (GSourceFunc)ev_job_idle,
-				 g_object_ref (job),
-				 (GDestroyNotify)g_object_unref);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
-void
-ev_job_scheduler_update_job (EvJob         *job,
-			     EvJobPriority  priority)
-{
-	GSList         *l;
-	EvSchedulerJob *s_job = NULL;
-	gboolean        need_resort = FALSE;
-
-	/* Main loop jobs are scheduled inmediately */
-	if (ev_job_get_run_mode (job) == EV_JOB_RUN_MAIN_LOOP)
-		return;
-
-	ev_debug_message (DEBUG_JOBS, "%s pirority %d", EV_GET_TYPE_NAME (job), priority);
-	
-	G_LOCK (job_list);
-
-	for (l = job_list; l; l = l->next) {
-		s_job = (EvSchedulerJob *)l->data;
-
-		if (s_job->job == job) {
-			need_resort = (s_job->priority != priority);
-			break;
-		}
-	}
-	
-	G_UNLOCK (job_list);
-
-	if (need_resort) {
-		GList *list;
-	
-		g_mutex_lock (job_queue_mutex);
-		
-		list = g_queue_find (job_queue[s_job->priority], s_job);
-		if (list) {
-			ev_debug_message (DEBUG_JOBS, "Moving job %s from pirority %d to %d",
-					  EV_GET_TYPE_NAME (job), s_job->priority, priority);
-			g_queue_delete_link (job_queue[s_job->priority], list);
-			g_queue_push_tail (job_queue[priority], s_job);
-			g_cond_broadcast (job_queue_cond);
-		}
-		
-		g_mutex_unlock (job_queue_mutex);
-	}
-}
-
diff --git a/shell/ev-job-scheduler.h b/shell/ev-job-scheduler.h
deleted file mode 100644
index 66f9f80..0000000
--- a/shell/ev-job-scheduler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ev-job-scheduler.h
- *  this file is part of evince, a gnome document viewer
- *
- * Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
- *
- * 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.
- */
-
-#ifndef EV_JOB_SCHEDULER_H
-#define EV_JOB_SCHEDULER_H
-
-#include <glib.h>
-#include "ev-jobs.h"
-
-G_BEGIN_DECLS
-
-typedef enum {
-	EV_JOB_PRIORITY_URGENT, /* Rendering current page range */
-	EV_JOB_PRIORITY_HIGH,   /* Rendering current thumbnail range */
-	EV_JOB_PRIORITY_LOW,    /* Rendering pages not in current range */
-	EV_JOB_PRIORITY_NONE,   /* Any other job: load, save, print, ... */
-	EV_JOB_N_PRIORITIES
-} EvJobPriority;
-
-void ev_job_scheduler_push_job   (EvJob        *job,
-				  EvJobPriority priority);
-void ev_job_scheduler_update_job (EvJob        *job,
-				  EvJobPriority priority);
-
-G_END_DECLS
-
-#endif /* EV_JOB_SCHEDULER_H */
diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c
deleted file mode 100644
index 102cd90..0000000
--- a/shell/ev-jobs.c
+++ /dev/null
@@ -1,1366 +0,0 @@
-/* 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-document-thumbnails.h"
-#include "ev-document-links.h"
-#include "ev-document-images.h"
-#include "ev-document-forms.h"
-#include "ev-file-exporter.h"
-#include "ev-document-factory.h"
-#include "ev-document-misc.h"
-#include "ev-file-helpers.h"
-#include "ev-document-fonts.h"
-#include "ev-document-security.h"
-#include "ev-document-find.h"
-#include "ev-document-layers.h"
-#include "ev-debug.h"
-
-#include <errno.h>
-#include <glib/gstdio.h>
-#include <glib/gi18n.h>
-#include <unistd.h>
-
-static void ev_job_init                   (EvJob                 *job);
-static void ev_job_class_init             (EvJobClass            *class);
-static void ev_job_links_init             (EvJobLinks            *job);
-static void ev_job_links_class_init       (EvJobLinksClass       *class);
-static void ev_job_attachments_init       (EvJobAttachments      *job);
-static void ev_job_attachments_class_init (EvJobAttachmentsClass *class);
-static void ev_job_render_init            (EvJobRender           *job);
-static void ev_job_render_class_init      (EvJobRenderClass      *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_save_init              (EvJobSave             *job);
-static void ev_job_save_class_init        (EvJobSaveClass        *class);
-static void ev_job_find_init              (EvJobFind             *job);
-static void ev_job_find_class_init        (EvJobFindClass        *class);
-static void ev_job_layers_init            (EvJobLayers           *job);
-static void ev_job_layers_class_init      (EvJobLayersClass      *class);
-static void ev_job_export_init            (EvJobExport           *job);
-static void ev_job_export_class_init      (EvJobExportClass      *class);
-
-enum {
-	CANCELLED,
-	FINISHED,
-	LAST_SIGNAL
-};
-
-enum {
-	PAGE_READY,
-	RENDER_LAST_SIGNAL
-};
-
-enum {
-	FONTS_UPDATED,
-	FONTS_LAST_SIGNAL
-};
-
-enum {
-	FIND_UPDATED,
-	FIND_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 };
-static guint job_find_signals[FIND_LAST_SIGNAL] = { 0 };
-
-G_DEFINE_ABSTRACT_TYPE (EvJob, ev_job, G_TYPE_OBJECT)
-G_DEFINE_TYPE (EvJobLinks, ev_job_links, EV_TYPE_JOB)
-G_DEFINE_TYPE (EvJobAttachments, ev_job_attachments, EV_TYPE_JOB)
-G_DEFINE_TYPE (EvJobRender, ev_job_render, EV_TYPE_JOB)
-G_DEFINE_TYPE (EvJobThumbnail, ev_job_thumbnail, EV_TYPE_JOB)
-G_DEFINE_TYPE (EvJobFonts, ev_job_fonts, EV_TYPE_JOB)
-G_DEFINE_TYPE (EvJobLoad, ev_job_load, EV_TYPE_JOB)
-G_DEFINE_TYPE (EvJobSave, ev_job_save, EV_TYPE_JOB)
-G_DEFINE_TYPE (EvJobFind, ev_job_find, EV_TYPE_JOB)
-G_DEFINE_TYPE (EvJobLayers, ev_job_layers, EV_TYPE_JOB)
-G_DEFINE_TYPE (EvJobExport, ev_job_export, EV_TYPE_JOB)
-
-/* EvJob */
-static void
-ev_job_init (EvJob *job)
-{
-	job->cancellable = g_cancellable_new ();
-}
-
-static void
-ev_job_dispose (GObject *object)
-{
-	EvJob *job;
-
-	job = EV_JOB (object);
-
-	if (job->document) {
-		g_object_unref (job->document);
-		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);
-}
-
-static void
-ev_job_class_init (EvJobClass *class)
-{
-	GObjectClass *oclass;
-
-	oclass = G_OBJECT_CLASS (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_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);
-
-	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_literal (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)
-{
-	EvJobLinks *job;
-
-	ev_debug_message (DEBUG_JOBS, NULL);
-	
-	job = EV_JOB_LINKS (object);
-
-	if (job->model) {
-		g_object_unref (job->model);
-		job->model = NULL;
-	}
-
-	(* 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 = 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;
-
-	ev_debug_message (DEBUG_JOBS, NULL);
-
-	job = g_object_new (EV_TYPE_JOB_LINKS, NULL);
-	job->document = g_object_ref (document);
-	
-	return job;
-}
-
-/* EvJobAttachments */
-static void
-ev_job_attachments_init (EvJobAttachments *job)
-{
-	EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
-}
-
-static void
-ev_job_attachments_dispose (GObject *object)
-{
-	EvJobAttachments *job;
-
-	ev_debug_message (DEBUG_JOBS, NULL);
-	
-	job = EV_JOB_ATTACHMENTS (object);
-
-	if (job->attachments) {
-		g_list_foreach (job->attachments, (GFunc)g_object_unref, NULL);
-		g_list_free (job->attachments);
-		job->attachments = NULL;
-	}
-
-	(* G_OBJECT_CLASS (ev_job_attachments_parent_class)->dispose) (object);
-}
-
-static gboolean
-ev_job_attachments_run (EvJob *job)
-{
-	EvJobAttachments *job_attachments = EV_JOB_ATTACHMENTS (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_attachments->attachments = ev_document_get_attachments (job->document);
-	ev_document_doc_mutex_unlock ();
-	
-	ev_job_succeeded (job);
-	
-	return FALSE;
-}
-
-static void
-ev_job_attachments_class_init (EvJobAttachmentsClass *class)
-{
-	GObjectClass *oclass = G_OBJECT_CLASS (class);
-	EvJobClass   *job_class = EV_JOB_CLASS (class);
-
-	oclass->dispose = ev_job_attachments_dispose;
-	job_class->run = ev_job_attachments_run;
-}
-
-EvJob *
-ev_job_attachments_new (EvDocument *document)
-{
-	EvJob *job;
-
-	ev_debug_message (DEBUG_JOBS, NULL);
-
-	job = g_object_new (EV_TYPE_JOB_ATTACHMENTS, 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)
-{
-	EvJobRender *job;
-
-	job = EV_JOB_RENDER (object);
-
-	if (job->ev_page) {
-		ev_debug_message (DEBUG_JOBS, "page: %d (%p)", job->ev_page->index, job);
-		g_object_unref (job->ev_page);
-		job->ev_page = NULL;
-	}
-	
-	if (job->surface) {
-		cairo_surface_destroy (job->surface);
-		job->surface = NULL;
-	}
-
-	if (job->selection) {
-		cairo_surface_destroy (job->selection);
-		job->selection = NULL;
-	}
-
-	if (job->selection_region) {
-		gdk_region_destroy (job->selection_region);
-		job->selection_region = NULL;
-	}
-
-	(* G_OBJECT_CLASS (ev_job_render_parent_class)->dispose) (object);
-}
-
-static gboolean
-notify_page_ready (EvJobRender *job)
-{
-	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);
-
-	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);
-	}
-
-	return FALSE;
-}
-
-static void
-ev_job_render_page_ready (EvJobRender *job)
-{
-	ev_debug_message (DEBUG_JOBS, "%d (%p)", job->ev_page->index, 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);
-}
-
-static gboolean
-ev_job_render_run (EvJob *job)
-{
-	EvJobRender     *job_render = EV_JOB_RENDER (job);
-	EvRenderContext *rc;
-
-	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 ();
-
-	ev_profiler_start (EV_PROFILE_JOBS, "Rendering page %d", job_render->page);
-		
-	ev_document_fc_mutex_lock ();
-
-	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);
-
-		return FALSE;
-	}
-	
-	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));
-	}
-
-	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 ();
-	
-	ev_job_succeeded (job);
-	
-	return FALSE;
-}
-
-static void
-ev_job_render_class_init (EvJobRenderClass *class)
-{
-	GObjectClass *oclass = G_OBJECT_CLASS (class);
-	EvJobClass   *job_class = EV_JOB_CLASS (class);
-
-	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);
-
-	oclass->dispose = ev_job_render_dispose;
-	job_class->run = ev_job_render_run;
-}
-
-EvJob *
-ev_job_render_new (EvDocument   *document,
-		   gint          page,
-		   gint          rotation,
-		   gdouble       scale, 
-		   gint          width,
-		   gint          height,
-		   EvRenderFlags flags)
-{
-	EvJobRender *job;
-
-	ev_debug_message (DEBUG_JOBS, "page: %d", page);
-	
-	job = g_object_new (EV_TYPE_JOB_RENDER, NULL);
-
-	EV_JOB (job)->document = g_object_ref (document);
-	job->page = page;
-	job->rotation = rotation;
-	job->scale = scale;
-	job->target_width = width;
-	job->target_height = height;
-	job->flags = flags;
-
-	return EV_JOB (job);
-}
-
-void
-ev_job_render_set_selection_info (EvJobRender     *job,
-				  EvRectangle     *selection_points,
-				  EvSelectionStyle selection_style,
-				  GdkColor        *text,
-				  GdkColor        *base)
-{
-	job->flags |= EV_RENDER_INCLUDE_SELECTION;
-	
-	job->selection_points = *selection_points;
-	job->selection_style = selection_style;
-	job->text = *text;
-	job->base = *base;
-}
-
-/* EvJobThumbnail */
-static void
-ev_job_thumbnail_init (EvJobThumbnail *job)
-{
-	EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
-}
-
-static void
-ev_job_thumbnail_dispose (GObject *object)
-{
-	EvJobThumbnail *job;
-
-	job = EV_JOB_THUMBNAIL (object);
-
-	ev_debug_message (DEBUG_JOBS, "%d (%p)", job->page, job);
-	
-	if (job->thumbnail) {
-		g_object_unref (job->thumbnail);
-		job->thumbnail = NULL;
-	}
-
-	(* G_OBJECT_CLASS (ev_job_thumbnail_parent_class)->dispose) (object);
-}
-
-static gboolean
-ev_job_thumbnail_run (EvJob *job)
-{
-	EvJobThumbnail  *job_thumb = EV_JOB_THUMBNAIL (job);
-	EvRenderContext *rc;
-	EvPage          *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 ();
-
-	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_thumb->thumbnail = ev_document_thumbnails_get_thumbnail (EV_DOCUMENT_THUMBNAILS (job->document),
-								     rc, TRUE);
-	g_object_unref (rc);
-	ev_document_doc_mutex_unlock ();
-
-	ev_job_succeeded (job);
-	
-	return FALSE;
-}
-
-static void
-ev_job_thumbnail_class_init (EvJobThumbnailClass *class)
-{
-	GObjectClass *oclass = G_OBJECT_CLASS (class);
-	EvJobClass   *job_class = EV_JOB_CLASS (class);
-
-	oclass->dispose = ev_job_thumbnail_dispose;
-	job_class->run = ev_job_thumbnail_run;
-}
-
-EvJob *
-ev_job_thumbnail_new (EvDocument *document,
-		      gint        page,
-		      gint        rotation,
-		      gdouble     scale)
-{
-	EvJobThumbnail *job;
-
-	ev_debug_message (DEBUG_JOBS, "%d", page);
-	
-	job = g_object_new (EV_TYPE_JOB_THUMBNAIL, NULL);
-
-	EV_JOB (job)->document = g_object_ref (document);
-	job->page = page;
-	job->rotation = rotation;
-	job->scale = scale;
-
-	return EV_JOB (job);
-}
-
-/* EvJobFonts */
-static void
-ev_job_fonts_init (EvJobFonts *job)
-{
-	EV_JOB (job)->run_mode = EV_JOB_RUN_MAIN_LOOP;
-}
-
-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;
-	
-	if (!ev_document_fc_mutex_trylock ())
-		return TRUE;
-
-#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
-
-	job_fonts->scan_completed = !ev_document_fonts_scan (fonts, 20);
-	g_signal_emit (job_fonts, job_fonts_signals[FONTS_UPDATED], 0,
-		       ev_document_fonts_get_progress (fonts));
-
-	ev_document_fc_mutex_unlock ();
-	ev_document_doc_mutex_unlock ();
-
-	if (job_fonts->scan_completed)
-		ev_job_succeeded (job);
-	
-	return !job_fonts->scan_completed;
-}
-
-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[FONTS_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)
-{
-	EvJobFonts *job;
-
-	ev_debug_message (DEBUG_JOBS, NULL);
-	
-	job = g_object_new (EV_TYPE_JOB_FONTS, NULL);
-
-	EV_JOB (job)->document = g_object_ref (document);
-
-	return EV_JOB (job);
-}
-
-/* EvJobLoad */
-static void
-ev_job_load_init (EvJobLoad *job)
-{
-	EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
-}
-
-static void
-ev_job_load_dispose (GObject *object)
-{
-	EvJobLoad *job = EV_JOB_LOAD (object);
-
-	ev_debug_message (DEBUG_JOBS, "%s", job->uri);
-	
-	if (job->uri) {
-		g_free (job->uri);
-		job->uri = NULL;
-	}
-
-	if (job->password) {
-		g_free (job->password);
-		job->password = NULL;
-	}
-
-	(* 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 ();
-
-	/* 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) {
-		if (job_load->password) {
-			ev_document_security_set_password (EV_DOCUMENT_SECURITY (job->document),
-							   job_load->password);
-		}
-		
-		job->failed = FALSE;
-		job->finished = FALSE;
-		g_clear_error (&job->error);
-		
-		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 = 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)
-{
-	EvJobLoad *job;
-
-	ev_debug_message (DEBUG_JOBS, "%s", uri);
-	
-	job = g_object_new (EV_TYPE_JOB_LOAD, NULL);
-	job->uri = g_strdup (uri);
-
-	return EV_JOB (job);
-}
-
-void
-ev_job_load_set_uri (EvJobLoad *job, const gchar *uri)
-{
-	ev_debug_message (DEBUG_JOBS, "%s", uri);
-	
-	if (job->uri)
-		g_free (job->uri);
-	job->uri = g_strdup (uri);
-}
-
-void
-ev_job_load_set_password (EvJobLoad *job, const gchar *password)
-{
-	ev_debug_message (DEBUG_JOBS, NULL);
-
-	if (job->password)
-		g_free (job->password);
-	job->password = password ? g_strdup (password) : NULL;
-}
-
-/* EvJobSave */
-static void
-ev_job_save_init (EvJobSave *job)
-{
-	EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
-}
-
-static void
-ev_job_save_dispose (GObject *object)
-{
-	EvJobSave *job = EV_JOB_SAVE (object);
-
-	ev_debug_message (DEBUG_JOBS, "%s", job->uri);
-	
-	if (job->uri) {
-		g_free (job->uri);
-		job->uri = NULL;
-	}
-
-	if (job->document_uri) {
-		g_free (job->document_uri);
-		job->document_uri = NULL;
-	}
-
-	(* G_OBJECT_CLASS (ev_job_save_parent_class)->dispose) (object);
-}
-
-static gboolean
-ev_job_save_run (EvJob *job)
-{
-	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");
-	tmp_filename = g_strdup_printf ("%s.XXXXXX", filename);
-	g_free (filename);
-
-	fd = g_mkstemp (tmp_filename);
-	if (fd == -1) {
-		gchar *display_name;
-		gint   save_errno = errno;
-
-		display_name = g_filename_display_name (tmp_filename);
-		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 FALSE;
-	}
-
-	ev_document_doc_mutex_lock ();
-
-	/* Save document to temp filename */
-	local_uri = g_filename_to_uri (tmp_filename, NULL, NULL);
-	ev_document_save (job->document, local_uri, &error);
-	close (fd);
-
-	ev_document_doc_mutex_unlock ();
-
-	if (error) {
-		g_free (local_uri);
-		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 (job->document), "uri-uncompressed")) {
-		EvCompressionType ctype = EV_COMPRESSION_NONE;
-		const gchar      *ext;
-		gchar            *uri_comp;
-		
-		ext = g_strrstr (job_save->document_uri, ".gz");
-		if (ext && g_ascii_strcasecmp (ext, ".gz") == 0)
-			ctype = EV_COMPRESSION_GZIP;
-		
-		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, &error);
-		g_free (local_uri);
-		ev_tmp_filename_unlink (tmp_filename);
-
-		if (!uri_comp || error) {
-			local_uri = NULL;
-		} else {
-			local_uri = uri_comp;
-		}
-	}
-
-	g_free (tmp_filename);
-	
-	if (error) {
-		g_free (local_uri);
-		ev_job_failed_from_error (job, error);
-		g_error_free (error);
-		
-		return FALSE;
-	}
-
-	if (!local_uri)
-		return FALSE;
-
-	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_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);
-
-	return EV_JOB (job);
-}
-
-/* EvJobFind */
-static void
-ev_job_find_init (EvJobFind *job)
-{
-	EV_JOB (job)->run_mode = EV_JOB_RUN_MAIN_LOOP;
-}
-
-static void
-ev_job_find_dispose (GObject *object)
-{
-	EvJobFind *job = EV_JOB_FIND (object);
-
-	ev_debug_message (DEBUG_JOBS, NULL);
-
-	if (job->text) {
-		g_free (job->text);
-		job->text = NULL;
-	}
-
-	if (job->pages) {
-		gint i;
-
-		for (i = 0; i < job->n_pages; i++) {
-			g_list_foreach (job->pages[i], (GFunc)g_free, NULL);
-			g_list_free (job->pages[i]);
-		}
-
-		g_free (job->pages);
-		job->pages = NULL;
-	}
-	
-	(* G_OBJECT_CLASS (ev_job_find_parent_class)->dispose) (object);
-}
-
-static gboolean
-ev_job_find_run (EvJob *job)
-{
-	EvJobFind      *job_find = EV_JOB_FIND (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 */
-	if (!ev_document_doc_mutex_trylock ())
-		return TRUE;
-	
-#ifdef EV_ENABLE_DEBUG
-	/* We use the #ifdef in this case because of the if */
-	if (job_find->current_page == job_find->start_page)
-		ev_profiler_start (EV_PROFILE_JOBS, "%s (%p)", EV_GET_TYPE_NAME (job), job);
-#endif
-
-	ev_page = ev_document_get_page (job->document, job_find->current_page);
-	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_find->has_results = (matches != NULL);
-
-	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;
-	if (job_find->current_page == job_find->start_page) {
-		ev_job_succeeded (job);
-
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static void
-ev_job_find_class_init (EvJobFindClass *class)
-{
-	EvJobClass   *job_class = EV_JOB_CLASS (class);
-	GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-	
-	job_class->run = ev_job_find_run;
-	gobject_class->dispose = ev_job_find_dispose;
-	
-	job_find_signals[FIND_UPDATED] =
-		g_signal_new ("updated",
-			      EV_TYPE_JOB_FIND,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EvJobFindClass, updated),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__INT,
-			      G_TYPE_NONE,
-			      1, G_TYPE_INT);
-}
-
-EvJob *
-ev_job_find_new (EvDocument  *document,
-		 gint         start_page,
-		 gint         n_pages,
-		 const gchar *text,
-		 gboolean     case_sensitive)
-{
-	EvJobFind *job;
-	
-	ev_debug_message (DEBUG_JOBS, NULL);
-	
-	job = g_object_new (EV_TYPE_JOB_FIND, NULL);
-
-	EV_JOB (job)->document = g_object_ref (document);
-	job->start_page = start_page;
-	job->current_page = start_page;
-	job->n_pages = n_pages;
-	job->pages = g_new0 (GList *, n_pages);
-	job->text = g_strdup (text);
-	job->case_sensitive = case_sensitive;
-	job->has_results = FALSE;
-
-	return EV_JOB (job);
-}
-
-gint
-ev_job_find_get_n_results (EvJobFind *job,
-			   gint       page)
-{
-	return g_list_length (job->pages[page]);
-}
-
-gdouble
-ev_job_find_get_progress (EvJobFind *job)
-{
-	gint pages_done;
-
-	if (ev_job_is_finished (EV_JOB (job)))
-		return 1.0;
-	
-	if (job->current_page > job->start_page) {
-		pages_done = job->current_page - job->start_page + 1;
-	} else if (job->current_page == job->start_page) {
-		pages_done = job->n_pages;
-	} else {
-		pages_done = job->n_pages - job->start_page + job->current_page;
-	}
-
-	return pages_done / (gdouble) job->n_pages;
-}
-
-gboolean
-ev_job_find_has_results (EvJobFind *job)
-{
-	return job->has_results;
-}
-
-GList **
-ev_job_find_get_results (EvJobFind *job)
-{
-	return job->pages;
-}
-
-/* EvJobLayers */
-static void
-ev_job_layers_init (EvJobLayers *job)
-{
-	EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
-}
-
-static void
-ev_job_layers_dispose (GObject *object)
-{
-	EvJobLayers *job;
-
-	ev_debug_message (DEBUG_JOBS, NULL);
-	
-	job = EV_JOB_LAYERS (object);
-
-	if (job->model) {
-		g_object_unref (job->model);
-		job->model = NULL;
-	}
-
-	(* G_OBJECT_CLASS (ev_job_layers_parent_class)->dispose) (object);
-}
-
-static gboolean
-ev_job_layers_run (EvJob *job)
-{
-	EvJobLayers *job_layers = EV_JOB_LAYERS (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_layers->model = ev_document_layers_get_layers (EV_DOCUMENT_LAYERS (job->document));
-	ev_document_doc_mutex_unlock ();
-	
-	ev_job_succeeded (job);
-	
-	return FALSE;
-}
-
-static void
-ev_job_layers_class_init (EvJobLayersClass *class)
-{
-	GObjectClass *oclass = G_OBJECT_CLASS (class);
-	EvJobClass   *job_class = EV_JOB_CLASS (class);
-
-	oclass->dispose = ev_job_layers_dispose;
-	job_class->run = ev_job_layers_run;
-}
-
-EvJob *
-ev_job_layers_new (EvDocument *document)
-{
-	EvJob *job;
-
-	ev_debug_message (DEBUG_JOBS, NULL);
-
-	job = g_object_new (EV_TYPE_JOB_LAYERS, NULL);
-	job->document = g_object_ref (document);
-	
-	return job;
-}
-
-/* EvJobExport */
-static void
-ev_job_export_init (EvJobExport *job)
-{
-	EV_JOB (job)->run_mode = EV_JOB_RUN_THREAD;
-	job->page = -1;
-}
-
-static void
-ev_job_export_dispose (GObject *object)
-{
-	EvJobExport *job;
-
-	ev_debug_message (DEBUG_JOBS, NULL);
-	
-	job = EV_JOB_EXPORT (object);
-
-	if (job->rc) {
-		g_object_unref (job->rc);
-		job->rc = NULL;
-	}
-
-	(* G_OBJECT_CLASS (ev_job_export_parent_class)->dispose) (object);
-}
-
-static gboolean
-ev_job_export_run (EvJob *job)
-{
-	EvJobExport *job_export = EV_JOB_EXPORT (job);
-	EvPage      *ev_page;
-
-	g_assert (job_export->page != -1);
-
-	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 ();
-	
-	ev_page = ev_document_get_page (job->document, job_export->page);
-	if (job_export->rc) {
-		job->failed = FALSE;
-		job->finished = FALSE;
-		g_clear_error (&job->error);
-		
-		ev_render_context_set_page (job_export->rc, ev_page);
-	} else {
-		job_export->rc = ev_render_context_new (ev_page, 0, 1.0);
-	}
-	g_object_unref (ev_page);
-	
-	ev_file_exporter_do_page (EV_FILE_EXPORTER (job->document), job_export->rc);
-	
-	ev_document_doc_mutex_unlock ();
-	
-	ev_job_succeeded (job);
-	
-	return FALSE;
-}
-
-static void
-ev_job_export_class_init (EvJobExportClass *class)
-{
-	GObjectClass *oclass = G_OBJECT_CLASS (class);
-	EvJobClass   *job_class = EV_JOB_CLASS (class);
-
-	oclass->dispose = ev_job_export_dispose;
-	job_class->run = ev_job_export_run;
-}
-
-EvJob *
-ev_job_export_new (EvDocument *document)
-{
-	EvJob *job;
-
-	ev_debug_message (DEBUG_JOBS, NULL);
-
-	job = g_object_new (EV_TYPE_JOB_EXPORT, NULL);
-	job->document = g_object_ref (document);
-	
-	return job;
-}
-
-void
-ev_job_export_set_page (EvJobExport *job,
-			gint         page)
-{
-	job->page = page;
-}
diff --git a/shell/ev-jobs.h b/shell/ev-jobs.h
deleted file mode 100644
index 5915a28..0000000
--- a/shell/ev-jobs.h
+++ /dev/null
@@ -1,420 +0,0 @@
-/* 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.
- */
-
-#ifndef __EV_JOBS_H__
-#define __EV_JOBS_H__
-
-#include <gio/gio.h>
-#include <gtk/gtk.h>
-
-#include "ev-document.h"
-#include "ev-selection.h"
-#include "ev-render-context.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EvJob EvJob;
-typedef struct _EvJobClass EvJobClass;
-
-typedef struct _EvJobRender EvJobRender;
-typedef struct _EvJobRenderClass EvJobRenderClass;
-
-typedef struct _EvJobThumbnail EvJobThumbnail;
-typedef struct _EvJobThumbnailClass EvJobThumbnailClass;
-
-typedef struct _EvJobLinks EvJobLinks;
-typedef struct _EvJobLinksClass EvJobLinksClass;
-
-typedef struct _EvJobAttachments EvJobAttachments;
-typedef struct _EvJobAttachmentsClass EvJobAttachmentsClass;
-
-typedef struct _EvJobFonts EvJobFonts;
-typedef struct _EvJobFontsClass EvJobFontsClass;
-
-typedef struct _EvJobLoad EvJobLoad;
-typedef struct _EvJobLoadClass EvJobLoadClass;
-
-typedef struct _EvJobSave EvJobSave;
-typedef struct _EvJobSaveClass EvJobSaveClass;
-
-typedef struct _EvJobFind EvJobFind;
-typedef struct _EvJobFindClass EvJobFindClass;
-
-typedef struct _EvJobLayers EvJobLayers;
-typedef struct _EvJobLayersClass EvJobLayersClass;
-
-typedef struct _EvJobExport EvJobExport;
-typedef struct _EvJobExportClass EvJobExportClass;
-
-#define EV_TYPE_JOB		     	     (ev_job_get_type())
-#define EV_JOB(object)		             (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB, EvJob))
-#define EV_JOB_CLASS(klass)	             (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_JOB, EvJobClass))
-#define EV_IS_JOB(object)		     (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB))
-#define EV_JOB_GET_CLASS(object)             (G_TYPE_INSTANCE_GET_CLASS((object), EV_TYPE_JOB, EvJobClass))
-
-#define EV_TYPE_JOB_LINKS		     (ev_job_links_get_type())
-#define EV_JOB_LINKS(object)		     (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB_LINKS, EvJobLinks))
-#define EV_JOB_LINKS_CLASS(klass)	     (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_JOB_LINKS, EvJobLinksClass))
-#define EV_IS_JOB_LINKS(object)		     (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_LINKS))
-
-#define EV_TYPE_JOB_ATTACHMENTS		     (ev_job_attachments_get_type())
-#define EV_JOB_ATTACHMENTS(object)	     (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB_ATTACHMENTS, EvJobAttachments))
-#define EV_JOB_ATTACHMENTS_CLASS(klass)	     (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_JOB_ATTACHMENTS, EvJobAttachmentsClass))
-#define EV_IS_JOB_ATTACHMENTS(object)	     (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_ATTACHMENTS))
-
-#define EV_TYPE_JOB_RENDER		     (ev_job_render_get_type())
-#define EV_JOB_RENDER(object)		     (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB_RENDER, EvJobRender))
-#define EV_JOB_RENDER_CLASS(klass)	     (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_JOB_RENDER, EvJobRenderClass))
-#define EV_IS_JOB_RENDER(object)	     (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_RENDER))
-
-#define EV_TYPE_JOB_THUMBNAIL		     (ev_job_thumbnail_get_type())
-#define EV_JOB_THUMBNAIL(object)	     (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB_THUMBNAIL, EvJobThumbnail))
-#define EV_JOB_THUMBNAIL_CLASS(klass)	     (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_JOB_THUMBNAIL, EvJobThumbnailClass))
-#define EV_IS_JOB_THUMBNAIL(object)	     (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_THUMBNAIL))
-
-#define EV_TYPE_JOB_FONTS		     (ev_job_fonts_get_type())
-#define EV_JOB_FONTS(object)	     	     (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB_FONTS, EvJobFonts))
-#define EV_JOB_FONTS_CLASS(klass)	     (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_JOB_FONTS, EvJobFontsClass))
-#define EV_IS_JOB_FONTS(object)		     (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_FONTS))
-
-#define EV_TYPE_JOB_LOAD		     (ev_job_load_get_type())
-#define EV_JOB_LOAD(object)	     	     (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB_LOAD, EvJobLoad))
-#define EV_JOB_LOAD_CLASS(klass)	     (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_JOB_LOAD, EvJobLoadClass))
-#define EV_IS_JOB_LOAD(object)		     (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_LOAD))
-
-#define EV_TYPE_JOB_SAVE		     (ev_job_save_get_type())
-#define EV_JOB_SAVE(object)	     	     (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB_SAVE, EvJobSave))
-#define EV_JOB_SAVE_CLASS(klass)	     (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_JOB_SAVE, EvJobSaveClass))
-#define EV_IS_JOB_SAVE(object)		     (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_SAVE))
-
-#define EV_TYPE_JOB_FIND                     (ev_job_find_get_type())
-#define EV_JOB_FIND(object)                  (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB_FIND, EvJobFind))
-#define EV_JOB_FIND_CLASS(klass)             (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_JOB_FIND, EvJobFindClass))
-#define EV_IS_JOB_FIND(object)               (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_FIND))
-
-#define EV_TYPE_JOB_LAYERS                   (ev_job_layers_get_type())
-#define EV_JOB_LAYERS(object)                (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB_LAYERS, EvJobLayers))
-#define EV_JOB_LAYERS_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_JOB_LAYERS, EvJobLayersClass))
-#define EV_IS_JOB_LAYERS(object)             (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_LAYERS))
-
-#define EV_TYPE_JOB_EXPORT                    (ev_job_export_get_type())
-#define EV_JOB_EXPORT(object)                 (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB_EXPORT, EvJobExport))
-#define EV_JOB_EXPORT_CLASS(klass)            (G_TYPE_CHECK_CLASS_CAST((klass), EV_TYPE_JOB_EXPORT, EvJobExportClass))
-#define EV_IS_JOB_EXPORT(object)              (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_EXPORT))
-
-typedef enum {
-	EV_JOB_RUN_THREAD,
-	EV_JOB_RUN_MAIN_LOOP
-} EvJobRunMode;
-
-struct _EvJob
-{
-	GObject parent;
-	
-	EvDocument *document;
-
-	EvJobRunMode run_mode;
-
-	guint cancelled : 1;
-	guint finished : 1;
-	guint failed : 1;
-	
-	GError *error;
-	GCancellable *cancellable;
-
-	guint idle_finished_id;
-	guint idle_cancelled_id;
-};
-
-struct _EvJobClass
-{
-	GObjectClass parent_class;
-
-	gboolean (*run)         (EvJob *job);
-	
-	/* Signals */
-	void     (* cancelled)  (EvJob *job);
-	void     (* finished)   (EvJob *job);
-};
-
-struct _EvJobLinks
-{
-	EvJob parent;
-
-	GtkTreeModel *model;
-};
-
-struct _EvJobLinksClass
-{
-	EvJobClass parent_class;
-};
-
-struct _EvJobAttachments
-{
-	EvJob parent;
-
-	GList *attachments;
-};
-
-struct _EvJobAttachmentsClass
-{
-	EvJobClass parent_class;
-};
-
-typedef enum {
-	EV_RENDER_INCLUDE_NONE      = 0,
-	EV_RENDER_INCLUDE_LINKS     = 1 << 0,
-	EV_RENDER_INCLUDE_TEXT      = 1 << 1,
-	EV_RENDER_INCLUDE_SELECTION = 1 << 2,
-	EV_RENDER_INCLUDE_IMAGES    = 1 << 3,
-	EV_RENDER_INCLUDE_FORMS     = 1 << 4,
-	EV_RENDER_INCLUDE_ALL       = (1 << 5) - 1
-} EvRenderFlags;
-
-struct _EvJobRender
-{
-	EvJob parent;
-
-	gint page;
-	gint rotation;
-	gdouble scale;
-
-	EvPage *ev_page;
-	gboolean page_ready;
-	gint target_width;
-	gint target_height;
-	cairo_surface_t *surface;
-
-	GList *link_mapping;
-	GdkRegion *text_mapping;
-	GList *image_mapping;
-	GList *form_field_mapping;
-
-	cairo_surface_t *selection;
-	GdkRegion *selection_region;
-	EvRectangle selection_points;
-	EvSelectionStyle selection_style;
-	GdkColor base;
-	GdkColor text; 
-
-	EvRenderFlags flags;
-};
-
-struct _EvJobRenderClass
-{
-	EvJobClass parent_class;
-
-	void    (* page_ready) (EvJobRender *job);
-};
-
-struct _EvJobThumbnail
-{
-	EvJob parent;
-
-	gint page;
-	gint rotation;
-	gdouble scale;
-	
-	GdkPixbuf *thumbnail;
-};
-
-struct _EvJobThumbnailClass
-{
-	EvJobClass parent_class;
-};
-
-struct _EvJobFonts
-{
-	EvJob parent;
-	gboolean scan_completed;
-};
-
-struct _EvJobFontsClass
-{
-        EvJobClass parent_class;
-
-	/* Signals */
-	void (* updated)  (EvJobFonts *job,
-			   gdouble     progress);
-};
-
-struct _EvJobLoad
-{
-	EvJob parent;
-
-	gchar *uri;
-	gchar *password;
-};
-
-struct _EvJobLoadClass
-{
-	EvJobClass parent_class;
-};
-
-struct _EvJobSave
-{
-	EvJob parent;
-
-	gchar *uri;
-	gchar *document_uri;
-};
-
-struct _EvJobSaveClass
-{
-	EvJobClass parent_class;
-};
-
-struct _EvJobFind
-{
-	EvJob parent;
-
-	gint start_page;
-	gint current_page;
-	gint n_pages;
-	GList **pages;
-	gchar *text;
-	gboolean case_sensitive;
-	gboolean has_results;
-};
-
-struct _EvJobFindClass
-{
-	EvJobClass parent_class;
-
-	/* Signals */
-	void (* updated)  (EvJobFind *job,
-			   gint       page);
-};
-
-struct _EvJobLayers
-{
-	EvJob parent;
-
-	GtkTreeModel *model;
-};
-
-struct _EvJobLayersClass
-{
-	EvJobClass parent_class;
-};
-
-struct _EvJobExport
-{
-	EvJob parent;
-
-	gint page;
-	EvRenderContext *rc;
-};
-
-struct _EvJobExportClass
-{
-	EvJobClass parent_class;
-};
-
-/* Base job class */
-GType           ev_job_get_type           (void) G_GNUC_CONST;
-gboolean        ev_job_run                (EvJob          *job);
-void            ev_job_cancel             (EvJob          *job);
-void            ev_job_failed             (EvJob          *job,
-					   GQuark          domain,
-					   gint            code,
-					   const gchar    *format,
-					   ...);
-void            ev_job_failed_from_error  (EvJob          *job,
-					   GError         *error);
-void            ev_job_succeeded          (EvJob          *job);
-gboolean        ev_job_is_cancelled       (EvJob          *job);
-gboolean        ev_job_is_finished        (EvJob          *job);
-gboolean        ev_job_is_failed          (EvJob          *job);
-EvJobRunMode    ev_job_get_run_mode       (EvJob          *job);
-void            ev_job_set_run_mode       (EvJob          *job,
-					   EvJobRunMode    run_mode);
-
-/* EvJobLinks */
-GType           ev_job_links_get_type     (void) G_GNUC_CONST;
-EvJob          *ev_job_links_new          (EvDocument     *document);
-
-/* EvJobAttachments */
-GType           ev_job_attachments_get_type (void) G_GNUC_CONST;
-EvJob          *ev_job_attachments_new      (EvDocument     *document);
-
-/* EvJobRender */
-GType           ev_job_render_get_type    (void) G_GNUC_CONST;
-EvJob          *ev_job_render_new         (EvDocument      *document,
-					   gint             page,
-					   gint             rotation,
-					   gdouble          scale,
-					   gint             width,
-					   gint             height,
-					   EvRenderFlags    flags);
-void     ev_job_render_set_selection_info (EvJobRender     *job,
-					   EvRectangle     *selection_points,
-					   EvSelectionStyle selection_style,
-					   GdkColor        *text,
-					   GdkColor        *base);
-/* EvJobThumbnail */
-GType           ev_job_thumbnail_get_type (void) G_GNUC_CONST;
-EvJob          *ev_job_thumbnail_new      (EvDocument      *document,
-					   gint             page,
-					   gint             rotation,
-					   gdouble          scale);
-/* EvJobFonts */
-GType 		ev_job_fonts_get_type 	  (void) G_GNUC_CONST;
-EvJob 	       *ev_job_fonts_new 	  (EvDocument      *document);
-
-/* EvJobLoad */
-GType 		ev_job_load_get_type 	  (void) G_GNUC_CONST;
-EvJob 	       *ev_job_load_new 	  (const gchar 	   *uri);
-void            ev_job_load_set_uri       (EvJobLoad       *load,
-					   const gchar     *uri);
-void            ev_job_load_set_password  (EvJobLoad       *job,
-					   const gchar     *password);
-
-/* EvJobSave */
-GType           ev_job_save_get_type      (void) G_GNUC_CONST;
-EvJob          *ev_job_save_new           (EvDocument      *document,
-					   const gchar     *uri,
-					   const gchar     *document_uri);
-/* EvJobFind */
-GType           ev_job_find_get_type      (void) G_GNUC_CONST;
-EvJob          *ev_job_find_new           (EvDocument      *document,
-					   gint             start_page,
-					   gint             n_pages,
-					   const gchar     *text,
-					   gboolean         case_sensitive);
-gint            ev_job_find_get_n_results (EvJobFind       *job,
-					   gint             pages);
-gdouble         ev_job_find_get_progress  (EvJobFind       *job);
-gboolean        ev_job_find_has_results   (EvJobFind       *job);
-GList         **ev_job_find_get_results   (EvJobFind       *job);
-
-/* EvJobLayers */
-GType           ev_job_layers_get_type    (void) G_GNUC_CONST;
-EvJob          *ev_job_layers_new         (EvDocument     *document);
-
-/* EvJobExport */
-GType           ev_job_export_get_type    (void) G_GNUC_CONST;
-EvJob          *ev_job_export_new         (EvDocument     *document);
-void            ev_job_export_set_page    (EvJobExport    *job,
-					   gint            page);
-
-G_END_DECLS
-
-#endif /* __EV_JOBS_H__ */
diff --git a/shell/ev-marshal.list b/shell/ev-marshal.list
index d3b99fd..72f9937 100644
--- a/shell/ev-marshal.list
+++ b/shell/ev-marshal.list
@@ -1,4 +1 @@
-VOID:NONE
-VOID:OBJECT,OBJECT
-VOID:ENUM,BOOLEAN
 VOID:STRING,STRING
diff --git a/shell/ev-page-cache.c b/shell/ev-page-cache.c
deleted file mode 100644
index a8639ef..0000000
--- a/shell/ev-page-cache.c
+++ /dev/null
@@ -1,714 +0,0 @@
-#include <config.h>
-#include "ev-page-cache.h"
-#include "ev-document-thumbnails.h"
-#include "ev-page.h"
-#include <stdlib.h>
-#include <string.h>
-
-#define THUMBNAIL_WIDTH 100
-
-typedef struct _EvPageCacheInfo
-{
-	double width;
-	double height;
-} EvPageCacheInfo;
-
-typedef struct _EvPageThumbsInfo
-{
-	gint width;
-	gint height;
-} EvPageThumbsInfo;
-
-struct _EvPageCache
-{
-	GObject parent;
-
-	gint current_page;
-	int n_pages;
-	char *title;
-	char **page_labels;
-	
-	gint max_label_chars;
-	gboolean has_labels;
-	gboolean uniform;
-	gboolean dual_even_left;
-	
-	double uniform_width;
-	double uniform_height;
-
-	double  max_width;
-	double  max_height;
-
-	double* height_to_page;
-	double* dual_height_to_page;
-
-	int rotation;
-
-	EvPageCacheInfo *size_cache;
-	EvDocumentInfo *page_info;
-
-	/* Thumbnail dimensions */
-	gboolean thumbs_uniform;
-	gint thumbs_uniform_width;
-	gint thumbs_uniform_height;
-	gint thumbs_max_width;
-	gint thumbs_max_height;
-	EvPageThumbsInfo *thumbs_size_cache;
-};
-
-struct _EvPageCacheClass
-{
-	GObjectClass parent_class;
-
-	void (* page_changed) (EvPageCache *page_cache, gint page);
-	void (* history_changed) (EvPageCache *page_cache, gint page);
-};
-
-enum
-{
-	PAGE_CHANGED,
-	HISTORY_CHANGED,
-	N_SIGNALS,
-};
-
-static guint signals[N_SIGNALS] = {0, };
-
-static void ev_page_cache_init       (EvPageCache      *page_cache);
-static void ev_page_cache_class_init (EvPageCacheClass *page_cache);
-static void ev_page_cache_finalize   (GObject *object);
-
-G_DEFINE_TYPE (EvPageCache, ev_page_cache, G_TYPE_OBJECT)
-
-static void
-ev_page_cache_init (EvPageCache *page_cache)
-{
-	page_cache->current_page = -1;
-	page_cache->max_label_chars = 0;
-}
-
-static void
-ev_page_cache_class_init (EvPageCacheClass *class)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (class);
-
-	object_class->finalize = ev_page_cache_finalize;
-
-	signals [PAGE_CHANGED] =
-		g_signal_new ("page-changed",
-			      EV_TYPE_PAGE_CACHE,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EvPageCacheClass, page_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__INT,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_INT);
-
-	signals [HISTORY_CHANGED] =
-		g_signal_new ("history-changed",
-			      EV_TYPE_PAGE_CACHE,
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EvPageCacheClass, history_changed),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__INT,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_INT);
-
-}
-
-static void
-ev_page_cache_finalize (GObject *object)
-{
-	EvPageCache *page_cache;
-
-	page_cache = EV_PAGE_CACHE (object);
-
-	if (page_cache->title) {
-		g_free (page_cache->title);
-		page_cache->title = NULL;
-	}
-
-	if (page_cache->size_cache) {
-		g_free (page_cache->size_cache);
-		page_cache->size_cache = NULL;
-	}
-
-	if (page_cache->thumbs_size_cache) {
-		g_free (page_cache->thumbs_size_cache);
-		page_cache->thumbs_size_cache = NULL;
-	}
-
-	if (page_cache->height_to_page) {
-		g_free (page_cache->height_to_page);
-		page_cache->height_to_page = NULL;
-	}
-
-	if (page_cache->dual_height_to_page) {
-		g_free (page_cache->dual_height_to_page);
-		page_cache->dual_height_to_page = NULL;
-	}
-
-	if (page_cache->page_labels) {
-		gint i;
-
-		for (i = 0; i < page_cache->n_pages; i++) {
-			if (page_cache->page_labels[i])
-				g_free (page_cache->page_labels[i]);
-		}
-		g_free (page_cache->page_labels);
-		page_cache->page_labels = NULL;
-	}
-
-	if (page_cache->page_info) {
-		ev_document_info_free (page_cache->page_info);
-		page_cache->page_info = NULL;
-	}
-
-	G_OBJECT_CLASS (ev_page_cache_parent_class)->finalize (object);
-}
-
-static void
-build_height_to_page (EvPageCache *page_cache)
-{
-	gboolean swap;
-	int i;
-	double uniform_height, page_height, next_page_height;
-	double saved_height;
-
-	swap = (page_cache->rotation == 90 ||
-		page_cache->rotation == 270);
-
-	g_free (page_cache->height_to_page);
-	g_free (page_cache->dual_height_to_page);
-
-	page_cache->height_to_page = g_new0(double, page_cache->n_pages + 1);
-	page_cache->dual_height_to_page = g_new0(double, page_cache->n_pages + 2);
-	
-	saved_height = 0;
-	for (i = 0; i <= page_cache->n_pages; i++) {
-		if (page_cache->uniform) {
-			if (!swap) {
-				uniform_height = page_cache->uniform_height;
-			} else {
-				uniform_height = page_cache->uniform_width;
-			}
-			page_cache->height_to_page [i] = i * uniform_height;
-		} else {
-			if (i < page_cache->n_pages) {
-				if (!swap) {
-					page_height = page_cache->size_cache [i].height;
-				} else {
-					page_height = page_cache->size_cache [i].width;
-				}
-			} else {
-				page_height = 0;
-			}
-			page_cache->height_to_page [i] = saved_height;
-			saved_height += page_height;
-		}
-	}
-
-	if (page_cache->dual_even_left && !page_cache->uniform) {
-		if (!swap) {
-			saved_height = page_cache->size_cache [0].height;
-		} else {
-			saved_height = page_cache->size_cache [0].width;
-		}
-	} else {
-		saved_height = 0;
-	}
-	for (i = page_cache->dual_even_left; i < page_cache->n_pages + 2; i += 2) {
-    		if (page_cache->uniform) {
-			if (!swap) {
-				uniform_height = page_cache->uniform_height;
-			} else {
-				uniform_height = page_cache->uniform_width;
-			}
-			page_cache->dual_height_to_page [i] = ((i + page_cache->dual_even_left) / 2) * uniform_height;
-			if (i + 1 < page_cache->n_pages + 2)
-				page_cache->dual_height_to_page [i + 1] = ((i + page_cache->dual_even_left) / 2) * uniform_height;
-		} else {
-			if (i + 1 < page_cache->n_pages) {
-				if (!swap) {
-					next_page_height = page_cache->size_cache [i + 1].height;
-				} else {
-					next_page_height = page_cache->size_cache [i + 1].width;
-				}
-			} else {
-				next_page_height = 0;
-			}
-			if (i < page_cache->n_pages) {
-				if (!swap) {
-					page_height = page_cache->size_cache [i].height;
-				} else {
-					page_height = page_cache->size_cache [i].width;
-				}
-			} else {
-				page_height = 0;
-			}
-			if (i + 1 < page_cache->n_pages + 2) {
-				page_cache->dual_height_to_page [i] = saved_height;
-				page_cache->dual_height_to_page [i + 1] = saved_height;
-				saved_height += MAX(page_height, next_page_height);
-			} else {
-				page_cache->dual_height_to_page [i] = saved_height;
-			}
-		}
-	}
-}
-
-EvPageCache *
-ev_page_cache_new (EvDocument *document)
-{
-	EvPageCache *page_cache;
-	EvPageCacheInfo *info;
-	EvPageThumbsInfo *thumb_info;
-	EvRenderContext *rc = NULL;
-	gboolean has_thumbs;
-	gint i;
-
-	page_cache = (EvPageCache *) g_object_new (EV_TYPE_PAGE_CACHE, NULL);
-
-	ev_document_doc_mutex_lock ();
-
-	/* We read page information out of the document */
-
-	/* Assume all pages are the same size until proven otherwise */
-	page_cache->uniform = TRUE;
-	page_cache->has_labels = FALSE;
-	page_cache->n_pages = ev_document_get_n_pages (document);
-	page_cache->dual_even_left = (page_cache->n_pages > 2);
-	page_cache->page_labels = g_new0 (char *, page_cache->n_pages);
-	page_cache->max_width = 0;
-	page_cache->max_height = 0;
-	page_cache->page_info = ev_document_get_info (document);
-	page_cache->thumbs_uniform = TRUE;
-
-	if (page_cache->page_info->fields_mask & EV_DOCUMENT_INFO_TITLE) {
-		page_cache->title = g_strdup (page_cache->page_info->title);
-	} else {
-		page_cache->title = NULL;
-	}
-
-	has_thumbs = EV_IS_DOCUMENT_THUMBNAILS (document);
-	
-	for (i = 0; i < page_cache->n_pages; i++) {
-		EvPage *page;
-		double  page_width = 0;
-		double  page_height = 0;
-		gint    thumb_width = 0;
-		gint    thumb_height = 0;
-
-		page = ev_document_get_page (document, i);
-		
-		ev_document_get_page_size (document, page, &page_width, &page_height);
-
-	    	page_cache->page_labels[i] = ev_document_get_page_label (document, page);
-		
-		if (page_cache->page_labels[i] != NULL) {
-		
-			page_cache->max_label_chars = MAX (page_cache->max_label_chars, 
-							   g_utf8_strlen (page_cache->page_labels[i], 256));
-			if (!page_cache->has_labels) {
-				gchar *expected_label;
-			
-				expected_label = g_strdup_printf ("%d", i + 1);
-				if (strcmp (expected_label, page_cache->page_labels[i]))  
-					page_cache->has_labels = TRUE;
-				g_free (expected_label);
-			}
-		}
-
-		if (page_width > page_cache->max_width) {
-			page_cache->max_width = page_width;
-		}
-
-		if (page_height > page_cache->max_height) {
-			page_cache->max_height = page_height;
-		}
-			
-		if (i == 0) {
-			page_cache->uniform_width = page_width;
-			page_cache->uniform_height = page_height;
-		} else if (page_cache->uniform &&
-			   (page_cache->uniform_width != page_width ||
-			    page_cache->uniform_height != page_height)) {
-			/* It's a different page size.  Backfill the array. */
-			int j;
-
-			page_cache->size_cache = g_new0 (EvPageCacheInfo, page_cache->n_pages);
-
-			for (j = 0; j < i; j++) {
-				info = &(page_cache->size_cache [j]);
-				info->width = page_cache->uniform_width;
-				info->height = page_cache->uniform_height;
-			}
-			page_cache->uniform = FALSE;
-
-		}
-
-		if (! page_cache->uniform) {
-			info = &(page_cache->size_cache [i]);
-
-			info->width = page_width;
-			info->height = page_height;
-		}
-
-		if (!has_thumbs) {
-			g_object_unref (page);
-			continue;
-		}
-
-		if (!rc) {
-			rc = ev_render_context_new (page, 0, (gdouble)THUMBNAIL_WIDTH / page_width);
-		} else {
-			ev_render_context_set_page (rc, page);
-			ev_render_context_set_scale (rc, (gdouble)THUMBNAIL_WIDTH / page_width);
-		}
-
-		ev_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (document),
-						       rc, &thumb_width, &thumb_height);
-		
-		if (thumb_width > page_cache->thumbs_max_width) {
-			page_cache->thumbs_max_width = thumb_width;
-		}
-
-		if (thumb_height > page_cache->thumbs_max_height) {
-			page_cache->thumbs_max_height = thumb_height;
-		}
-			
-		if (i == 0) {
-			page_cache->thumbs_uniform_width = thumb_width;
-			page_cache->thumbs_uniform_height = thumb_height;
-		} else if (page_cache->thumbs_uniform &&
-			   (page_cache->thumbs_uniform_width != thumb_width ||
-			    page_cache->thumbs_uniform_height != thumb_height)) {
-			/* It's a different thumbnail size.  Backfill the array. */
-			int j;
-
-			page_cache->thumbs_size_cache = g_new0 (EvPageThumbsInfo, page_cache->n_pages);
-
-			for (j = 0; j < i; j++) {
-				thumb_info = &(page_cache->thumbs_size_cache [j]);
-				thumb_info->width = page_cache->thumbs_uniform_width;
-				thumb_info->height = page_cache->thumbs_uniform_height;
-			}
-			page_cache->thumbs_uniform = FALSE;
-		}
-
-		if (! page_cache->thumbs_uniform) {
-			thumb_info = &(page_cache->thumbs_size_cache [i]);
-
-			thumb_info->width = thumb_width;
-			thumb_info->height = thumb_height;
-		}
-
-		g_object_unref (page);
-	}
-
-	if (rc) {
-		g_object_unref (rc);
-	}
-
-	build_height_to_page (page_cache);
-
-	/* make some sanity check assertions */
-	if (! page_cache->uniform)
-		g_assert (page_cache->size_cache != NULL);
-	if (page_cache->uniform && page_cache->n_pages > 0)
-		g_assert (page_cache->uniform_width > 0 && page_cache->uniform_height > 0);
-
-	ev_document_doc_mutex_unlock ();
-
-	if (page_cache->n_pages > 0)
-		ev_page_cache_set_current_page (page_cache, 0);
-
-	return page_cache;
-}
-
-gint
-ev_page_cache_get_n_pages (EvPageCache *page_cache)
-{
-	g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), 0);
-
-	return page_cache->n_pages;
-}
-
-gint
-ev_page_cache_get_current_page (EvPageCache *page_cache)
-{
-	g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), 0);
-
-	return page_cache->current_page;
-}
-
-void
-ev_page_cache_set_current_page (EvPageCache *page_cache,
-				int          page)
-{
-	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
-	g_return_if_fail (page >= 0 || page < page_cache->n_pages);
-
-	if (page == page_cache->current_page)
-		return;
-
-	page_cache->current_page = page;
-	g_signal_emit (page_cache, signals[PAGE_CHANGED], 0, page);
-}
-
-void
-ev_page_cache_set_current_page_history (EvPageCache *page_cache,
-					int          page)
-{
-	if (abs (page - page_cache->current_page) > 1)
-		g_signal_emit (page_cache, signals [HISTORY_CHANGED], 0, page);
-	
-	ev_page_cache_set_current_page (page_cache, page);
-}
-
-gboolean
-ev_page_cache_set_page_label (EvPageCache *page_cache,
-			      const char  *page_label)
-{
-	gint i, page;
-	long value;
-	char *endptr = NULL;
-	
-	g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), FALSE);
-	g_return_val_if_fail (page_label != NULL, FALSE);
-
-	/* First, look for a literal label match */
-	for (i = 0; i < page_cache->n_pages; i ++) {
-		if (page_cache->page_labels[i] != NULL &&
-		    ! strcmp (page_label, page_cache->page_labels[i])) {
-			ev_page_cache_set_current_page (page_cache, i);
-			return TRUE;
-		}
-	}
-
-	/* Second, look for a match with case insensitively */
-	for (i = 0; i < page_cache->n_pages; i++) {
-		if (page_cache->page_labels[i] != NULL &&
-		    ! strcasecmp (page_label, page_cache->page_labels[i])) {
-			ev_page_cache_set_current_page (page_cache, i);
-			return TRUE;
-		}
-	}
-
-	/* Next, parse the label, and see if the number fits */
-	value = strtol (page_label, &endptr, 10);
-	if (endptr[0] == '\0') {
-		/* Page number is an integer */
-		page = MIN (G_MAXINT, value);
-
-		/* convert from a page label to a page offset */
-		page --;
-		if (page >= 0 &&
-		    page < page_cache->n_pages) {
-			ev_page_cache_set_current_page (page_cache, page);
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-const char *
-ev_page_cache_get_title (EvPageCache *page_cache)
-{
-	g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), NULL);
-
-	return page_cache->title;
-}
-
-void
-ev_page_cache_get_size (EvPageCache  *page_cache,
-			gint          page,
-			gint          rotation,
-			gfloat        scale,
-			gint         *width,
-			gint         *height)
-{
-	double w, h;
-
-	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
-	g_return_if_fail (page >= 0 && page < page_cache->n_pages);
-
-	if (page_cache->uniform) {
-		w = page_cache->uniform_width;
-		h = page_cache->uniform_height;
-	} else {
-		EvPageCacheInfo *info;
-
-		info = &(page_cache->size_cache [page]);
-		
-		w = info->width;
-		h = info->height;
-	}
-
-	w = w * scale + 0.5;
-	h = h * scale + 0.5;
-
-	if (rotation == 0 || rotation == 180) {
-		if (width) *width = (int)w;
-		if (height) *height = (int)h;
-	} else {
-		if (width) *width = (int)h;
-		if (height) *height = (int)w;
-	}
-}
-
-void
-ev_page_cache_get_max_width (EvPageCache   *page_cache,
-			     gint	    rotation,
-			     gfloat         scale,
-			     gint          *width)
-{
-	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
-
-	if (width) {
-		if (rotation == 0 || rotation == 180) {
-			*width = page_cache->max_width * scale;
-		} else {
-			*width = page_cache->max_height * scale;
-		}
-	}
-}
-
-void
-ev_page_cache_get_max_height (EvPageCache   *page_cache,
-			      gint           rotation,
-			      gfloat         scale,
-			      gint          *height)
-{
-	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
-
-	if (height) {
-		if (rotation == 0 || rotation == 180) {
-			*height = page_cache->max_height * scale;
-		} else {
-			*height = page_cache->max_width * scale;
-		}
-	}
-}
-
-void    
-ev_page_cache_get_height_to_page (EvPageCache   *page_cache,
-				  gint           page,
-				  gint           rotation,
-				  gfloat         scale,
-				  gint          *height,
-				  gint 	        *dual_height)
-{
-	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
-	g_return_if_fail (page >= 0);
-	g_return_if_fail (!height || page <= page_cache->n_pages);
-	g_return_if_fail (!dual_height || page <= page_cache->n_pages + 1);
-
-	if (page_cache->rotation != rotation) {
-		page_cache->rotation = rotation;
-		build_height_to_page (page_cache);
-	}
-	
-	if (height)
-		*height = page_cache->height_to_page [page] * scale;
-
-	if (dual_height)
-		*dual_height = page_cache->dual_height_to_page [page] * scale;
-}
-
-void
-ev_page_cache_get_thumbnail_size (EvPageCache  *page_cache,
-				  gint          page,
-				  gint          rotation,
-				  gint         *width,
-				  gint         *height)
-{
-	gint w, h;
-
-	g_return_if_fail (EV_IS_PAGE_CACHE (page_cache));
-	g_return_if_fail (page >= 0 && page < page_cache->n_pages);
-
-	if (page_cache->thumbs_uniform) {
-		w = page_cache->thumbs_uniform_width;
-		h = page_cache->thumbs_uniform_height;
-	} else {
-		EvPageThumbsInfo *info;
-
-		info = &(page_cache->thumbs_size_cache [page]);
-		
-		w = info->width;
-		h = info->height;
-	}
-
-	if (rotation == 0 || rotation == 180) {
-		if (width) *width = w;
-		if (height) *height = h;
-	} else {
-		if (width) *width = h;
-		if (height) *height = w;
-	}
-}
-
-gint
-ev_page_cache_get_max_label_chars (EvPageCache *page_cache)
-{
-	g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), 0);
-	
-	return page_cache->max_label_chars;
-}
-
-gboolean
-ev_page_cache_get_dual_even_left (EvPageCache *page_cache)
-{
-	g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), 0);
-	
-	return page_cache->dual_even_left;
-}
-
-gchar *
-ev_page_cache_get_page_label (EvPageCache *page_cache,
-			      gint         page)
-{
-	g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), NULL);
-	g_return_val_if_fail (page >= 0 && page < page_cache->n_pages, NULL);
-
-	if (page_cache->page_labels[page] == NULL)
-		return g_strdup_printf ("%d", page + 1);
-
-	return g_strdup (page_cache->page_labels[page]);
-}
-
-gboolean
-ev_page_cache_has_nonnumeric_page_labels (EvPageCache *page_cache)
-{
-	g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), FALSE);
-	return page_cache->has_labels;
-}
-
-const EvDocumentInfo *
-ev_page_cache_get_info (EvPageCache *page_cache)
-{
-	g_return_val_if_fail (EV_IS_PAGE_CACHE (page_cache), NULL);
-
-	return page_cache->page_info;
-}
-
-#define PAGE_CACHE_STRING "ev-page-cache"
-
-EvPageCache *
-ev_page_cache_get (EvDocument *document)
-{
-	EvPageCache *page_cache;
-
-	g_return_val_if_fail (EV_IS_DOCUMENT (document), NULL);
-
-	page_cache = g_object_get_data (G_OBJECT (document), PAGE_CACHE_STRING);
-	if (page_cache == NULL) {
-		page_cache = ev_page_cache_new (document);
-		g_object_set_data_full (G_OBJECT (document), PAGE_CACHE_STRING, page_cache, g_object_unref);
-	}
-
-	return page_cache;
-}
diff --git a/shell/ev-page-cache.h b/shell/ev-page-cache.h
deleted file mode 100644
index 43f4553..0000000
--- a/shell/ev-page-cache.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* this file is part of evince, a gnome document viewer
- *
- *  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.
- */
-
-#ifndef __EV_PAGE_CACHE_H__
-#define __EV_PAGE_CACHE_H__
-
-#include <gtk/gtk.h>
-
-#include "ev-document.h"
-
-G_BEGIN_DECLS
-#define EV_TYPE_PAGE_CACHE            (ev_page_cache_get_type ())
-#define EV_PAGE_CACHE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EV_TYPE_PAGE_CACHE, EvPageCache))
-#define EV_IS_PAGE_CACHE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EV_TYPE_PAGE_CACHE))
-
-GType          ev_page_cache_get_type            (void) G_GNUC_CONST;
-
-/* Used by ev-document.c only */
-EvPageCache   *ev_page_cache_new                 (EvDocument    *document);
-gint           ev_page_cache_get_n_pages         (EvPageCache   *page_cache);
-const char    *ev_page_cache_get_title           (EvPageCache   *page_cache);
-void           ev_page_cache_get_size            (EvPageCache   *page_cache,
-						  gint           page,
-						  gint           rotation,
-						  gfloat         scale,
-						  gint          *width,
-						  gint          *height);
-void           ev_page_cache_get_max_width       (EvPageCache   *page_cache,
-						  gint           rotation,
-						  gfloat         scale,
-						  gint          *width);
-void           ev_page_cache_get_max_height      (EvPageCache   *page_cache,
-						  gint           rotation,
-						  gfloat         scale,
-						  gint          *height);
-void           ev_page_cache_get_height_to_page  (EvPageCache   *page_cache,
-						  gint           page,
-						  gint           rotation,
-						  gfloat         scale,
-						  gint          *height,
-						  gint	        *dual_height);
-void           ev_page_cache_get_thumbnail_size  (EvPageCache   *page_cache,
-						  gint           page,
-						  gint           rotation,
-						  gint          *width,
-						  gint          *height);
-gint           ev_page_cache_get_max_label_chars (EvPageCache   *page_cache);
-char          *ev_page_cache_get_page_label      (EvPageCache   *page_cache,
-						  gint           page);
-gboolean       ev_page_cache_has_nonnumeric_page_labels (EvPageCache *page_cache);
-const EvDocumentInfo *ev_page_cache_get_info            (EvPageCache *page_cache);
-
-gboolean       ev_page_cache_get_dual_even_left  (EvPageCache *page_cache);
-
-/* Navigation */
-gint           ev_page_cache_get_current_page    (EvPageCache *page_cache);
-void           ev_page_cache_set_current_page    (EvPageCache *page_cache,
-						  int          page);
-void           ev_page_cache_set_current_page_history  (EvPageCache *page_cache,
-							int          page);
-gboolean       ev_page_cache_set_page_label      (EvPageCache *page_cache,
-						  const char  *page_label);
-
-EvPageCache   *ev_page_cache_get		 (EvDocument *document);
-
-
-G_END_DECLS
-
-#endif /* __EV_PAGE_CACHE_H__ */
diff --git a/shell/ev-pixbuf-cache.c b/shell/ev-pixbuf-cache.c
deleted file mode 100644
index 46976af..0000000
--- a/shell/ev-pixbuf-cache.c
+++ /dev/null
@@ -1,1252 +0,0 @@
-#include <config.h>
-#include "ev-pixbuf-cache.h"
-#include "ev-job-scheduler.h"
-#include "ev-page-cache.h"
-#include "ev-document-images.h"
-#include "ev-document-forms.h"
-#include "ev-image.h"
-#include "ev-form-field.h"
-
-typedef struct _CacheJobInfo
-{
-	EvJob *job;
-	EvRenderContext *rc;
-	gboolean page_ready;
-
-	/* Region of the page that needs to be drawn */
-	GdkRegion *region; 
-
-	/* Data we get from rendering */
-	cairo_surface_t *surface;
-	GList *link_mapping;
-	GList *image_mapping;
-	GList *form_field_mapping;
-	GdkRegion *text_mapping;
-	
-	/* Selection data. 
-	 * Selection_points are the coordinates encapsulated in selection.
-	 * target_points is the target selection size. */
-	EvRectangle      selection_points;
-	EvRectangle      target_points;
-	EvSelectionStyle selection_style;
-	gboolean         points_set;
-	
-	cairo_surface_t *selection;
-	GdkRegion *selection_region;
-} CacheJobInfo;
-
-struct _EvPixbufCache
-{
-	GObject parent;
-
-	/* We keep a link to our containing view just for style information. */
-	GtkWidget *view;
-	EvDocument *document;
-	int start_page;
-	int end_page;
-
-	/* preload_cache_size is the number of pages prior to the current
-	 * visible area that we cache.  It's normally 1, but could be 2 in the
-	 * case of twin pages.
-	 */
-	int preload_cache_size;
-	CacheJobInfo *prev_job;
-	CacheJobInfo *job_list;
-	CacheJobInfo *next_job;
-};
-
-struct _EvPixbufCacheClass
-{
-	GObjectClass parent_class;
-
-	void (* job_finished) (EvPixbufCache *pixbuf_cache);
-};
-
-
-enum
-{
-	JOB_FINISHED,
-	N_SIGNALS,
-};
-
-static guint signals[N_SIGNALS] = {0, };
-
-static void          ev_pixbuf_cache_init       (EvPixbufCache      *pixbuf_cache);
-static void          ev_pixbuf_cache_class_init (EvPixbufCacheClass *pixbuf_cache);
-static void          ev_pixbuf_cache_finalize   (GObject            *object);
-static void          ev_pixbuf_cache_dispose    (GObject            *object);
-static void          job_page_ready_cb          (EvJob              *job,
-						 EvPixbufCache      *pixbuf_cache);
-static void          job_finished_cb            (EvJob              *job,
-						 EvPixbufCache      *pixbuf_cache);
-static CacheJobInfo *find_job_cache             (EvPixbufCache      *pixbuf_cache,
-						 int                 page);
-static void          copy_job_to_job_info       (EvJobRender        *job_render,
-						 CacheJobInfo       *job_info,
-						 EvPixbufCache      *pixbuf_cache);
-static void          copy_job_page_and_selection_to_job_info (EvJobRender        *job_render,
-							      CacheJobInfo       *job_info,
-							      EvPixbufCache      *pixbuf_cache);
-static gboolean      new_selection_surface_needed(EvPixbufCache      *pixbuf_cache,
-						  CacheJobInfo       *job_info,
-						  gint                page,
-						  gfloat              scale);
-
-
-/* These are used for iterating through the prev and next arrays */
-#define FIRST_VISIBLE_PREV(pixbuf_cache) \
-	(MAX (0, pixbuf_cache->preload_cache_size - pixbuf_cache->start_page))
-#define VISIBLE_NEXT_LEN(pixbuf_cache, page_cache) \
-	(MIN(pixbuf_cache->preload_cache_size, ev_page_cache_get_n_pages (page_cache) - (1 + pixbuf_cache->end_page)))
-#define PAGE_CACHE_LEN(pixbuf_cache) \
-	((pixbuf_cache->end_page - pixbuf_cache->start_page) + 1)
-
-G_DEFINE_TYPE (EvPixbufCache, ev_pixbuf_cache, G_TYPE_OBJECT)
-
-static void
-ev_pixbuf_cache_init (EvPixbufCache *pixbuf_cache)
-{
-	pixbuf_cache->start_page = 0;
-	pixbuf_cache->end_page = 0;
-	pixbuf_cache->job_list = g_new0 (CacheJobInfo, PAGE_CACHE_LEN (pixbuf_cache));
-
-	pixbuf_cache->preload_cache_size = 2;
-	pixbuf_cache->prev_job = g_new0 (CacheJobInfo, pixbuf_cache->preload_cache_size);
-	pixbuf_cache->next_job = g_new0 (CacheJobInfo, pixbuf_cache->preload_cache_size);
-}
-
-static void
-ev_pixbuf_cache_class_init (EvPixbufCacheClass *class)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (class);
-
-	object_class->finalize = ev_pixbuf_cache_finalize;
-	object_class->dispose = ev_pixbuf_cache_dispose;
-
-	signals[JOB_FINISHED] =
-		g_signal_new ("job-finished",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-			      G_STRUCT_OFFSET (EvPixbufCacheClass, job_finished),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__POINTER,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_POINTER);
-}
-
-static void
-ev_pixbuf_cache_finalize (GObject *object)
-{
-	EvPixbufCache *pixbuf_cache;
-
-	pixbuf_cache = EV_PIXBUF_CACHE (object);
-
-	g_free (pixbuf_cache->prev_job);
-	g_free (pixbuf_cache->job_list);
-	g_free (pixbuf_cache->next_job);
-
-	G_OBJECT_CLASS (ev_pixbuf_cache_parent_class)->finalize (object);
-}
-
-static void
-dispose_cache_job_info (CacheJobInfo *job_info,
-			gpointer      data)
-{
-	if (job_info == NULL)
-		return;
-	if (job_info->job) {
-		g_signal_handlers_disconnect_by_func (job_info->job,
-						      G_CALLBACK (job_page_ready_cb),
-						      data);
-		g_signal_handlers_disconnect_by_func (job_info->job,
-						      G_CALLBACK (job_finished_cb),
-						      data);
-		ev_job_cancel (job_info->job);
-		g_object_unref (job_info->job);
-		job_info->job = NULL;
-	}
-	if (job_info->surface) {
-		cairo_surface_destroy (job_info->surface);
-		job_info->surface = NULL;
-	}
-	if (job_info->region) {
-		gdk_region_destroy (job_info->region);
-		job_info->region = NULL;
-	}
-	if (job_info->link_mapping) {
-		ev_link_mapping_free (job_info->link_mapping);
-		job_info->link_mapping = NULL;
-	}
-	if (job_info->image_mapping) {
-		ev_image_mapping_free (job_info->image_mapping);
-		job_info->image_mapping = NULL;
-	}
-	if (job_info->form_field_mapping) {
-		ev_form_field_mapping_free (job_info->form_field_mapping);
-		job_info->form_field_mapping = NULL;
-	}
-	if (job_info->text_mapping) {
-		gdk_region_destroy (job_info->text_mapping);
-		job_info->text_mapping = NULL;
-	}
-	if (job_info->selection) {
-		cairo_surface_destroy (job_info->selection);
-		job_info->selection = NULL;
-	}
-	if (job_info->selection_region) {
-		gdk_region_destroy (job_info->selection_region);
-		job_info->selection_region = NULL;
-	}
-	if (job_info->rc) {
-		g_object_unref (G_OBJECT (job_info->rc));
-		job_info->rc = NULL;
-	}
-
-	job_info->points_set = FALSE;
-}
-
-static void
-ev_pixbuf_cache_dispose (GObject *object)
-{
-	EvPixbufCache *pixbuf_cache;
-	int i;
-
-	pixbuf_cache = EV_PIXBUF_CACHE (object);
-
-	for (i = 0; i < pixbuf_cache->preload_cache_size; i++) {
-		dispose_cache_job_info (pixbuf_cache->prev_job + i, pixbuf_cache);
-		dispose_cache_job_info (pixbuf_cache->next_job + i, pixbuf_cache);
-	}
-
-	for (i = 0; i < PAGE_CACHE_LEN (pixbuf_cache); i++) {
-		dispose_cache_job_info (pixbuf_cache->job_list + i, pixbuf_cache);
-	}
-
-	G_OBJECT_CLASS (ev_pixbuf_cache_parent_class)->dispose (object);
-}
-
-
-EvPixbufCache *
-ev_pixbuf_cache_new (GtkWidget  *view,
-		     EvDocument *document)
-{
-	EvPixbufCache *pixbuf_cache;
-
-	pixbuf_cache = (EvPixbufCache *) g_object_new (EV_TYPE_PIXBUF_CACHE, NULL);
-	/* This is a backlink, so we don't ref this */ 
-	pixbuf_cache->view = view;
-	pixbuf_cache->document = document;
-
-	return pixbuf_cache;
-}
-
-static void
-job_page_ready_cb (EvJob         *job,
-		   EvPixbufCache *pixbuf_cache)
-{
-	CacheJobInfo *job_info;
-	EvJobRender *job_render = EV_JOB_RENDER (job);
-
-	/* If the job is outside of our interest, we silently discard it */
-	if ((job_render->page < (pixbuf_cache->start_page - pixbuf_cache->preload_cache_size)) ||
-	    (job_render->page > (pixbuf_cache->end_page + pixbuf_cache->preload_cache_size))) {
-		g_object_unref (job);
-		return;
-	}
-
-	job_info = find_job_cache (pixbuf_cache, job_render->page);
-
-	copy_job_page_and_selection_to_job_info (job_render, job_info, pixbuf_cache);
-	g_signal_emit (pixbuf_cache, signals[JOB_FINISHED], 0, job_info->region);
-}
-
-static void
-job_finished_cb (EvJob         *job,
-		 EvPixbufCache *pixbuf_cache)
-{
-	CacheJobInfo *job_info;
-	EvJobRender *job_render = EV_JOB_RENDER (job);
-
-	/* If the job is outside of our interest, we silently discard it */
-	if ((job_render->page < (pixbuf_cache->start_page - pixbuf_cache->preload_cache_size)) ||
-	    (job_render->page > (pixbuf_cache->end_page + pixbuf_cache->preload_cache_size))) {
-		g_object_unref (job);
-		return;
-	}
-
-	job_info = find_job_cache (pixbuf_cache, job_render->page);
-	copy_job_to_job_info (job_render, job_info, pixbuf_cache);
-}
-
-/* This checks a job to see if the job would generate the right sized pixbuf
- * given a scale.  If it won't, it removes the job and clears it to NULL.
- */
-static void
-check_job_size_and_unref (EvPixbufCache *pixbuf_cache,
-			  CacheJobInfo *job_info,
-			  EvPageCache  *page_cache,
-			  gfloat        scale)
-{
-	gint width;
-	gint height;
-
-	g_assert (job_info);
-
-	if (job_info->job == NULL)
-		return;
-
-	ev_page_cache_get_size (page_cache,
-				EV_JOB_RENDER (job_info->job)->page,
-				EV_JOB_RENDER (job_info->job)->rotation,
-				scale,
-				&width, &height);
-				
-	if (width == EV_JOB_RENDER (job_info->job)->target_width &&
-	    height == EV_JOB_RENDER (job_info->job)->target_height)
-		return;
-
-	g_signal_handlers_disconnect_by_func (job_info->job,
-					      G_CALLBACK (job_page_ready_cb),
-					      pixbuf_cache);
-	g_signal_handlers_disconnect_by_func (job_info->job,
-					      G_CALLBACK (job_finished_cb),
-					      pixbuf_cache);
-	ev_job_cancel (job_info->job);
-	g_object_unref (job_info->job);
-	job_info->job = NULL;
-}
-
-/* Do all function that copies a job from an older cache to it's position in the
- * new cache.  It clears the old job if it doesn't have a place.
- */
-static void
-move_one_job (CacheJobInfo  *job_info,
-	      EvPixbufCache *pixbuf_cache,
-	      int            page,
-	      CacheJobInfo  *new_job_list,
-	      CacheJobInfo  *new_prev_job,
-	      CacheJobInfo  *new_next_job,
-	      int            start_page,
-	      int            end_page,
-	      gint           priority)
-{
-	CacheJobInfo *target_page = NULL;
-	int page_offset;
-	gint new_priority;
-
-	if (page < (start_page - pixbuf_cache->preload_cache_size) ||
-	    page > (end_page + pixbuf_cache->preload_cache_size)) {
-		dispose_cache_job_info (job_info, pixbuf_cache);
-		return;
-	}
-
-	/* find the target page to copy it over to. */
-	if (page < start_page) {
-		page_offset = (page - (start_page - pixbuf_cache->preload_cache_size));
-
-		g_assert (page_offset >= 0 &&
-			  page_offset < pixbuf_cache->preload_cache_size);
-		target_page = new_prev_job + page_offset;
-		new_priority = EV_JOB_PRIORITY_LOW;
-	} else if (page > end_page) {
-		page_offset = (page - (end_page + 1));
-
-		g_assert (page_offset >= 0 &&
-			  page_offset < pixbuf_cache->preload_cache_size);
-		target_page = new_next_job + page_offset;
-		new_priority = EV_JOB_PRIORITY_LOW;
-	} else {
-		page_offset = page - start_page;
-		g_assert (page_offset >= 0 &&
-			  page_offset <= ((end_page - start_page) + 1));
-		new_priority = EV_JOB_PRIORITY_URGENT;
-		target_page = new_job_list + page_offset;
-	}
-
-	*target_page = *job_info;
-	job_info->job = NULL;
-	job_info->region = NULL;
-	job_info->surface = NULL;
-	job_info->link_mapping = NULL;
-	job_info->image_mapping = NULL;
-	job_info->form_field_mapping = NULL;
-
-	if (new_priority != priority && target_page->job) {
-		ev_job_scheduler_update_job (target_page->job, new_priority);
-	}
-}
-
-static void
-ev_pixbuf_cache_update_range (EvPixbufCache *pixbuf_cache,
-			      gint           start_page,
-			      gint           end_page)
-{
-	CacheJobInfo *new_job_list;
-	CacheJobInfo *new_prev_job;
-	CacheJobInfo *new_next_job;
-	EvPageCache *page_cache;
-	int i, page;
-
-	if (pixbuf_cache->start_page == start_page &&
-	    pixbuf_cache->end_page == end_page)
-		return;
-
-	page_cache = ev_page_cache_get (pixbuf_cache->document);
-
-	new_job_list = g_new0 (CacheJobInfo, (end_page - start_page) + 1);
-	new_prev_job = g_new0 (CacheJobInfo, pixbuf_cache->preload_cache_size);
-	new_next_job = g_new0 (CacheJobInfo, pixbuf_cache->preload_cache_size);
-
-	/* We go through each job in the old cache and either clear it or move
-	 * it to a new location. */
-
-	/* Start with the prev cache. */
-	page = pixbuf_cache->start_page - pixbuf_cache->preload_cache_size;
-	for (i = 0; i < pixbuf_cache->preload_cache_size; i++) {
-		if (page < 0) {
-			dispose_cache_job_info (pixbuf_cache->prev_job + i, pixbuf_cache);
-		} else {
-			move_one_job (pixbuf_cache->prev_job + i,
-				      pixbuf_cache, page,
-				      new_job_list, new_prev_job, new_next_job,
-				      start_page, end_page, EV_JOB_PRIORITY_LOW);
-		}
-		page ++;
-	}
-
-	page = pixbuf_cache->start_page;
-	for (i = 0; i < PAGE_CACHE_LEN (pixbuf_cache); i++) {
-		move_one_job (pixbuf_cache->job_list + i,
-			      pixbuf_cache, page,
-			      new_job_list, new_prev_job, new_next_job,
-			      start_page, end_page, EV_JOB_PRIORITY_URGENT);
-		page ++;
-	}
-
-	for (i = 0; i < pixbuf_cache->preload_cache_size; i++) {
-		if (page >= ev_page_cache_get_n_pages (page_cache)) {
-			dispose_cache_job_info (pixbuf_cache->next_job + i, pixbuf_cache);
-		} else {
-			move_one_job (pixbuf_cache->next_job + i,
-				      pixbuf_cache, page,
-				      new_job_list, new_prev_job, new_next_job,
-				      start_page, end_page, EV_JOB_PRIORITY_LOW);
-		}
-		page ++;
-	}
-
-	g_free (pixbuf_cache->job_list);
-	g_free (pixbuf_cache->prev_job);
-	g_free (pixbuf_cache->next_job);
-
-	pixbuf_cache->job_list = new_job_list;
-	pixbuf_cache->prev_job = new_prev_job;
-	pixbuf_cache->next_job = new_next_job;
-
-	pixbuf_cache->start_page = start_page;
-	pixbuf_cache->end_page = end_page;
-}
-
-static void
-copy_job_page_and_selection_to_job_info (EvJobRender   *job_render,
-					 CacheJobInfo  *job_info,
-					 EvPixbufCache *pixbuf_cache)
-{
-	if (job_info->rc == NULL) {
-		job_info->rc = ev_render_context_new (job_render->ev_page,
-						      job_render->rotation,
-						      job_render->scale);
-	} else {
-		ev_render_context_set_page (job_info->rc, job_render->ev_page);
-		ev_render_context_set_rotation (job_info->rc, job_render->rotation);
-		ev_render_context_set_scale (job_info->rc, job_render->scale);
-	}
-	
-	if (job_info->surface) {
-		cairo_surface_destroy (job_info->surface);
-	}
-	job_info->surface = cairo_surface_reference (job_render->surface);
-
-	job_info->points_set = FALSE;
-	if (job_render->flags & EV_RENDER_INCLUDE_SELECTION) {
-		if (job_info->selection) {
-			cairo_surface_destroy (job_info->selection);
-			job_info->selection = NULL;
-		}
-		if (job_info->selection_region) {
-			gdk_region_destroy (job_info->selection_region);
-			job_info->selection_region = NULL;
-		}
-		
-		job_info->selection_points = job_render->selection_points;
-		job_info->selection_region = gdk_region_copy (job_render->selection_region);
-		job_info->selection = cairo_surface_reference (job_render->selection);
-		g_assert (job_info->selection_points.x1 >= 0);
-		job_info->points_set = TRUE;
-	}
-
-	if (job_info->job) {
-		g_signal_handlers_disconnect_by_func (job_info->job,
-						      G_CALLBACK (job_page_ready_cb),
-						      pixbuf_cache);
-	}
-
-	job_info->page_ready = TRUE;
-}
-
-static void
-copy_job_to_job_info (EvJobRender   *job_render,
-		      CacheJobInfo  *job_info,
-		      EvPixbufCache *pixbuf_cache)
-{
-	if (!job_info->page_ready) {
-		g_signal_emit (pixbuf_cache, signals[JOB_FINISHED], 0, job_info->region);
-		copy_job_page_and_selection_to_job_info (job_render,
-							 job_info,
-							 pixbuf_cache);
-	}
-	
-	if (job_render->flags & EV_RENDER_INCLUDE_LINKS) {
-		if (job_info->link_mapping)
-			ev_link_mapping_free (job_info->link_mapping);
-		job_info->link_mapping = job_render->link_mapping;
-	}
-
-	if (job_render->flags & EV_RENDER_INCLUDE_IMAGES) {
-		if (job_info->image_mapping)
-			ev_image_mapping_free (job_info->image_mapping);
-		job_info->image_mapping = job_render->image_mapping;
-	}
-
-	if (job_render->flags & EV_RENDER_INCLUDE_FORMS) {
-		if (job_info->form_field_mapping)
-			ev_form_field_mapping_free (job_info->form_field_mapping);
-		job_info->form_field_mapping = job_render->form_field_mapping;
-	}
-
-	if (job_render->flags & EV_RENDER_INCLUDE_TEXT) {
-		if (job_info->text_mapping)
-			gdk_region_destroy (job_info->text_mapping);
-		job_info->text_mapping = job_render->text_mapping;
-	}
-
-	if (job_info->job) {
-		g_signal_handlers_disconnect_by_func (job_info->job,
-						      G_CALLBACK (job_finished_cb),
-						      pixbuf_cache);
-		ev_job_cancel (job_info->job);
-		g_object_unref (job_info->job);
-		job_info->job = NULL;
-	}
-}
-
-static CacheJobInfo *
-find_job_cache (EvPixbufCache *pixbuf_cache,
-		int            page)
-{
-	int page_offset;
-
-	if (page < (pixbuf_cache->start_page - pixbuf_cache->preload_cache_size) ||
-	    page > (pixbuf_cache->end_page + pixbuf_cache->preload_cache_size))
-		return NULL;
-
-	if (page < pixbuf_cache->start_page) {
-		page_offset = (page - (pixbuf_cache->start_page - pixbuf_cache->preload_cache_size));
-
-		g_assert (page_offset >= 0 &&
-			  page_offset < pixbuf_cache->preload_cache_size);
-		return pixbuf_cache->prev_job + page_offset;
-	}
-
-	if (page > pixbuf_cache->end_page) {
-		page_offset = (page - (pixbuf_cache->end_page + 1));
-
-		g_assert (page_offset >= 0 &&
-			  page_offset < pixbuf_cache->preload_cache_size);
-		return pixbuf_cache->next_job + page_offset;
-	}
-
-	page_offset = page - pixbuf_cache->start_page;
-	g_assert (page_offset >= 0 &&
-		  page_offset <= PAGE_CACHE_LEN(pixbuf_cache));
-	return pixbuf_cache->job_list + page_offset;
-}
-
-static void
-ev_pixbuf_cache_clear_job_sizes (EvPixbufCache *pixbuf_cache,
-				 gfloat         scale)
-{
-	EvPageCache *page_cache;
-	int i;
-
-	page_cache = ev_page_cache_get (pixbuf_cache->document);
-
-	for (i = 0; i < PAGE_CACHE_LEN (pixbuf_cache); i++) {
-		check_job_size_and_unref (pixbuf_cache, pixbuf_cache->job_list + i, page_cache, scale);
-	}
-
-	for (i = 0; i < pixbuf_cache->preload_cache_size; i++) {
-		check_job_size_and_unref (pixbuf_cache, pixbuf_cache->prev_job + i, page_cache, scale);
-		check_job_size_and_unref (pixbuf_cache, pixbuf_cache->next_job + i, page_cache, scale);
-	}
-}
-
-static void
-get_selection_colors (GtkWidget *widget, GdkColor **text, GdkColor **base)
-{
-    if (GTK_WIDGET_HAS_FOCUS (widget)) {
-	*text = &widget->style->text [GTK_STATE_SELECTED];
-	*base = &widget->style->base [GTK_STATE_SELECTED];
-    } else {
-	*text = &widget->style->text [GTK_STATE_ACTIVE];
-	*base = &widget->style->base [GTK_STATE_ACTIVE];
-    }
-}
-
-static void
-add_job (EvPixbufCache *pixbuf_cache,
-	 CacheJobInfo  *job_info,
-	 EvPageCache   *page_cache,
-	 GdkRegion     *region,
-	 gint           width,
-	 gint           height,
-	 gint           page,
-	 gint           rotation,
-	 gfloat         scale,
-	 EvJobPriority  priority)
-{
-	EvRenderFlags flags = 0;
-
-	job_info->page_ready = FALSE;
-	
-	if (job_info->region)
-		gdk_region_destroy (job_info->region);
-	job_info->region = region ? gdk_region_copy (region) : NULL;
-
-	/* Figure out what else we need for this job */
-	if (job_info->link_mapping == NULL)
-		flags |= EV_RENDER_INCLUDE_LINKS;
-	if (job_info->image_mapping == NULL)
-		flags |= EV_RENDER_INCLUDE_IMAGES;
-	if (job_info->form_field_mapping == NULL)
-		flags |= EV_RENDER_INCLUDE_FORMS;
-	if (job_info->text_mapping == NULL)
-		flags |= EV_RENDER_INCLUDE_TEXT;
-
-	job_info->job = ev_job_render_new (pixbuf_cache->document,
-					   page, rotation, scale,
-					   width, height,
-					   flags);
-	
-	if (new_selection_surface_needed (pixbuf_cache, job_info, page, scale)) {
-		GdkColor *text, *base;
-
-		gtk_widget_ensure_style (pixbuf_cache->view);
-		get_selection_colors (pixbuf_cache->view, &text, &base);
-		ev_job_render_set_selection_info (EV_JOB_RENDER (job_info->job), 
-						  &(job_info->target_points),
-						  job_info->selection_style,
-						  text, base);
-	}
-
-	g_signal_connect (G_OBJECT (job_info->job), "page-ready",
-			  G_CALLBACK (job_page_ready_cb),
-			  pixbuf_cache);
-	g_signal_connect (G_OBJECT (job_info->job), "finished",
-			  G_CALLBACK (job_finished_cb),
-			  pixbuf_cache);
-	ev_job_scheduler_push_job (job_info->job, priority);
-}
-
-static void
-add_job_if_needed (EvPixbufCache *pixbuf_cache,
-		   CacheJobInfo  *job_info,
-		   EvPageCache   *page_cache,
-		   gint           page,
-		   gint           rotation,
-		   gfloat         scale,
-		   EvJobPriority  priority)
-{
-	gint width, height;
-
-	if (job_info->job)
-		return;
-
-	ev_page_cache_get_size (page_cache, page, rotation,
-				scale, &width, &height);
-
-	if (job_info->surface &&
-	    cairo_image_surface_get_width (job_info->surface) == width &&
-	    cairo_image_surface_get_height (job_info->surface) == height)
-		return;
-
-	add_job (pixbuf_cache, job_info, page_cache, NULL,
-		 width, height, page, rotation, scale,
-		 priority);
-}
-
-static void
-ev_pixbuf_cache_add_jobs_if_needed (EvPixbufCache *pixbuf_cache,
-				    gint           rotation,
-				    gfloat         scale)
-{
-	EvPageCache *page_cache;
-	CacheJobInfo *job_info;
-	int page;
-	int i;
-
-	page_cache = ev_page_cache_get (pixbuf_cache->document);
-
-	for (i = 0; i < PAGE_CACHE_LEN (pixbuf_cache); i++) {
-		job_info = (pixbuf_cache->job_list + i);
-		page = pixbuf_cache->start_page + i;
-
-		add_job_if_needed (pixbuf_cache, job_info,
-				   page_cache, page, rotation, scale,
-				   EV_JOB_PRIORITY_URGENT);
-	}
-
-	for (i = FIRST_VISIBLE_PREV(pixbuf_cache); i < pixbuf_cache->preload_cache_size; i++) {
-		job_info = (pixbuf_cache->prev_job + i);
-		page = pixbuf_cache->start_page - pixbuf_cache->preload_cache_size + i;
-
-		add_job_if_needed (pixbuf_cache, job_info,
-				   page_cache, page, rotation, scale,
-				   EV_JOB_PRIORITY_LOW);
-	}
-
-	for (i = 0; i < VISIBLE_NEXT_LEN(pixbuf_cache, page_cache); i++) {
-		job_info = (pixbuf_cache->next_job + i);
-		page = pixbuf_cache->end_page + 1 + i;
-
-		add_job_if_needed (pixbuf_cache, job_info,
-				   page_cache, page, rotation, scale,
-				   EV_JOB_PRIORITY_LOW);
-	}
-
-}
-
-void
-ev_pixbuf_cache_set_page_range (EvPixbufCache  *pixbuf_cache,
-				gint            start_page,
-				gint            end_page,
-				gint            rotation,
-				gfloat          scale,
-				GList          *selection_list)
-{
-	EvPageCache *page_cache;
-
-	g_return_if_fail (EV_IS_PIXBUF_CACHE (pixbuf_cache));
-
-	page_cache = ev_page_cache_get (pixbuf_cache->document);
-
-	g_return_if_fail (start_page >= 0 && start_page < ev_page_cache_get_n_pages (page_cache));
-	g_return_if_fail (end_page >= 0 && end_page < ev_page_cache_get_n_pages (page_cache));
-	g_return_if_fail (end_page >= start_page);
-
-	/* First, resize the page_range as needed.  We cull old pages
-	 * mercilessly. */
-	ev_pixbuf_cache_update_range (pixbuf_cache, start_page, end_page);
-
-	/* Then, we update the current jobs to see if any of them are the wrong
-	 * size, we remove them if we need to. */
-	ev_pixbuf_cache_clear_job_sizes (pixbuf_cache, scale);
-
-	/* Next, we update the target selection for our pages */
-	ev_pixbuf_cache_set_selection_list (pixbuf_cache, selection_list);
-
-	/* Finally, we add the new jobs for all the sizes that don't have a
-	 * pixbuf */
-	ev_pixbuf_cache_add_jobs_if_needed (pixbuf_cache, rotation, scale);
-}
-
-cairo_surface_t *
-ev_pixbuf_cache_get_surface (EvPixbufCache *pixbuf_cache,
-			     gint           page)
-{
-	CacheJobInfo *job_info;
-
-	job_info = find_job_cache (pixbuf_cache, page);
-	if (job_info == NULL)
-		return NULL;
-
-	if (job_info->page_ready)
-		return job_info->surface;
-	
-	/* We don't need to wait for the idle to handle the callback */
-	if (job_info->job &&
-	    EV_JOB_RENDER (job_info->job)->page_ready) {
-		copy_job_page_and_selection_to_job_info (EV_JOB_RENDER (job_info->job), job_info, pixbuf_cache);
-		g_signal_emit (pixbuf_cache, signals[JOB_FINISHED], 0, job_info->region);
-	}
-
-	return job_info->surface;
-}
-
-GList *
-ev_pixbuf_cache_get_link_mapping (EvPixbufCache *pixbuf_cache,
-				  gint           page)
-{
-	CacheJobInfo *job_info;
-
-	job_info = find_job_cache (pixbuf_cache, page);
-	if (job_info == NULL)
-		return NULL;
-
-	/* We don't need to wait for the idle to handle the callback */
-	if (job_info->job &&
-	    EV_JOB (job_info->job)->finished) {
-		copy_job_to_job_info (EV_JOB_RENDER (job_info->job), job_info, pixbuf_cache);
-	}
-
-	return job_info->link_mapping;
-}
-
-GList *
-ev_pixbuf_cache_get_image_mapping (EvPixbufCache *pixbuf_cache,
-				   gint           page)
-{
-	CacheJobInfo *job_info;
-
-	if (!EV_IS_DOCUMENT_IMAGES (pixbuf_cache->document))
-		return NULL;
-	
-	job_info = find_job_cache (pixbuf_cache, page);
-	if (job_info == NULL)
-		return NULL;
-
-	/* We don't need to wait for the idle to handle the callback */
-	if (job_info->job &&
-	    EV_JOB (job_info->job)->finished) {
-		copy_job_to_job_info (EV_JOB_RENDER (job_info->job), job_info, pixbuf_cache);
-	}
-
-	return job_info->image_mapping;
-}
-
-GList *
-ev_pixbuf_cache_get_form_field_mapping (EvPixbufCache *pixbuf_cache,
-				  	gint 	       page)
-{
-	CacheJobInfo *job_info;
-
-	if (!EV_IS_DOCUMENT_FORMS (pixbuf_cache->document))
-		return NULL;
-	
-	job_info = find_job_cache (pixbuf_cache, page);
-	if (job_info == NULL)
-		return NULL;
-
-	/* We don't need to wait for the idle to handle the callback */
-	if (job_info->job &&
-	   EV_JOB (job_info->job)->finished) {
-		copy_job_to_job_info (EV_JOB_RENDER(job_info->job), job_info, pixbuf_cache);
-	}
-	
-	return job_info->form_field_mapping;
-}
-
-static gboolean
-new_selection_surface_needed (EvPixbufCache *pixbuf_cache,
-			      CacheJobInfo  *job_info,
-			      gint           page,
-			      gfloat         scale)
-{
-	EvPageCache *page_cache;
-
-	if (job_info->selection && job_info->rc) {
-		gint width, height;
-		gint selection_width, selection_height;
-		
-		page_cache = ev_page_cache_get (pixbuf_cache->document);
-		ev_page_cache_get_size (page_cache, page,
-					job_info->rc->rotation,
-					scale, &width, &height);
-
-		selection_width = cairo_image_surface_get_width (job_info->selection);
-		selection_height = cairo_image_surface_get_height (job_info->selection);
-		
-		if (width != selection_width || height != selection_height)
-			return TRUE;
-	} else {
-		if (job_info->points_set)
-			return TRUE;
-	}
-	
-	return FALSE;
-}
-
-static void
-clear_selection_if_needed (EvPixbufCache *pixbuf_cache,
-			   CacheJobInfo  *job_info,
-			   gint           page,
-			   gfloat         scale)
-{
-	if (new_selection_surface_needed (pixbuf_cache, job_info, page, scale)) {
-		if (job_info->selection)
-			cairo_surface_destroy (job_info->selection);
-		job_info->selection = NULL;
-		job_info->selection_points.x1 = -1;
-	}
-}
-
-GdkRegion *
-ev_pixbuf_cache_get_text_mapping (EvPixbufCache *pixbuf_cache,
-				  gint           page)
-{
-	CacheJobInfo *job_info;
-
-	job_info = find_job_cache (pixbuf_cache, page);
-	if (job_info == NULL)
-		return NULL;
-
-	/* We don't need to wait for the idle to handle the callback */
-	if (job_info->job &&
-	    EV_JOB (job_info->job)->finished) {
-		copy_job_to_job_info (EV_JOB_RENDER (job_info->job), job_info, pixbuf_cache);
-	}
-	
-	return job_info->text_mapping;
-}
-
-/* Clears the cache of jobs and pixbufs.
- */
-void
-ev_pixbuf_cache_clear (EvPixbufCache *pixbuf_cache)
-{
-	int i;
-
-	for (i = 0; i < pixbuf_cache->preload_cache_size; i++) {
-		dispose_cache_job_info (pixbuf_cache->prev_job + i, pixbuf_cache);
-		dispose_cache_job_info (pixbuf_cache->next_job + i, pixbuf_cache);
-	}
-
-	for (i = 0; i < PAGE_CACHE_LEN (pixbuf_cache); i++) {
-		dispose_cache_job_info (pixbuf_cache->job_list + i, pixbuf_cache);
-	}
-}
-
-
-void
-ev_pixbuf_cache_style_changed (EvPixbufCache *pixbuf_cache)
-{
-	gint i;
-
-	/* FIXME: doesn't update running jobs. */
-	for (i = 0; i < pixbuf_cache->preload_cache_size; i++) {
-		CacheJobInfo *job_info;
-
-		job_info = pixbuf_cache->prev_job + i;
-		if (job_info->selection) {
-			cairo_surface_destroy (job_info->selection);
-			job_info->selection = NULL;
-		}
-
-		job_info = pixbuf_cache->next_job + i;
-		if (job_info->selection) {
-			cairo_surface_destroy (job_info->selection);
-			job_info->selection = NULL;
-		}
-	}
-
-	for (i = 0; i < PAGE_CACHE_LEN (pixbuf_cache); i++) {
-		CacheJobInfo *job_info;
-
-		job_info = pixbuf_cache->job_list + i;
-		if (job_info->selection) {
-			cairo_surface_destroy (job_info->selection);
-			job_info->selection = NULL;
-		}
-	}
-}
-
-cairo_surface_t *
-ev_pixbuf_cache_get_selection_surface (EvPixbufCache  *pixbuf_cache,
-				       gint            page,
-				       gfloat          scale,
-				       GdkRegion     **region)
-{
-	CacheJobInfo *job_info;
-
-	/* the document does not implement the selection interface */
-	if (!EV_IS_SELECTION (pixbuf_cache->document))
-		return NULL;
-
-	job_info = find_job_cache (pixbuf_cache, page);
-	if (job_info == NULL)
-		return NULL;
-
-	/* No selection on this page */
-	if (!job_info->points_set)
-		return NULL;
-
-	/* Create new render context if needed (selection + fast scrolling) */
-	if (job_info->rc == NULL) {
-		EvPage  *ev_page;
-		ev_page = ev_document_get_page (pixbuf_cache->document, page);
-		job_info->rc = ev_render_context_new (ev_page, 0, scale);
-		g_object_unref (ev_page);
-	}
-
-	/* Update the rc */
-	ev_render_context_set_scale (job_info->rc, scale);
-
-	/* If we have a running job, we just return what we have under the
-	 * assumption that it'll be updated later and we can scale it as need
-	 * be */
-	if (job_info->job && (EV_JOB_RENDER (job_info->job)->flags & EV_RENDER_INCLUDE_SELECTION))
-		return job_info->selection;
-
-	/* Now, lets see if we need to resize the image.  If we do, we clear the
-	 * old one. */
-	clear_selection_if_needed (pixbuf_cache, job_info, page, scale);
-
-	/* Finally, we see if the two scales are the same, and get a new pixbuf
-	 * if needed.  We do this synchronously for now.  At some point, we
-	 * _should_ be able to get rid of the doc_mutex, so the synchronicity
-	 * doesn't kill us.  Rendering a few glyphs should really be fast.
-	 */
-	if (ev_rect_cmp (&(job_info->target_points), &(job_info->selection_points))) {
-		EvRectangle *old_points;
-		GdkColor *text, *base;
-
-		/* we need to get a new selection pixbuf */
-		ev_document_doc_mutex_lock ();
-		if (job_info->selection_points.x1 < 0) {
-			g_assert (job_info->selection == NULL);
-			old_points = NULL;
-		} else {
-			g_assert (job_info->selection != NULL);
-			old_points = &(job_info->selection_points);
-		}
-
-		if (job_info->selection_region)
-			gdk_region_destroy (job_info->selection_region);
-		job_info->selection_region =
-			ev_selection_get_selection_region (EV_SELECTION (pixbuf_cache->document),
-							   job_info->rc,
-							   job_info->selection_style,
-							   &(job_info->target_points));
-
-		gtk_widget_ensure_style (pixbuf_cache->view);
-
-		get_selection_colors (pixbuf_cache->view, &text, &base);
-
-		ev_selection_render_selection (EV_SELECTION (pixbuf_cache->document),
-					       job_info->rc, &(job_info->selection),
-					       &(job_info->target_points),
-					       old_points,
-					       job_info->selection_style,
-					       text, base);
-		job_info->selection_points = job_info->target_points;
-		ev_document_doc_mutex_unlock ();
-	}
-	if (region)
-		*region = job_info->selection_region;
-	return job_info->selection;
-}
-
-static void
-update_job_selection (CacheJobInfo    *job_info,
-		      EvViewSelection *selection)
-{
-	job_info->points_set = TRUE;		
-	job_info->target_points = selection->rect;
-	job_info->selection_style = selection->style;
-}
-
-static void
-clear_job_selection (CacheJobInfo *job_info)
-{
-	job_info->points_set = FALSE;
-	job_info->selection_points.x1 = -1;
-
-	if (job_info->selection) {
-		cairo_surface_destroy (job_info->selection);
-		job_info->selection = NULL;
-	}
-}
-
-/* This function will reset the selection on pages that no longer have them, and
- * will update the target_selection on those that need it.  It will _not_ free
- * the previous selection_list -- that's up to caller to do.
- */
-void
-ev_pixbuf_cache_set_selection_list (EvPixbufCache *pixbuf_cache,
-				    GList         *selection_list)
-{
-	EvPageCache *page_cache;
-	EvViewSelection *selection;
-	GList *list = selection_list;
-	int page;
-	int i;
-
-	g_return_if_fail (EV_IS_PIXBUF_CACHE (pixbuf_cache));
-
-	if (!EV_IS_SELECTION (pixbuf_cache->document))
-		return;
-
-	page_cache = ev_page_cache_get (pixbuf_cache->document);
-
-	/* We check each area to see what needs updating, and what needs freeing; */
-	page = pixbuf_cache->start_page - pixbuf_cache->preload_cache_size;
-	for (i = 0; i < pixbuf_cache->preload_cache_size; i++) {
-		if (page < 0) {
-			page ++;
-			continue;
-		}
-
-		selection = NULL;
-		while (list) {
-			if (((EvViewSelection *)list->data)->page == page) {
-				selection = list->data;
-				break;
-			} else if (((EvViewSelection *)list->data)->page > page) 
-				break;
-			list = list->next;
-		}
-
-		if (selection)
-			update_job_selection (pixbuf_cache->prev_job + i, selection);
-		else
-			clear_job_selection (pixbuf_cache->prev_job + i);
-		page ++;
-	}
-
-	page = pixbuf_cache->start_page;
-	for (i = 0; i < PAGE_CACHE_LEN (pixbuf_cache); i++) {
-		selection = NULL;
-		while (list) {
-			if (((EvViewSelection *)list->data)->page == page) {
-				selection = list->data;
-				break;
-			} else if (((EvViewSelection *)list->data)->page > page) 
-				break;
-			list = list->next;
-		}
-
-		if (selection)
-			update_job_selection (pixbuf_cache->job_list + i, selection);
-		else
-			clear_job_selection (pixbuf_cache->job_list + i);
-		page ++;
-	}
-
-	for (i = 0; i < pixbuf_cache->preload_cache_size; i++) {
-		if (page >= ev_page_cache_get_n_pages (page_cache))
-			break;
-
-		selection = NULL;
-		while (list) {
-			if (((EvViewSelection *)list->data)->page == page) {
-				selection = list->data;
-				break;
-			} else if (((EvViewSelection *)list->data)->page > page) 
-				break;
-			list = list->next;
-		}
-
-		if (selection)
-			update_job_selection (pixbuf_cache->next_job + i, selection);
-		else
-			clear_job_selection (pixbuf_cache->next_job + i);
-		page ++;
-	}
-}
-
-
-/* Returns what the pixbuf cache thinks is */
-
-GList *
-ev_pixbuf_cache_get_selection_list (EvPixbufCache *pixbuf_cache)
-{
-	EvPageCache *page_cache;
-	EvViewSelection *selection;
-	GList *retval = NULL;
-	int page;
-	int i;
-
-	g_return_val_if_fail (EV_IS_PIXBUF_CACHE (pixbuf_cache), NULL);
-
-	page_cache = ev_page_cache_get (pixbuf_cache->document);
-
-	/* We check each area to see what needs updating, and what needs freeing; */
-	page = pixbuf_cache->start_page - pixbuf_cache->preload_cache_size;
-	for (i = 0; i < pixbuf_cache->preload_cache_size; i++) {
-		if (page < 0) {
-			page ++;
-			continue;
-		}
-
-		if (pixbuf_cache->prev_job[i].selection_points.x1 != -1) {
-			selection = g_new0 (EvViewSelection, 1);
-			selection->page = page;
-			selection->rect = pixbuf_cache->prev_job[i].selection_points;
-			if (pixbuf_cache->prev_job[i].selection_region)
-				selection->covered_region = gdk_region_copy (pixbuf_cache->prev_job[i].selection_region);
-			retval = g_list_append (retval, selection);
-		}
-		
-		page ++;
-	}
-
-	page = pixbuf_cache->start_page;
-	for (i = 0; i < PAGE_CACHE_LEN (pixbuf_cache); i++) {
-		if (pixbuf_cache->job_list[i].selection_points.x1 != -1) {
-			selection = g_new0 (EvViewSelection, 1);
-			selection->page = page;
-			selection->rect = pixbuf_cache->job_list[i].selection_points;
-			if (pixbuf_cache->job_list[i].selection_region)
-				selection->covered_region = gdk_region_copy (pixbuf_cache->job_list[i].selection_region);
-			retval = g_list_append (retval, selection);
-		}
-		
-		page ++;
-	}
-
-	for (i = 0; i < pixbuf_cache->preload_cache_size; i++) {
-		if (page >= ev_page_cache_get_n_pages (page_cache))
-			break;
-
-		if (pixbuf_cache->next_job[i].selection_points.x1 != -1) {
-			selection = g_new0 (EvViewSelection, 1);
-			selection->page = page;
-			selection->rect = pixbuf_cache->next_job[i].selection_points;
-			if (pixbuf_cache->next_job[i].selection_region)
-				selection->covered_region = gdk_region_copy (pixbuf_cache->next_job[i].selection_region);
-			retval = g_list_append (retval, selection);
-		}
-		
-		page ++;
-	}
-
-	return retval;
-}
-
-void           
-ev_pixbuf_cache_reload_page (EvPixbufCache *pixbuf_cache,
-			     GdkRegion     *region,
-			     gint           page,
-			     gint           rotation,
-			     gdouble        scale)
-{
-	CacheJobInfo *job_info;
-        EvPageCache *page_cache;
-        gint width, height;
-
-	job_info = find_job_cache (pixbuf_cache, page);
-	if (job_info == NULL)
-		return;
-	
-        page_cache = ev_page_cache_get (pixbuf_cache->document);
-	ev_page_cache_get_size (page_cache, page, rotation, scale,
-				&width, &height);
-
-        add_job (pixbuf_cache, job_info, page_cache, region,
-		 width, height, page, rotation, scale,
-		 EV_JOB_PRIORITY_URGENT);
-}
-
-
diff --git a/shell/ev-pixbuf-cache.h b/shell/ev-pixbuf-cache.h
deleted file mode 100644
index 5e48f28..0000000
--- a/shell/ev-pixbuf-cache.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* this file is part of evince, a gnome document viewer
- *
- *  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.
- */
-
-/* This File is basically an extention of EvView, and is out here just to keep
- * ev-view.c from exploding.
- */
-
-#ifndef __EV_PIXBUF_CACHE_H__
-#define __EV_PIXBUF_CACHE_H__
-
-#include <gtk/gtk.h>
-
-#include "ev-document.h"
-#include "ev-selection.h"
-
-G_BEGIN_DECLS
-
-#define EV_TYPE_PIXBUF_CACHE            (ev_pixbuf_cache_get_type ())
-#define EV_PIXBUF_CACHE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EV_TYPE_PIXBUF_CACHE, EvPixbufCache))
-#define EV_IS_PIXBUF_CACHE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EV_TYPE_PIXBUF_CACHE))
-
-
-
-/* The coordinates in the rect here are at scale == 1.0, so that we can ignore
- * resizings.  There is one per page, maximum.
- */
-typedef struct {
-	int page;
-	EvRectangle rect;
-	GdkRegion *covered_region;
-	EvSelectionStyle style;
-} EvViewSelection;
-
-typedef struct _EvPixbufCache       EvPixbufCache;
-typedef struct _EvPixbufCacheClass  EvPixbufCacheClass;
-
-GType          ev_pixbuf_cache_get_type             (void) G_GNUC_CONST;
-EvPixbufCache *ev_pixbuf_cache_new                  (GtkWidget     *view,
-						     EvDocument    *document);
-void           ev_pixbuf_cache_set_page_range       (EvPixbufCache *pixbuf_cache,
-						     gint           start_page,
-						     gint           end_page,
-						     gint	    rotation,
-						     gfloat         scale,
-						     GList          *selection_list);
-cairo_surface_t *ev_pixbuf_cache_get_surface        (EvPixbufCache *pixbuf_cache,
-						     gint           page);
-GList         *ev_pixbuf_cache_get_link_mapping     (EvPixbufCache *pixbuf_cache,
-						     gint           page);
-GList         *ev_pixbuf_cache_get_image_mapping    (EvPixbufCache *pixbuf_cache,
-						     gint           page);
-GdkRegion     *ev_pixbuf_cache_get_text_mapping     (EvPixbufCache *pixbuf_cache,
-						     gint           page);
-GList 	      *ev_pixbuf_cache_get_form_field_mapping (EvPixbufCache *pixbuf_cache,
-						       gint 	    page);
-void           ev_pixbuf_cache_clear                (EvPixbufCache *pixbuf_cache);
-void           ev_pixbuf_cache_style_changed        (EvPixbufCache *pixbuf_cache);
-void           ev_pixbuf_cache_reload_page 	    (EvPixbufCache *pixbuf_cache,
-						     GdkRegion     *region,
-                    				     gint           page,
-			                             gint           rotation,
-                         			     gdouble         scale);
-/* Selection */
-cairo_surface_t *ev_pixbuf_cache_get_selection_surface (EvPixbufCache *pixbuf_cache,
-							gint           page,
-							gfloat         scale,
-							GdkRegion     **region);
-void           ev_pixbuf_cache_set_selection_list   (EvPixbufCache *pixbuf_cache,
-						     GList         *selection_list);
-GList         *ev_pixbuf_cache_get_selection_list   (EvPixbufCache *pixbuf_cache);
-
-G_END_DECLS
-
-#endif /* __EV_PIXBUF_CACHE_H__ */
diff --git a/shell/ev-timeline.c b/shell/ev-timeline.c
deleted file mode 100644
index 1545dff..0000000
--- a/shell/ev-timeline.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/* ev-timeline.c
- *  this file is part of evince, a gnome document viewer
- *
- * Copyright (C) 2007 Carlos Garnacho <carlos@imendio.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <glib.h>
-#include <math.h>
-#include <gdk/gdk.h>
-#include "ev-timeline.h"
-
-#define EV_TIMELINE_GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EV_TYPE_TIMELINE, EvTimelinePriv))
-#define MSECS_PER_SEC 1000
-#define FRAME_INTERVAL(nframes) (MSECS_PER_SEC / nframes)
-#define DEFAULT_FPS 30
-
-typedef struct EvTimelinePriv EvTimelinePriv;
-
-struct EvTimelinePriv {
-	guint duration;
-	guint fps;
-	guint source_id;
-
-	GTimer *timer;
-
-	guint loop : 1;
-};
-
-enum {
-	PROP_0,
-	PROP_FPS,
-	PROP_DURATION,
-	PROP_LOOP
-};
-
-enum {
-	STARTED,
-	PAUSED,
-	FINISHED,
-	FRAME,
-	LAST_SIGNAL
-};
-
-static guint signals [LAST_SIGNAL] = { 0, };
-
-
-G_DEFINE_TYPE (EvTimeline, ev_timeline, G_TYPE_OBJECT)
-
-
-static void
-ev_timeline_init (EvTimeline *timeline)
-{
-	EvTimelinePriv *priv;
-
-	priv = EV_TIMELINE_GET_PRIV (timeline);
-
-	priv->fps = DEFAULT_FPS;
-	priv->duration = 0;
-}
-
-static void
-ev_timeline_set_property (GObject      *object,
-			  guint         prop_id,
-			  const GValue *value,
-			  GParamSpec   *pspec)
-{
-	EvTimeline *timeline;
-
-	timeline = EV_TIMELINE (object);
-
-	switch (prop_id) {
-	case PROP_FPS:
-		ev_timeline_set_fps (timeline, g_value_get_uint (value));
-		break;
-	case PROP_DURATION:
-		ev_timeline_set_duration (timeline, g_value_get_uint (value));
-		break;
-	case PROP_LOOP:
-		ev_timeline_set_loop (timeline, g_value_get_boolean (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-	}
-}
-
-static void
-ev_timeline_get_property (GObject    *object,
-			  guint       prop_id,
-			  GValue     *value,
-			  GParamSpec *pspec)
-{
-	EvTimeline     *timeline;
-	EvTimelinePriv *priv;
-
-	timeline = EV_TIMELINE (object);
-	priv = EV_TIMELINE_GET_PRIV (timeline);
-
-	switch (prop_id) {
-	case PROP_FPS:
-		g_value_set_uint (value, priv->fps);
-		break;
-	case PROP_DURATION:
-		g_value_set_uint (value, priv->duration);
-		break;
-	case PROP_LOOP:
-		g_value_set_boolean (value, priv->loop);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-	}
-}
-
-static void
-ev_timeline_finalize (GObject *object)
-{
-	EvTimelinePriv *priv;
-
-	priv = EV_TIMELINE_GET_PRIV (object);
-
-	if (priv->source_id) {
-		g_source_remove (priv->source_id);
-		priv->source_id = 0;
-	}
-
-	if (priv->timer)
-		g_timer_destroy (priv->timer);
-
-	G_OBJECT_CLASS (ev_timeline_parent_class)->finalize (object);
-}
-
-static gboolean
-ev_timeline_run_frame (EvTimeline *timeline)
-{
-	EvTimelinePriv *priv;
-	gdouble         progress;
-	guint           elapsed_time;
-
-	GDK_THREADS_ENTER ();
-
-	priv = EV_TIMELINE_GET_PRIV (timeline);
-
-	elapsed_time = (guint) (g_timer_elapsed (priv->timer, NULL) * 1000);
-	progress = (gdouble) elapsed_time / priv->duration;
-	progress = CLAMP (progress, 0., 1.);
-
-	g_signal_emit (timeline, signals [FRAME], 0, progress);
-
-	if (progress >= 1.0) {
-		if (!priv->loop) {
-			if (priv->source_id) {
-				g_source_remove (priv->source_id);
-				priv->source_id = 0;
-			}
-
-			g_signal_emit (timeline, signals [FINISHED], 0);
-			return FALSE;
-		} else {
-			ev_timeline_rewind (timeline);
-		}
-	}
-
-	GDK_THREADS_LEAVE ();
-
-	return TRUE;
-}
-
-static void
-ev_timeline_real_start (EvTimeline *timeline)
-{
-	EvTimelinePriv *priv;
-
-	priv = EV_TIMELINE_GET_PRIV (timeline);
-
-	if (!priv->source_id) {
-		if (priv->timer)
-			g_timer_continue (priv->timer);
-		else
-			priv->timer = g_timer_new ();
-
-		/* sanity check */
-		g_assert (priv->fps > 0);
-
-		g_signal_emit (timeline, signals [STARTED], 0);
-
-		priv->source_id = g_timeout_add (FRAME_INTERVAL (priv->fps),
-						 (GSourceFunc) ev_timeline_run_frame,
-						 timeline);
-	}
-}
-
-static void
-ev_timeline_class_init (EvTimelineClass *class)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-	object_class->set_property = ev_timeline_set_property;
-	object_class->get_property = ev_timeline_get_property;
-	object_class->finalize = ev_timeline_finalize;
-
-	class->start = ev_timeline_real_start;
-
-	g_object_class_install_property (object_class,
-					 PROP_FPS,
-					 g_param_spec_uint ("fps",
-							    "FPS",
-							    "Frames per second for the timeline",
-							    1,
-							    G_MAXUINT,
-							    DEFAULT_FPS,
-							    G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_DURATION,
-					 g_param_spec_uint ("duration",
-							    "Animation Duration",
-							    "Animation Duration",
-							    0,
-							    G_MAXUINT,
-							    0,
-							    G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_LOOP,
-					 g_param_spec_boolean ("loop",
-							       "Loop",
-							       "Whether the timeline loops or not",
-							       FALSE,
-							       G_PARAM_READWRITE));
-	signals[STARTED] =
-		g_signal_new ("started",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EvTimelineClass, started),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	signals[PAUSED] =
-		g_signal_new ("paused",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EvTimelineClass, paused),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	signals[FINISHED] =
-		g_signal_new ("finished",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EvTimelineClass, finished),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE, 0);
-
-	signals[FRAME] =
-		g_signal_new ("frame",
-			      G_TYPE_FROM_CLASS (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EvTimelineClass, frame),
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__DOUBLE,
-			      G_TYPE_NONE, 1,
-			      G_TYPE_DOUBLE);
-
-	g_type_class_add_private (class, sizeof (EvTimelinePriv));
-}
-
-EvTimeline *
-ev_timeline_new (guint duration)
-{
-	return g_object_new (EV_TYPE_TIMELINE,
-			     "duration", duration,
-			     NULL);
-}
-
-void
-ev_timeline_start (EvTimeline *timeline)
-{
-	g_return_if_fail (EV_IS_TIMELINE (timeline));
-
-	EV_TIMELINE_GET_CLASS (timeline)->start (timeline);
-}
-
-void
-ev_timeline_pause (EvTimeline *timeline)
-{
-	EvTimelinePriv *priv;
-
-	g_return_if_fail (EV_IS_TIMELINE (timeline));
-
-	priv = EV_TIMELINE_GET_PRIV (timeline);
-
-	if (priv->source_id) {
-		g_source_remove (priv->source_id);
-		priv->source_id = 0;
-		g_timer_stop (priv->timer);
-		g_signal_emit (timeline, signals [PAUSED], 0);
-	}
-}
-
-void
-ev_timeline_rewind (EvTimeline *timeline)
-{
-	EvTimelinePriv *priv;
-
-	g_return_if_fail (EV_IS_TIMELINE (timeline));
-
-	priv = EV_TIMELINE_GET_PRIV (timeline);
-
-	/* destroy and re-create timer if neccesary  */
-	if (priv->timer) {
-		g_timer_destroy (priv->timer);
-
-		if (ev_timeline_is_running (timeline))
-			priv->timer = g_timer_new ();
-		else
-			priv->timer = NULL;
-	}
-}
-
-gboolean
-ev_timeline_is_running (EvTimeline *timeline)
-{
-	EvTimelinePriv *priv;
-
-	g_return_val_if_fail (EV_IS_TIMELINE (timeline), FALSE);
-
-	priv = EV_TIMELINE_GET_PRIV (timeline);
-
-	return (priv->source_id != 0);
-}
-
-guint
-ev_timeline_get_fps (EvTimeline *timeline)
-{
-	EvTimelinePriv *priv;
-
-	g_return_val_if_fail (EV_IS_TIMELINE (timeline), 1);
-
-	priv = EV_TIMELINE_GET_PRIV (timeline);
-	return priv->fps;
-}
-
-void
-ev_timeline_set_fps (EvTimeline *timeline,
-		     guint       fps)
-{
-	EvTimelinePriv *priv;
-
-	g_return_if_fail (EV_IS_TIMELINE (timeline));
-
-	priv = EV_TIMELINE_GET_PRIV (timeline);
-
-	priv->fps = fps;
-
-	if (ev_timeline_is_running (timeline)) {
-		g_source_remove (priv->source_id);
-		priv->source_id = g_timeout_add (FRAME_INTERVAL (priv->fps),
-						 (GSourceFunc) ev_timeline_run_frame,
-						 timeline);
-	}
-
-	g_object_notify (G_OBJECT (timeline), "fps");
-}
-
-gboolean
-ev_timeline_get_loop (EvTimeline *timeline)
-{
-	EvTimelinePriv *priv;
-
-	g_return_val_if_fail (EV_IS_TIMELINE (timeline), FALSE);
-
-	priv = EV_TIMELINE_GET_PRIV (timeline);
-	return priv->loop;
-}
-
-void
-ev_timeline_set_loop (EvTimeline *timeline,
-		      gboolean    loop)
-{
-	EvTimelinePriv *priv;
-
-	g_return_if_fail (EV_IS_TIMELINE (timeline));
-
-	priv = EV_TIMELINE_GET_PRIV (timeline);
-	priv->loop = loop;
-
-	g_object_notify (G_OBJECT (timeline), "loop");
-}
-
-void
-ev_timeline_set_duration (EvTimeline *timeline,
-			  guint       duration)
-{
-	EvTimelinePriv *priv;
-
-	g_return_if_fail (EV_IS_TIMELINE (timeline));
-
-	priv = EV_TIMELINE_GET_PRIV (timeline);
-
-	priv->duration = duration;
-
-	g_object_notify (G_OBJECT (timeline), "duration");
-}
-
-guint
-ev_timeline_get_duration (EvTimeline *timeline)
-{
-	EvTimelinePriv *priv;
-
-	g_return_val_if_fail (EV_IS_TIMELINE (timeline), 0);
-
-	priv = EV_TIMELINE_GET_PRIV (timeline);
-
-	return priv->duration;
-}
-
-gdouble
-ev_timeline_get_progress (EvTimeline *timeline)
-{
-	EvTimelinePriv *priv;
-	gdouble         progress;
-	guint           elapsed_time;
-
-	g_return_val_if_fail (EV_IS_TIMELINE (timeline), 0.0);
-
-	priv = EV_TIMELINE_GET_PRIV (timeline);
-
-	if (!priv->timer)
-		return 0.;
-
-	elapsed_time = (guint) (g_timer_elapsed (priv->timer, NULL) * 1000);
-	progress = (gdouble) elapsed_time / priv->duration;
-
-	return CLAMP (progress, 0., 1.);
-}
diff --git a/shell/ev-timeline.h b/shell/ev-timeline.h
deleted file mode 100644
index 534e48a..0000000
--- a/shell/ev-timeline.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ev-timeline.h
- *  this file is part of evince, a gnome document viewer
- *
- * Copyright (C) 2007 Carlos Garnacho <carlos@imendio.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __EV_TIMELINE_H__
-#define __EV_TIMELINE_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define EV_TYPE_TIMELINE                 (ev_timeline_get_type ())
-#define EV_TIMELINE(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), EV_TYPE_TIMELINE, EvTimeline))
-#define EV_TIMELINE_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass),  EV_TYPE_TIMELINE, EvTimelineClass))
-#define EV_IS_TIMELINE(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EV_TYPE_TIMELINE))
-#define EV_IS_TIMELINE_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass),  EV_TYPE_TIMELINE))
-#define EV_TIMELINE_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj),  EV_TYPE_TIMELINE, EvTimelineClass))
-
-typedef struct EvTimeline      EvTimeline;
-typedef struct EvTimelineClass EvTimelineClass;
-
-struct EvTimeline {
-	GObject parent_instance;
-};
-
-struct EvTimelineClass {
-	GObjectClass parent_class;
-
-	/* vmethods */
-	void (* start)             (EvTimeline *timeline);
-
-	/* signals */
-	void (* started)           (EvTimeline *timeline);
-	void (* finished)          (EvTimeline *timeline);
-	void (* paused)            (EvTimeline *timeline);
-
-	void (* frame)             (EvTimeline *timeline,
-				    gdouble     progress);
-};
-
-
-GType                 ev_timeline_get_type           (void) G_GNUC_CONST;
-
-EvTimeline           *ev_timeline_new                (guint                    duration);
-
-void                  ev_timeline_start              (EvTimeline             *timeline);
-void                  ev_timeline_pause              (EvTimeline             *timeline);
-void                  ev_timeline_rewind             (EvTimeline             *timeline);
-
-gboolean              ev_timeline_is_running         (EvTimeline             *timeline);
-
-guint                 ev_timeline_get_fps            (EvTimeline             *timeline);
-void                  ev_timeline_set_fps            (EvTimeline             *timeline,
-						      guint                   fps);
-
-gboolean              ev_timeline_get_loop           (EvTimeline             *timeline);
-void                  ev_timeline_set_loop           (EvTimeline             *timeline,
-						      gboolean                loop);
-
-guint                 ev_timeline_get_duration       (EvTimeline             *timeline);
-void                  ev_timeline_set_duration       (EvTimeline             *timeline,
-						      guint                   duration);
-
-gdouble               ev_timeline_get_progress       (EvTimeline             *timeline);
-
-
-G_END_DECLS
-
-#endif /* __EV_TIMELINE_H__ */
diff --git a/shell/ev-transition-animation.c b/shell/ev-transition-animation.c
deleted file mode 100644
index 148b4c7..0000000
--- a/shell/ev-transition-animation.c
+++ /dev/null
@@ -1,682 +0,0 @@
-/* ev-transition-animation.c
- *  this file is part of evince, a gnome document viewer
- *
- * Copyright (C) 2007 Carlos Garnacho <carlos@imendio.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <cairo.h>
-#include <gdk/gdk.h>
-#include "ev-transition-animation.h"
-#include "ev-timeline.h"
-
-#define EV_TRANSITION_ANIMATION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EV_TYPE_TRANSITION_ANIMATION, EvTransitionAnimationPriv))
-#define N_BLINDS 6
-
-typedef struct EvTransitionAnimationPriv EvTransitionAnimationPriv;
-
-struct EvTransitionAnimationPriv {
-	EvTransitionEffect *effect;
-	cairo_surface_t *origin_surface;
-	cairo_surface_t *dest_surface;
-};
-
-enum {
-	PROP_0,
-	PROP_EFFECT,
-	PROP_ORIGIN_SURFACE,
-	PROP_DEST_SURFACE
-};
-
-
-G_DEFINE_TYPE (EvTransitionAnimation, ev_transition_animation, EV_TYPE_TIMELINE)
-
-
-static void
-ev_transition_animation_init (EvTransitionAnimation *animation)
-{
-}
-
-static void
-ev_transition_animation_set_property (GObject      *object,
-				      guint         prop_id,
-				      const GValue *value,
-				      GParamSpec   *pspec)
-{
-	EvTransitionAnimationPriv *priv;
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (object);
-
-	switch (prop_id) {
-	case PROP_EFFECT:
-		if (priv->effect)
-			g_object_unref (priv->effect);
-
-		priv->effect = g_value_dup_object (value);
-		break;
-	case PROP_ORIGIN_SURFACE:
-		ev_transition_animation_set_origin_surface (EV_TRANSITION_ANIMATION (object),
-							    g_value_get_pointer (value));
-		break;
-	case PROP_DEST_SURFACE:
-		ev_transition_animation_set_dest_surface (EV_TRANSITION_ANIMATION (object),
-							  g_value_get_pointer (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-	}
-}
-
-static void
-ev_transition_animation_get_property (GObject      *object,
-				      guint         prop_id,
-				      GValue       *value,
-				      GParamSpec   *pspec)
-{
-	EvTransitionAnimationPriv *priv;
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (object);
-
-	switch (prop_id) {
-	case PROP_EFFECT:
-		g_value_set_object (value, priv->effect);
-		break;
-	case PROP_ORIGIN_SURFACE:
-		g_value_set_pointer (value, priv->origin_surface);
-		break;
-	case PROP_DEST_SURFACE:
-		g_value_set_pointer (value, priv->dest_surface);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-	}
-}
-
-static void
-ev_transition_animation_finalize (GObject *object)
-{
-	EvTransitionAnimationPriv *priv;
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (object);
-
-	if (priv->effect)
-		g_object_unref (priv->effect);
-
-	if (priv->origin_surface)
-		cairo_surface_destroy (priv->origin_surface);
-
-	if (priv->dest_surface)
-		cairo_surface_destroy (priv->dest_surface);
-
-	G_OBJECT_CLASS (ev_transition_animation_parent_class)->finalize (object);
-}
-
-static GObject *
-ev_transition_animation_constructor (GType                  type,
-				     guint                  n_construct_properties,
-				     GObjectConstructParam *construct_params)
-{
-	GObject *object;
-	EvTransitionAnimationPriv *priv;
-	EvTransitionEffect *effect;
-	gint duration;
-
-	object = G_OBJECT_CLASS (ev_transition_animation_parent_class)->constructor (type,
-										     n_construct_properties,
-										     construct_params);
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (object);
-	effect = priv->effect;
-
-	g_object_get (effect, "duration", &duration, NULL);
-	ev_timeline_set_duration (EV_TIMELINE (object), duration * 1000);
-
-	return object;
-}
-
-static void
-ev_transition_animation_class_init (EvTransitionAnimationClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->set_property = ev_transition_animation_set_property;
-	object_class->get_property = ev_transition_animation_get_property;
-	object_class->finalize = ev_transition_animation_finalize;
-	object_class->constructor = ev_transition_animation_constructor;
-
-	g_object_class_install_property (object_class,
-					 PROP_EFFECT,
-					 g_param_spec_object ("effect",
-							      "Effect",
-							      "Transition effect description",
-							      EV_TYPE_TRANSITION_EFFECT,
-							      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_ORIGIN_SURFACE,
-					 g_param_spec_pointer ("origin-surface",
-							       "Origin surface",
-							       "Cairo surface from which the animation will happen",
-							       G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_DEST_SURFACE,
-					 g_param_spec_pointer ("dest-surface",
-							       "Destination surface",
-							       "Cairo surface to which the animation will happen",
-							       G_PARAM_READWRITE));
-
-	g_type_class_add_private (klass, sizeof (EvTransitionAnimationPriv));
-}
-
-static void
-paint_surface (cairo_t         *cr,
-	       cairo_surface_t *surface,
-	       gdouble          x_offset,
-	       gdouble          y_offset,
-	       gdouble          alpha,
-	       GdkRectangle     page_area)
-{
-	gint width, height;
-
-	gdk_cairo_rectangle (cr, &page_area);
-	cairo_clip (cr);
-
-	width = cairo_image_surface_get_width (surface);
-	height = cairo_image_surface_get_height (surface);
-
-	cairo_save (cr);
-
-	if (width != page_area.width || height != page_area.height) {
-		cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_FAST);
-		cairo_scale (cr,
-			     (gdouble) page_area.width / width,
-			     (gdouble) page_area.height / height);
-	}
-
-	cairo_surface_set_device_offset (surface, x_offset, y_offset);
-	cairo_set_source_surface (cr, surface, 0, 0);
-
-	if (alpha == 0.)
-		cairo_paint (cr);
-	else
-		cairo_paint_with_alpha (cr, alpha);
-
-	cairo_restore (cr);
-}
-
-/* animations */
-static void
-ev_transition_animation_split (cairo_t               *cr,
-			       EvTransitionAnimation *animation,
-			       EvTransitionEffect    *effect,
-			       gdouble                progress,
-			       GdkRectangle           page_area)
-{
-	EvTransitionAnimationPriv *priv;
-	EvTransitionEffectAlignment alignment;
-	EvTransitionEffectDirection direction;
-	gint width, height;
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
-	width = page_area.width;
-	height = page_area.height;
-
-	g_object_get (effect,
-		      "alignment", &alignment,
-		      "direction", &direction,
-		      NULL);
-
-	if (direction == EV_TRANSITION_DIRECTION_INWARD) {
-		paint_surface (cr, priv->dest_surface, 0, 0, 0, page_area);
-
-		if (alignment == EV_TRANSITION_ALIGNMENT_HORIZONTAL) {
-			cairo_rectangle (cr,
-					 0,
-					 height * progress / 2,
-					 width,
-					 height * (1 - progress));
-		} else {
-			cairo_rectangle (cr,
-					 width * progress / 2,
-					 0,
-					 width * (1 - progress),
-					 height);
-		}
-
-		cairo_clip (cr);
-
-		paint_surface (cr, priv->origin_surface, 0, 0, 0, page_area);
-	} else {
-		paint_surface (cr, priv->origin_surface, 0, 0, 0, page_area);
-
-		if (alignment == EV_TRANSITION_ALIGNMENT_HORIZONTAL) {
-			cairo_rectangle (cr,
-					 0,
-					 (height / 2) - (height * progress / 2),
-					 width,
-					 height * progress);
-		} else {
-			cairo_rectangle (cr,
-					 (width / 2) - (width * progress / 2),
-					 0,
-					 width * progress,
-					 height);
-		}
-
-		cairo_clip (cr);
-
-		paint_surface (cr, priv->dest_surface, 0, 0, 0, page_area);
-	}
-}
-
-static void
-ev_transition_animation_blinds (cairo_t               *cr,
-				EvTransitionAnimation *animation,
-				EvTransitionEffect    *effect,
-				gdouble                progress,
-				GdkRectangle           page_area)
-{
-	EvTransitionAnimationPriv *priv;
-	EvTransitionEffectAlignment alignment;
-	gint width, height, i;
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
-	width = page_area.width;
-	height = page_area.height;
-
-	g_object_get (effect,
-		      "alignment", &alignment,
-		      NULL);
-
-	paint_surface (cr, priv->origin_surface, 0, 0, 0, page_area);
-
-	for (i = 0; i < N_BLINDS; i++) {
-		cairo_save (cr);
-
-		if (alignment == EV_TRANSITION_ALIGNMENT_HORIZONTAL) {
-			cairo_rectangle (cr,
-					 0,
-					 height / N_BLINDS * i,
-					 width,
-					 height / N_BLINDS * progress);
-		} else {
-			cairo_rectangle (cr,
-					 width / N_BLINDS * i,
-					 0,
-					 width / N_BLINDS * progress,
-					 height);
-		}
-
-		cairo_clip (cr);
-		paint_surface (cr, priv->dest_surface, 0, 0, 0, page_area);
-		cairo_restore (cr);
-	}
-}
-
-static void
-ev_transition_animation_box (cairo_t               *cr,
-			     EvTransitionAnimation *animation,
-			     EvTransitionEffect    *effect,
-			     gdouble                progress,
-			     GdkRectangle           page_area)
-{
-	EvTransitionAnimationPriv *priv;
-	EvTransitionEffectDirection direction;
-	gint width, height;
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
-	width = page_area.width;
-	height = page_area.height;
-
-	g_object_get (effect,
-		      "direction", &direction,
-		      NULL);
-
-	if (direction == EV_TRANSITION_DIRECTION_INWARD) {
-		paint_surface (cr, priv->dest_surface, 0, 0, 0, page_area);
-
-		cairo_rectangle (cr,
-				 width * progress / 2,
-				 height * progress / 2,
-				 width * (1 - progress),
-				 height * (1 - progress));
-		cairo_clip (cr);
-
-		paint_surface (cr, priv->origin_surface, 0, 0, 0, page_area);
-	} else {
-		paint_surface (cr, priv->origin_surface, 0, 0, 0, page_area);
-
-		cairo_rectangle (cr,
-				 (width / 2) - (width * progress / 2),
-				 (height / 2) - (height * progress / 2),
-				 width * progress,
-				 height * progress);
-		cairo_clip (cr);
-
-		paint_surface (cr, priv->dest_surface, 0, 0, 0, page_area);
-	}
-}
-
-static void
-ev_transition_animation_wipe (cairo_t               *cr,
-			      EvTransitionAnimation *animation,
-			      EvTransitionEffect    *effect,
-			      gdouble                progress,
-			      GdkRectangle           page_area)
-{
-	EvTransitionAnimationPriv *priv;
-	gint width, height;
-	gint angle;
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
-	width = page_area.width;
-	height = page_area.height;
-
-	g_object_get (effect,
-		      "angle", &angle,
-		      NULL);
-
-	paint_surface (cr, priv->origin_surface, 0, 0, 0, page_area);
-
-	if (angle == 0) {
-		/* left to right */
-		cairo_rectangle (cr,
-				 0, 0,
-				 width * progress,
-				 height);
-	} else if (angle <= 90) {
-		/* bottom to top */
-		cairo_rectangle (cr,
-				 0,
-				 height * (1 - progress),
-				 width,
-				 height * progress);
-	} else if (angle <= 180) {
-		/* right to left */
-		cairo_rectangle (cr,
-				 width * (1 - progress),
-				 0,
-				 width * progress,
-				 height);
-	} else if (angle <= 270) {
-		/* top to bottom */
-		cairo_rectangle (cr,
-				 0, 0,
-				 width,
-				 height * progress);
-	}
-
-	cairo_clip (cr);
-
-	paint_surface (cr, priv->dest_surface, 0, 0, 0, page_area);
-}
-
-static void
-ev_transition_animation_dissolve (cairo_t               *cr,
-				  EvTransitionAnimation *animation,
-				  EvTransitionEffect    *effect,
-				  gdouble                progress,
-				  GdkRectangle           page_area)
-{
-	EvTransitionAnimationPriv *priv;
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
-
-	paint_surface (cr, priv->dest_surface, 0, 0, 0, page_area);
-	paint_surface (cr, priv->origin_surface, 0, 0, 1 - progress, page_area);
-}
-
-static void
-ev_transition_animation_push (cairo_t               *cr,
-			      EvTransitionAnimation *animation,
-			      EvTransitionEffect    *effect,
-			      gdouble                progress,
-			      GdkRectangle           page_area)
-{
-	EvTransitionAnimationPriv *priv;
-	gint width, height;
-	gint angle;
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
-	width = page_area.width;
-	height = page_area.height;
-
-	g_object_get (effect,
-		      "angle", &angle,
-		      NULL);
-
-	if (angle == 0) {
-		/* left to right */
-		paint_surface (cr, priv->origin_surface, - (width * progress), 0, 0, page_area);
-		paint_surface (cr, priv->dest_surface, width * (1 - progress), 0, 0, page_area);
-	} else {
-		/* top to bottom */
-		paint_surface (cr, priv->origin_surface, 0, - (height * progress), 0, page_area);
-		paint_surface (cr, priv->dest_surface, 0, height * (1 - progress), 0, page_area);
-	}
-}
-
-static void
-ev_transition_animation_cover (cairo_t               *cr,
-			       EvTransitionAnimation *animation,
-			       EvTransitionEffect    *effect,
-			       gdouble                progress,
-			       GdkRectangle           page_area)
-{
-	EvTransitionAnimationPriv *priv;
-	gint width, height;
-	gint angle;
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
-	width = page_area.width;
-	height = page_area.height;
-
-	g_object_get (effect,
-		      "angle", &angle,
-		      NULL);
-
-	paint_surface (cr, priv->origin_surface, 0, 0, 0, page_area);
-
-	if (angle == 0) {
-		/* left to right */
-		paint_surface (cr, priv->dest_surface, width * (1 - progress), 0, 0, page_area);
-	} else {
-		/* top to bottom */
-		paint_surface (cr, priv->dest_surface, 0, height * (1 - progress), 0, page_area);
-	}
-}
-
-static void
-ev_transition_animation_uncover (cairo_t               *cr,
-				 EvTransitionAnimation *animation,
-				 EvTransitionEffect    *effect,
-				 gdouble                progress,
-				 GdkRectangle           page_area)
-{
-	EvTransitionAnimationPriv *priv;
-	gint width, height;
-	gint angle;
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
-	width = page_area.width;
-	height = page_area.height;
-
-	g_object_get (effect,
-		      "angle", &angle,
-		      NULL);
-
-	paint_surface (cr, priv->dest_surface, 0, 0, 0, page_area);
-
-	if (angle == 0) {
-		/* left to right */
-		paint_surface (cr, priv->origin_surface, - (width * progress), 0, 0, page_area);
-	} else {
-		/* top to bottom */
-		paint_surface (cr, priv->origin_surface, 0, - (height * progress), 0, page_area);
-	}
-}
-
-static void
-ev_transition_animation_fade (cairo_t               *cr,
-			      EvTransitionAnimation *animation,
-			      EvTransitionEffect    *effect,
-			      gdouble                progress,
-			      GdkRectangle           page_area)
-{
-	EvTransitionAnimationPriv *priv;
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
-
-	paint_surface (cr, priv->origin_surface, 0, 0, 0, page_area);
-	paint_surface (cr, priv->dest_surface, 0, 0, progress, page_area);
-}
-
-void
-ev_transition_animation_paint (EvTransitionAnimation *animation,
-			       cairo_t               *cr,
-			       GdkRectangle           page_area)
-{
-	EvTransitionAnimationPriv *priv;
-	EvTransitionEffectType type;
-	gdouble progress;
-
-	g_return_if_fail (EV_IS_TRANSITION_ANIMATION (animation));
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
-	g_object_get (priv->effect, "type", &type, NULL);
-	progress = ev_timeline_get_progress (EV_TIMELINE (animation));
-
-	if (!priv->dest_surface) {
-		/* animation is still not ready, paint the origin surface */
-		paint_surface (cr, priv->origin_surface, 0, 0, 0, page_area);
-		return;
-	}
-
-	switch (type) {
-	case EV_TRANSITION_EFFECT_REPLACE:
-		/* just paint the destination slide */
-		paint_surface (cr, priv->dest_surface, 0, 0, 0, page_area);
-		break;
-	case EV_TRANSITION_EFFECT_SPLIT:
-		ev_transition_animation_split (cr, animation, priv->effect, progress, page_area);
-		break;
-	case EV_TRANSITION_EFFECT_BLINDS:
-		ev_transition_animation_blinds (cr, animation, priv->effect, progress, page_area);
-		break;
-	case EV_TRANSITION_EFFECT_BOX:
-		ev_transition_animation_box (cr, animation, priv->effect, progress, page_area);
-		break;
-	case EV_TRANSITION_EFFECT_WIPE:
-		ev_transition_animation_wipe (cr, animation, priv->effect, progress, page_area);
-		break;
-	case EV_TRANSITION_EFFECT_DISSOLVE:
-		ev_transition_animation_dissolve (cr, animation, priv->effect, progress, page_area);
-		break;
-	case EV_TRANSITION_EFFECT_PUSH:
-		ev_transition_animation_push (cr, animation, priv->effect, progress, page_area);
-		break;
-	case EV_TRANSITION_EFFECT_COVER:
-		ev_transition_animation_cover (cr, animation, priv->effect, progress, page_area);
-		break;
-	case EV_TRANSITION_EFFECT_UNCOVER:
-		ev_transition_animation_uncover (cr, animation, priv->effect, progress, page_area);
-		break;
-	case EV_TRANSITION_EFFECT_FADE:
-		ev_transition_animation_fade (cr, animation, priv->effect, progress, page_area);
-		break;
-	default: {
-		GEnumValue *enum_value;
-
-		enum_value = g_enum_get_value (g_type_class_peek (EV_TYPE_TRANSITION_EFFECT_TYPE), type);
-
-		g_warning ("Unimplemented transition animation: '%s', "
-			   "please post a bug report in Evince bugzilla "
-			   "(http://bugzilla.gnome.org) with a testcase.",
-			   enum_value->value_nick);
-
-		/* just paint the destination slide */
-		paint_surface (cr, priv->dest_surface, 0, 0, 0, page_area);
-		}
-	}
-}
-
-EvTransitionAnimation *
-ev_transition_animation_new (EvTransitionEffect *effect)
-{
-	g_return_val_if_fail (EV_IS_TRANSITION_EFFECT (effect), NULL);
-
-	return g_object_new (EV_TYPE_TRANSITION_ANIMATION,
-			     "effect", effect,
-			     NULL);
-}
-
-void
-ev_transition_animation_set_origin_surface (EvTransitionAnimation *animation,
-					    cairo_surface_t       *origin_surface)
-{
-	EvTransitionAnimationPriv *priv;
-	cairo_surface_t *surface;
-
-	g_return_if_fail (EV_IS_TRANSITION_ANIMATION (animation));
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
-
-	surface = cairo_surface_reference (origin_surface);
-
-	if (priv->origin_surface)
-		cairo_surface_destroy (priv->origin_surface);
-
-	priv->origin_surface = surface;
-	g_object_notify (G_OBJECT (animation), "origin-surface");
-
-	if (priv->origin_surface && priv->dest_surface)
-		ev_timeline_start (EV_TIMELINE (animation));
-}
-
-void
-ev_transition_animation_set_dest_surface (EvTransitionAnimation *animation,
-					  cairo_surface_t       *dest_surface)
-{
-	EvTransitionAnimationPriv *priv;
-	cairo_surface_t *surface;
-
-	g_return_if_fail (EV_IS_TRANSITION_ANIMATION (animation));
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
-
-	surface = cairo_surface_reference (dest_surface);
-
-	if (priv->dest_surface)
-		cairo_surface_destroy (priv->dest_surface);
-
-	priv->dest_surface = surface;
-	g_object_notify (G_OBJECT (animation), "dest-surface");
-
-	if (priv->origin_surface && priv->dest_surface)
-		ev_timeline_start (EV_TIMELINE (animation));
-}
-
-gboolean
-ev_transition_animation_ready (EvTransitionAnimation *animation)
-{
-	EvTransitionAnimationPriv *priv;
-
-	g_return_val_if_fail (EV_IS_TRANSITION_ANIMATION (animation), FALSE);
-
-	priv = EV_TRANSITION_ANIMATION_GET_PRIVATE (animation);
-
-	return (priv->origin_surface && priv->dest_surface);
-}
diff --git a/shell/ev-transition-animation.h b/shell/ev-transition-animation.h
deleted file mode 100644
index 522caf2..0000000
--- a/shell/ev-transition-animation.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ev-transition-animation.h
- *  this file is part of evince, a gnome document viewer
- *
- * Copyright (C) 2007 Carlos Garnacho <carlos@imendio.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __EV_TRANSITION_ANIMATION_H__
-#define __EV_TRANSITION_ANIMATION_H__
-
-#include "ev-timeline.h"
-#include "ev-transition-effect.h"
-
-G_BEGIN_DECLS
-
-#define EV_TYPE_TRANSITION_ANIMATION                 (ev_transition_animation_get_type ())
-#define EV_TRANSITION_ANIMATION(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), EV_TYPE_TRANSITION_ANIMATION, EvTransitionAnimation))
-#define EV_TRANSITION_ANIMATION_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass),  EV_TYPE_TRANSITION_ANIMATION, EvTransitionAnimationClass))
-#define EV_IS_TRANSITION_ANIMATION(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EV_TYPE_TRANSITION_ANIMATION))
-#define EV_IS_TRANSITION_ANIMATION_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass),  EV_TYPE_TRANSITION_ANIMATION))
-#define EV_TRANSITION_ANIMATION_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj),  EV_TYPE_TRANSITION_ANIMATION, EvTransitionAnimationClass))
-
-typedef struct EvTransitionAnimation      EvTransitionAnimation;
-typedef struct EvTransitionAnimationClass EvTransitionAnimationClass;
-
-struct EvTransitionAnimation {
-	EvTimeline parent_instance;
-};
-
-struct EvTransitionAnimationClass {
-	EvTimelineClass parent_class;
-};
-
-
-GType                   ev_transition_animation_get_type           (void) G_GNUC_CONST;
-
-EvTransitionAnimation * ev_transition_animation_new                (EvTransitionEffect    *effect);
-
-void                    ev_transition_animation_set_origin_surface (EvTransitionAnimation *animation,
-								    cairo_surface_t       *origin_surface);
-void                    ev_transition_animation_set_dest_surface   (EvTransitionAnimation *animation,
-								    cairo_surface_t       *origin_surface);
-gint                    ev_transition_animation_get_page_from      (EvTransitionAnimation *animation);
-gint                    ev_transition_animation_get_page_to        (EvTransitionAnimation *animation);
-
-void                    ev_transition_animation_paint              (EvTransitionAnimation *animation,
-								    cairo_t               *cr,
-								    GdkRectangle           page_area);
-gboolean                ev_transition_animation_ready              (EvTransitionAnimation *animation);
-
-
-G_END_DECLS
-
-#endif /* __EV_TRANSITION_ANIMATION_H__ */
diff --git a/shell/ev-view-accessible.c b/shell/ev-view-accessible.c
deleted file mode 100644
index 3bf28d9..0000000
--- a/shell/ev-view-accessible.c
+++ /dev/null
@@ -1,563 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */
-/* this file is part of evince, a gnome document viewer
- *
- *  Copyright (C) 2004 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 <glib/gi18n.h>
-
-#include "ev-view-accessible.h"
-#include "ev-view-private.h"
-
-#define EV_TYPE_VIEW_ACCESSIBLE      (ev_view_accessible_get_type ())
-#define EV_VIEW_ACCESSIBLE(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), EV_TYPE_VIEW_ACCESSIBLE, EvViewAccessible))
-#define EV_IS_VIEW_ACCESSIBLE(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EV_TYPE_VIEW_ACCESSIBLE))
-
-static GType ev_view_accessible_get_type (void);
-
-enum {
-	ACTION_SCROLL_UP,
-	ACTION_SCROLL_DOWN,
-	LAST_ACTION
-};
-
-static const gchar *const ev_view_accessible_action_names[] = 
-{
-	N_("Scroll Up"),
-	N_("Scroll Down"),
-	NULL
-};
-
-static const gchar *const ev_view_accessible_action_descriptions[] = 
-{
-	N_("Scroll View Up"),
-	N_("Scroll View Down"),
-	NULL
-};
-
-typedef struct {
-	/* Action */
-	gchar *action_descriptions[LAST_ACTION];
-	guint action_idle_handler;  
-	GtkScrollType idle_scroll;	 
-} EvViewAccessiblePriv;
-
-typedef GtkAccessibleClass EvViewAccessibleClass;
-
-#define EV_VIEW_ACCESSIBLE_GET_PRIVATE(inst) (G_TYPE_INSTANCE_GET_PRIVATE ((inst), EV_TYPE_VIEW_ACCESSIBLE, EvViewAccessiblePriv))
-
-static void
-ev_view_accessible_finalize (GObject *object)
-{
-	EvViewAccessiblePriv *priv = EV_VIEW_ACCESSIBLE_GET_PRIVATE (object);
-	int i;
-	
-	if (priv->action_idle_handler)
-		g_source_remove (priv->action_idle_handler);
-	for (i = 0; i < LAST_ACTION; i++)	
-		g_free (priv->action_descriptions [i]);
-}
-
-static void ev_view_accessible_class_init (EvViewAccessibleClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = ev_view_accessible_finalize;
-
-  g_type_class_add_private (klass, sizeof (EvViewAccessiblePriv));
-}
-
-static gchar*
-ev_view_accessible_get_text (AtkText *text,
-                     gint    start_pos,
-                     gint    end_pos)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return NULL;
-
-  return NULL;
-}
-
-static gunichar 
-ev_view_accessible_get_character_at_offset (AtkText *text,
-                                    gint     offset)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return '\0';
-
-  return '\0';
-}
-
-static gchar*
-ev_view_accessible_get_text_before_offset (AtkText	    *text,
-				   gint		    offset,
-				   AtkTextBoundary  boundary_type,
-				   gint		    *start_offset,
-				   gint		    *end_offset)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return NULL;
-
-  return NULL;
-}
-
-static gchar*
-ev_view_accessible_get_text_at_offset (AtkText          *text,
-                               gint             offset,
-                               AtkTextBoundary  boundary_type,
-                               gint             *start_offset,
-                               gint             *end_offset)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return NULL;
-
-  return NULL;
-}
-
-static gchar*
-ev_view_accessible_get_text_after_offset  (AtkText	    *text,
-				   gint		    offset,
-				   AtkTextBoundary  boundary_type,
-				   gint		    *start_offset,
-				   gint		    *end_offset)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return NULL;
-
-  return NULL;
-}
-
-static gint
-ev_view_accessible_get_character_count (AtkText *text)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return 0;
-
-  return 0;
-}
-
-static gint
-ev_view_accessible_get_caret_offset (AtkText *text)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return 0;
- 
-  return 0;
-}
-
-static gboolean
-ev_view_accessible_set_caret_offset (AtkText *text, gint offset)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return FALSE;
-
-  return FALSE;
-}
-
-static AtkAttributeSet*
-ev_view_accessible_get_run_attributes (AtkText *text,
-			       gint    offset,
-                               gint    *start_offset,
-                               gint    *end_offset)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return NULL;
- 
-  return NULL;
-}
-
-static AtkAttributeSet*
-ev_view_accessible_get_default_attributes (AtkText *text)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return NULL;
-
-  return NULL;
-}
-  
-static void
-ev_view_accessible_get_character_extents (AtkText *text,
-				  gint    offset,
-		                  gint    *x,
-                    		  gint 	  *y,
-                                  gint 	  *width,
-                                  gint 	  *height,
-			          AtkCoordType coords)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return;
-
-  return;
-} 
-
-static gint 
-ev_view_accessible_get_offset_at_point (AtkText *text,
-                                gint x,
-                                gint y,
-			        AtkCoordType coords)
-{ 
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return -1;
-
-  return -1;
-}
-
-static gint
-ev_view_accessible_get_n_selections (AtkText              *text)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return -1;
-    
-  return -1;
-}
-
-static gchar*
-ev_view_accessible_get_selection (AtkText *text,
-			  gint    selection_num,
-                          gint    *start_pos,
-                          gint    *end_pos)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return NULL;
-
-  return NULL;
-}
-
-static gboolean
-ev_view_accessible_add_selection (AtkText *text,
-                          gint    start_pos,
-                          gint    end_pos)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return FALSE;
-
-  return FALSE;
-}
-
-static gboolean
-ev_view_accessible_remove_selection (AtkText *text,
-                             gint    selection_num)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return FALSE;
-
-  return FALSE;
-}
-
-static gboolean
-ev_view_accessible_set_selection (AtkText *text,
-			  gint	  selection_num,
-                          gint    start_pos,
-                          gint    end_pos)
-{
-  GtkWidget *widget;
-
-  widget = GTK_ACCESSIBLE (text)->widget;
-  if (widget == NULL)
-    /* State is defunct */
-    return FALSE;
-
-  return FALSE;
-}
-
-
-static void ev_view_accessible_text_iface_init (AtkTextIface * iface)
-{
-	g_return_if_fail (iface != NULL);
-
-	iface->get_text = ev_view_accessible_get_text;
-	iface->get_character_at_offset = ev_view_accessible_get_character_at_offset;
-	iface->get_text_before_offset = ev_view_accessible_get_text_before_offset;
-	iface->get_text_at_offset = ev_view_accessible_get_text_at_offset;
-	iface->get_text_after_offset = ev_view_accessible_get_text_after_offset;
-	iface->get_caret_offset = ev_view_accessible_get_caret_offset;
-	iface->set_caret_offset = ev_view_accessible_set_caret_offset;
-	iface->get_character_count = ev_view_accessible_get_character_count;
-	iface->get_n_selections = ev_view_accessible_get_n_selections;
-	iface->get_selection = ev_view_accessible_get_selection;
-	iface->add_selection = ev_view_accessible_add_selection;
-	iface->remove_selection = ev_view_accessible_remove_selection;
-	iface->set_selection = ev_view_accessible_set_selection;
-	iface->get_run_attributes = ev_view_accessible_get_run_attributes;
-	iface->get_default_attributes = ev_view_accessible_get_default_attributes;
-	iface->get_character_extents = ev_view_accessible_get_character_extents;
-	iface->get_offset_at_point = ev_view_accessible_get_offset_at_point;
-	return;
-}
-
-static gboolean
-ev_view_accessible_idle_do_action (gpointer data)
-{
-	EvViewAccessiblePriv* priv = EV_VIEW_ACCESSIBLE_GET_PRIVATE (data);
-	
-	ev_view_scroll (EV_VIEW (GTK_ACCESSIBLE (data)->widget), 
-			priv->idle_scroll,
-			FALSE);
-	priv->action_idle_handler = 0;
-	return FALSE;
-}
-
-static gboolean
-ev_view_accessible_action_do_action (AtkAction *action,
-                                     gint       i)
-{
-	EvViewAccessiblePriv* priv = EV_VIEW_ACCESSIBLE_GET_PRIVATE (action);
-	
-	if (GTK_ACCESSIBLE (action)->widget == NULL)
-		return FALSE;
-
-	if (priv->action_idle_handler)
-		return FALSE;
-	
-	switch (i) {
-		case ACTION_SCROLL_UP:
-			priv->idle_scroll = GTK_SCROLL_PAGE_BACKWARD;
-			break;
-		case ACTION_SCROLL_DOWN:
-			priv->idle_scroll = GTK_SCROLL_PAGE_FORWARD;
-			break;
-		default:
-			return FALSE;
-	}
-	priv->action_idle_handler = g_idle_add (ev_view_accessible_idle_do_action, 
-						action);
-	return TRUE;
-}
-
-static gint
-ev_view_accessible_action_get_n_actions (AtkAction *action)
-{
-        return LAST_ACTION;
-}
-
-static const gchar *
-ev_view_accessible_action_get_description (AtkAction *action,
-                                           gint       i)
-{
-  EvViewAccessiblePriv* priv = EV_VIEW_ACCESSIBLE_GET_PRIVATE (action);
-
-  if (i < 0 || i >= LAST_ACTION) 
-    return NULL;
-
-  if (priv->action_descriptions[i])
-    return priv->action_descriptions[i];
-  else
-    return ev_view_accessible_action_descriptions[i];
-}
-
-static const gchar *
-ev_view_accessible_action_get_name (AtkAction *action,
-                                    gint       i)
-{
-  if (i < 0 || i >= LAST_ACTION) 
-    return NULL;
-
-  return ev_view_accessible_action_names[i];
-}
-
-static gboolean
-ev_view_accessible_action_set_description (AtkAction   *action,
-                                           gint         i,
-                                           const gchar *description)
-{
-  EvViewAccessiblePriv* priv = EV_VIEW_ACCESSIBLE_GET_PRIVATE (action);
-  gchar *old_description;
-
-  if (i < 0 || i >= LAST_ACTION) 
-    return FALSE;
-
-  old_description = priv->action_descriptions[i];
-  priv->action_descriptions[i] = g_strdup (description);
-  g_free (old_description);
-
-  return TRUE;
-}
-
-static void ev_view_accessible_action_iface_init (AtkActionIface * iface)
-{
-	iface->do_action = ev_view_accessible_action_do_action;
-	iface->get_n_actions = ev_view_accessible_action_get_n_actions;
-	iface->get_description = ev_view_accessible_action_get_description;
-	iface->get_name = ev_view_accessible_action_get_name;
-	iface->set_description = ev_view_accessible_action_set_description;
-}
-
-GType ev_view_accessible_get_type (void)
-{
-	static GType type = 0;
-
-	if (G_UNLIKELY (type == 0)) {
-		GTypeInfo tinfo = {
-			0,	/* class size */
-			(GBaseInitFunc) NULL,	/* base init */
-			(GBaseFinalizeFunc) NULL,	/* base finalize */
-			(GClassInitFunc) ev_view_accessible_class_init,	/* class init */
-			(GClassFinalizeFunc) NULL,	/* class finalize */
-			NULL,	/* class data */
-			0,	/* instance size */
-			0,	/* nb preallocs */
- 			(GInstanceInitFunc) NULL,	/* instance init */
-			NULL	/* value table */
-		};
-
-		const GInterfaceInfo atk_text_info = {
-			(GInterfaceInitFunc)
-			    ev_view_accessible_text_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		const GInterfaceInfo atk_action_info = {
-			(GInterfaceInitFunc)
-			    ev_view_accessible_action_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-	        /*
-    	         * Figure out the size of the class and instance
-		 * we are deriving from
-    		 */
-		AtkObjectFactory *factory;
-		GType derived_type;
-	        GTypeQuery query;
-    		GType derived_atk_type;	    
-
-    		derived_type = g_type_parent (EV_TYPE_VIEW);
-		factory = atk_registry_get_factory (atk_get_default_registry (), 
-                                        	    derived_type);
-    		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-
-	        g_type_query (derived_atk_type, &query);
-    		tinfo.class_size = query.class_size;
-		tinfo.instance_size = query.instance_size;
- 
-    		type = g_type_register_static (derived_atk_type, "EvViewAccessible",
-					       &tinfo, 0);
-		g_type_add_interface_static (type, ATK_TYPE_TEXT,
-					     &atk_text_info);
-		g_type_add_interface_static (type, ATK_TYPE_ACTION,
-					     &atk_action_info);
-	}
-
-	return type;
-}
-
-static AtkObject *ev_view_accessible_new(GObject * obj)
-{
-	AtkObject *accessible;
-	
-	g_return_val_if_fail(EV_IS_VIEW (obj), NULL);
-
-	accessible = g_object_new (ev_view_accessible_get_type (), NULL);
-	atk_object_initialize (accessible, obj);
-
-	atk_object_set_name (ATK_OBJECT (accessible), _("Document View"));
-	atk_object_set_role (ATK_OBJECT (accessible), ATK_ROLE_UNKNOWN);
-
-	return accessible;
-}
-
-typedef AtkObjectFactory      EvViewAccessibleFactory;
-typedef AtkObjectFactoryClass EvViewAccessibleFactoryClass;
-
-static void ev_view_accessible_factory_init (EvViewAccessibleFactory *factory)
-{
-}
-
-static GType ev_view_accessible_factory_get_accessible_type(void)
-{
-	return ev_view_accessible_get_type();
-}
-
-static AtkObject *ev_view_accessible_factory_create_accessible (GObject * obj)
-{
-	return ev_view_accessible_new(obj);
-}
-
-static void ev_view_accessible_factory_class_init (AtkObjectFactoryClass * klass)
-{
-	klass->create_accessible = ev_view_accessible_factory_create_accessible;
-	klass->get_accessible_type =
-	    ev_view_accessible_factory_get_accessible_type;
-}
-
-G_DEFINE_TYPE (EvViewAccessibleFactory, ev_view_accessible_factory, ATK_TYPE_OBJECT_FACTORY)
diff --git a/shell/ev-view-accessible.h b/shell/ev-view-accessible.h
deleted file mode 100644
index c29c471..0000000
--- a/shell/ev-view-accessible.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */
-/* this file is part of evince, a gnome document viewer
- *
- *  Copyright (C) 2004 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.
- */
-
-#ifndef __EV_VIEW_ACCESSIBLE_H__
-#define __EV_VIEW_ACCESSIBLE_H__
-
-#include "ev-view.h"
-
-GType ev_view_accessible_factory_get_type (void);
-
-#endif  /* __EV_VIEW_ACCESSIBLE_H__ */
-
diff --git a/shell/ev-view-private.h b/shell/ev-view-private.h
deleted file mode 100644
index c894440..0000000
--- a/shell/ev-view-private.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */
-/* this file is part of evince, a gnome document viewer
- *
- *  Copyright (C) 2004 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.
- */
-
-#ifndef __EV_VIEW_PRIVATE_H__
-#define __EV_VIEW_PRIVATE_H__
-
-#include "ev-view.h"
-#include "ev-pixbuf-cache.h"
-#include "ev-page-cache.h"
-#include "ev-jobs.h"
-#include "ev-image.h"
-#include "ev-form-field.h"
-#include "ev-selection.h"
-#include "ev-transition-animation.h"
-
-#define DRAG_HISTORY 10
-
-/* Information for middle clicking and moving around the doc */
-typedef struct {
-        gboolean in_drag;
-	GdkPoint start;
-	gdouble hadj;
-	gdouble vadj;
-	guint drag_timeout_id;
-	guint release_timeout_id;
-	GdkPoint buffer[DRAG_HISTORY];
-	GdkPoint momentum;
-} DragInfo;
-
-/* Autoscrolling */
-typedef struct {
-	gboolean autoscrolling;
-	guint last_y;
-	guint start_y;
-	guint timeout_id;	
-} AutoScrollInfo;
-
-/* Information for handling selection */
-typedef struct {
-	gboolean in_drag;
-	GdkPoint start;
-	gboolean in_selection;
-	GList *selections;
-	EvSelectionStyle style;
-} SelectionInfo;
-
-/* Information for handling images DND */
-typedef struct {
-	gboolean in_drag;
-	GdkPoint start;
-	EvImage *image;
-} ImageDNDInfo;
-
-typedef enum {
-	SCROLL_TO_KEEP_POSITION,
-	SCROLL_TO_PAGE_POSITION,
-	SCROLL_TO_CENTER,
-	SCROLL_TO_FIND_LOCATION,
-} PendingScroll;
-
-typedef enum {
-	EV_VIEW_CURSOR_NORMAL,
-	EV_VIEW_CURSOR_IBEAM,
-	EV_VIEW_CURSOR_LINK,
-	EV_VIEW_CURSOR_WAIT,
-	EV_VIEW_CURSOR_HIDDEN,
-	EV_VIEW_CURSOR_DRAG,
-	EV_VIEW_CURSOR_AUTOSCROLL,
-} EvViewCursor;
-
-typedef enum {
-	EV_PRESENTATION_NORMAL,
-	EV_PRESENTATION_BLACK,
-	EV_PRESENTATION_WHITE,
-	EV_PRESENTATION_END
-} EvPresentationState;
-
-struct _EvView {
-	GtkLayout layout;
-
-	EvDocument *document;
-
-	/* Find */
-	GList **find_pages;
-	gint find_result;
-	gboolean jump_to_find_result;
-	gboolean highlight_find_results;
-	
-	EvPageCache *page_cache;
-	EvPixbufCache *pixbuf_cache;
-	EvViewCursor cursor;
-	EvJobRender *current_job;
-
-	/* Scrolling */
-	GtkAdjustment *hadjustment;
-	GtkAdjustment *vadjustment;
-
-	gint scroll_x;
-	gint scroll_y;	
-
-	PendingScroll pending_scroll;
-	gboolean      pending_resize;
-	EvPoint       pending_point;
-
-	/* Current geometry */
-    
-	gint start_page;
-	gint end_page;
-	gint current_page;
-
-	gint rotation;
-	gdouble scale;
-	gint spacing;
-	gdouble dpi;
-	gdouble max_scale;
-	gdouble min_scale;
-
-	gboolean loading;
-	gboolean continuous;
-	gboolean dual_page;
-	gboolean fullscreen;
-	gboolean presentation;
-	EvSizingMode sizing_mode;
-	cairo_surface_t *loading_text;
-
-	/* Presentation */
-	EvPresentationState presentation_state;
-	EvSizingMode sizing_mode_saved;
-	double scale_saved;
-	guint  trans_timeout_id;
-
-	/* Common for button press handling */
-	int pressed_button;
-
-	/* Information for middle clicking and dragging around. */
-	DragInfo drag_info;
-	
-	/* Autoscrolling */
-	AutoScrollInfo scroll_info;
-
-	/* Selection */
-	GdkPoint motion;
-	guint selection_update_id;
-	guint selection_scroll_id;
-
-	EvViewSelectionMode selection_mode;
-	SelectionInfo selection_info;
-
-	/* Copy link address selection */
-	EvLinkAction *link_selected;
-
-	/* Image DND */
-	ImageDNDInfo image_dnd_info;
-
-	/* Goto Popup */
-	GtkWidget *goto_window;
-	GtkWidget *goto_entry;
-
-	EvTransitionAnimation *animation;
-};
-
-struct _EvViewClass {
-	GtkLayoutClass parent_class;
-
-	void    (*binding_activated)	  (EvView         *view,
-					   GtkScrollType   scroll,
-					   gboolean        horizontal);
-	void    (*zoom_invalid)		  (EvView         *view);
-	void    (*handle_link)		  (EvView         *view,
-					   EvLink         *link);
-	void    (*external_link)	  (EvView         *view,
-					   EvLinkAction   *action);
-	void    (*popup_menu)		  (EvView         *view,
-					   EvLink         *link);
-};
-
-#endif  /* __EV_VIEW_PRIVATE_H__ */
-
diff --git a/shell/ev-view.c b/shell/ev-view.c
deleted file mode 100644
index b8964b1..0000000
--- a/shell/ev-view.c
+++ /dev/null
@@ -1,5891 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */
-/* this file is part of evince, a gnome document viewer
- *
- *  Copyright (C) 2004 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 <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#include "ev-document-forms.h"
-#include "ev-document-images.h"
-#include "ev-document-links.h"
-#include "ev-document-misc.h"
-#include "ev-document-transition.h"
-#include "ev-marshal.h"
-#include "ev-page-cache.h"
-#include "ev-pixbuf-cache.h"
-#include "ev-transition-animation.h"
-#include "ev-utils.h"
-#include "ev-view.h"
-#include "ev-view-private.h"
-
-#define EV_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_VIEW, EvViewClass))
-#define EV_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_VIEW))
-#define EV_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EV_TYPE_VIEW, EvViewClass))
-
-enum {
-	PROP_0,
-	PROP_CONTINUOUS,
-	PROP_DUAL_PAGE,
-	PROP_FULLSCREEN,
-	PROP_PRESENTATION,
-	PROP_SIZING_MODE,
-	PROP_ZOOM,
-	PROP_ROTATION,
-	PROP_HAS_SELECTION,
-};
-
-enum {
-	SIGNAL_BINDING_ACTIVATED,
-	SIGNAL_ZOOM_INVALID,
-	SIGNAL_HANDLE_LINK,
-	SIGNAL_EXTERNAL_LINK,
-	SIGNAL_POPUP_MENU,
-	N_SIGNALS,
-};
-
-enum {
-	TARGET_DND_URI,
-	TARGET_DND_TEXT,
-	TARGET_DND_IMAGE
-};
-
-enum {
-	TARGET_STRING,
-	TARGET_TEXT,
-	TARGET_COMPOUND_TEXT,
-	TARGET_UTF8_STRING,
-	TARGET_TEXT_BUFFER_CONTENTS
-};
-
-static const GtkTargetEntry clipboard_targets[] = {
-	{ "STRING", 0, TARGET_STRING },
-	{ "TEXT",   0, TARGET_TEXT },
-	{ "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT },
-	{ "UTF8_STRING", 0, TARGET_UTF8_STRING },
-};
-
-static guint signals[N_SIGNALS];
-
-typedef enum {
-	EV_VIEW_FIND_NEXT,
-	EV_VIEW_FIND_PREV
-} EvViewFindDirection;
-
-#define ZOOM_IN_FACTOR  1.2
-#define ZOOM_OUT_FACTOR (1.0/ZOOM_IN_FACTOR)
-
-#define MIN_SCALE 0.05409
-#define MAX_SCALE 4.0
-
-#define SCROLL_TIME 150
-
-/*** Scrolling ***/
-static void       scroll_to_current_page 		     (EvView *view,
-							      GtkOrientation orientation);
-static void       ev_view_set_scroll_adjustments             (GtkLayout          *layout,
-							      GtkAdjustment      *hadjustment,
-							      GtkAdjustment      *vadjustment);
-static void       view_update_range_and_current_page         (EvView             *view);
-static void       set_scroll_adjustment                      (EvView             *view,
-							      GtkOrientation      orientation,
-							      GtkAdjustment      *adjustment);
-static void       add_scroll_binding_keypad                  (GtkBindingSet      *binding_set,
-							      guint               keyval,
-							      GdkModifierType modifiers,
-							      GtkScrollType       scroll,
-							      gboolean            horizontal);
-static void       ensure_rectangle_is_visible                (EvView             *view,
-							      GdkRectangle       *rect);
-
-/*** Geometry computations ***/
-static void       compute_border                             (EvView             *view,
-							      int                 width,
-							      int                 height,
-							      GtkBorder          *border);
-static void       get_page_y_offset                          (EvView *view,
-							      int page,
-							      double zoom,
-							      int *y_offset);
-static gboolean   get_page_extents                           (EvView             *view,
-							      gint                page,
-							      GdkRectangle       *page_area,
-							      GtkBorder          *border);
-static void       view_rect_to_doc_rect                      (EvView             *view,
-							      GdkRectangle       *view_rect,
-							      GdkRectangle       *page_area,
-							      EvRectangle        *doc_rect);
-static void       doc_rect_to_view_rect                      (EvView             *view,
-							      int                 page,
-							      EvRectangle        *doc_rect,
-							      GdkRectangle       *view_rect);
-static void       find_page_at_location                      (EvView             *view,
-							      gdouble             x,
-							      gdouble             y,
-							      gint               *page,
-							      gint               *x_offset,
-							      gint               *y_offset);
-static gboolean  doc_point_to_view_point 		     (EvView             *view,
-				                              int                 page,
-							      EvPoint            *doc_point,
-					     	              GdkPoint           *view_point);
-/*** Hyperrefs ***/
-static EvLink *   ev_view_get_link_at_location 		     (EvView             *view,
-				  	         	      gdouble             x,
-		            				      gdouble             y);
-static char*      tip_from_link                              (EvView             *view,
-							      EvLink             *link);
-/*** Forms ***/
-static EvFormField *ev_view_get_form_field_at_location       (EvView             *view,
-							       gdouble            x,
-							       gdouble            y);
-
-/*** GtkWidget implementation ***/
-static void       ev_view_size_request_continuous_dual_page  (EvView             *view,
-							      GtkRequisition     *requisition);
-static void       ev_view_size_request_continuous            (EvView             *view,
-							      GtkRequisition     *requisition);
-static void       ev_view_size_request_dual_page             (EvView             *view,
-							      GtkRequisition     *requisition);
-static void       ev_view_size_request_single_page           (EvView             *view,
-							      GtkRequisition     *requisition);
-static void       ev_view_size_request                       (GtkWidget          *widget,
-							      GtkRequisition     *requisition);
-static void       ev_view_size_allocate                      (GtkWidget          *widget,
-							      GtkAllocation      *allocation);
-static void       ev_view_realize                            (GtkWidget          *widget);
-static gboolean   ev_view_scroll_event                       (GtkWidget          *widget,
-							      GdkEventScroll     *event);
-static gboolean   ev_view_expose_event                       (GtkWidget          *widget,
-							      GdkEventExpose     *event);
-static gboolean   ev_view_popup_menu                         (GtkWidget 	 *widget);
-static gboolean   ev_view_button_press_event                 (GtkWidget          *widget,
-							      GdkEventButton     *event);
-static gboolean   ev_view_motion_notify_event                (GtkWidget          *widget,
-							      GdkEventMotion     *event);
-static gboolean   ev_view_button_release_event               (GtkWidget          *widget,
-							      GdkEventButton     *event);
-static gboolean   ev_view_enter_notify_event                 (GtkWidget          *widget,
-							      GdkEventCrossing   *event);
-static gboolean   ev_view_leave_notify_event                 (GtkWidget          *widget,
-							      GdkEventCrossing   *event);
-static void       ev_view_style_set                          (GtkWidget          *widget,
-							      GtkStyle           *old_style);
-static void       ev_view_remove_all                         (EvView             *view);
-
-static AtkObject *ev_view_get_accessible                     (GtkWidget *widget);
-
-/*** Drawing ***/
-static guint32    ev_gdk_color_to_rgb                        (const GdkColor     *color);
-static void       draw_rubberband                            (GtkWidget          *widget,
-							      GdkWindow          *window,
-							      const GdkRectangle *rect,
-							      guchar              alpha);
-static void       highlight_find_results                     (EvView             *view,
-							      int                 page);
-static void       draw_one_page                              (EvView             *view,
-							      gint                page,
-							      cairo_t            *cr,
-							      GdkRectangle       *page_area,
-							      GtkBorder          *border,
-							      GdkRectangle       *expose_area,
-							      gboolean		 *page_ready);
-static void	  draw_loading_text 			     (EvView             *view,
-							      GdkRectangle       *page_area,
-							      GdkRectangle       *expose_area);
-static void       ev_view_reload_page                        (EvView             *view,
-							      gint                page,
-							      GdkRegion          *region);
-
-/*** Callbacks ***/
-static void       job_finished_cb                            (EvPixbufCache      *pixbuf_cache,
-							      GdkRegion          *region,
-							      EvView             *view);
-static void       page_changed_cb                            (EvPageCache        *page_cache,
-							      int                 new_page,
-							      EvView             *view);
-static void       on_adjustment_value_changed                (GtkAdjustment      *adjustment,
-							      EvView             *view);
-
-/*** GObject ***/
-static void       ev_view_finalize                           (GObject            *object);
-static void       ev_view_destroy                            (GtkObject          *object);
-static void       ev_view_set_property                       (GObject            *object,
-							      guint               prop_id,
-							      const GValue       *value,
-							      GParamSpec         *pspec);
-static void       ev_view_get_property                       (GObject            *object,
-							      guint               prop_id,
-							      GValue             *value,
-							      GParamSpec         *pspec);
-static void       ev_view_class_init                         (EvViewClass        *class);
-static void       ev_view_init                               (EvView             *view);
-
-/*** Zoom and sizing ***/
-static double   zoom_for_size_fit_width	 		     (int doc_width,
-							      int doc_height,
-	    						      int target_width,
-							      int target_height,
-							      int vsb_width);
-static double   zoom_for_size_fit_height		     (int doc_width,
-			  				      int doc_height,
-							      int target_width,
-							      int target_height,
-							      int vsb_height);
-static double	zoom_for_size_best_fit 			     (int doc_width,
-							      int doc_height,
-							      int target_width,
-							      int target_height,
-							      int vsb_width,
-							      int hsb_width);
-static void	ev_view_zoom_for_size_presentation	     (EvView *view,
-							      int     width,
-					    		      int     height);
-static void	ev_view_zoom_for_size_continuous_and_dual_page (EvView *view,
-							        int     width,
-						     	        int     height,
-							        int     vsb_width,
-							        int     hsb_height);
-static void	ev_view_zoom_for_size_continuous	       (EvView *view,
-					    		        int     width,
-								int     height,
-				    				int     vsb_width,
-								int     hsb_height);
-static void 	ev_view_zoom_for_size_dual_page 	       (EvView *view,
-						    		int     width,
-								int     height,
-								int     vsb_width,
-								int     hsb_height);
-static void	ev_view_zoom_for_size_single_page 	       (EvView *view,
-				    			        int     width,
-					    			int     height,
-								int     vsb_width,
-								int     hsb_height);
-/*** Cursors ***/
-static GdkCursor* ev_view_create_invisible_cursor            (void);
-static void       ev_view_set_cursor                         (EvView             *view,
-							      EvViewCursor        new_cursor);
-static void       ev_view_handle_cursor_over_xy              (EvView *view,
-							      gint x,
-							      gint y);
-
-/*** Find ***/
-static gint         ev_view_find_get_n_results               (EvView             *view,
-							      gint                page);
-static EvRectangle *ev_view_find_get_result                  (EvView             *view,
-							      gint                page,
-							      gint                result);
-static void       jump_to_find_result                        (EvView             *view);
-static void       jump_to_find_page                          (EvView             *view, 
-							      EvViewFindDirection direction,
-							      gint                shift);
-
-/*** Selection ***/
-static void       compute_selections                         (EvView             *view,
-							      EvSelectionStyle    style,
-							      GdkPoint           *start,
-							      GdkPoint           *stop);
-static void       clear_selection                            (EvView             *view);
-static void       clear_link_selected                        (EvView             *view);
-static void       selection_free                             (EvViewSelection    *selection);
-static char*      get_selected_text                          (EvView             *ev_view);
-static void       ev_view_primary_get_cb                     (GtkClipboard       *clipboard,
-							      GtkSelectionData   *selection_data,
-							      guint               info,
-							      gpointer            data);
-static void       ev_view_primary_clear_cb                   (GtkClipboard       *clipboard,
-							      gpointer            data);
-static void       ev_view_update_primary_selection           (EvView             *ev_view);
-
-/*** Presentation ***/
-static void       ev_view_presentation_transition_start      (EvView             *ev_view);
-static void       ev_view_presentation_transition_stop       (EvView             *ev_view);
-
-
-G_DEFINE_TYPE (EvView, ev_view, GTK_TYPE_LAYOUT)
-
-static void
-scroll_to_current_page (EvView *view, GtkOrientation orientation)
-{
-	GdkPoint view_point;
-
-	if (view->document == NULL) {
-		return;
-	}
-
-        doc_point_to_view_point (view, view->current_page, &view->pending_point, &view_point);
-
-	if (orientation == GTK_ORIENTATION_VERTICAL) {
-		view->pending_point.y = 0;
-	} else {
-		view->pending_point.x = 0;
-	}
-
-	if (orientation == GTK_ORIENTATION_VERTICAL) {
-		if (view->continuous) {
-    			gtk_adjustment_clamp_page (view->vadjustment,
-						   view_point.y - view->spacing / 2,
-						   view_point.y + view->vadjustment->page_size);
-		} else {
-			gtk_adjustment_set_value (view->vadjustment,
-						  CLAMP (view_point.y,
-						  view->vadjustment->lower,
-						  view->vadjustment->upper -
-						  view->vadjustment->page_size));
-		}
-	} else {
-		if (view->dual_page) {
-			gtk_adjustment_clamp_page (view->hadjustment,
-						   view_point.x,
-						   view_point.x + view->hadjustment->page_size);
-		} else {
-			gtk_adjustment_set_value (view->hadjustment,
-						  CLAMP (view_point.x,
-						  view->hadjustment->lower,
-						  view->hadjustment->upper -
-						  view->hadjustment->page_size));
-		}
-	}
-}
-
-static void
-view_set_adjustment_values (EvView         *view,
-			    GtkOrientation  orientation)
-{
-	GtkWidget *widget = GTK_WIDGET (view);
-	GtkAdjustment *adjustment;
-	int requisition;
-	int allocation;
-
-	double factor;
-	gint new_value;
-
-	if (orientation == GTK_ORIENTATION_HORIZONTAL)  {
-		requisition = widget->requisition.width;
-		allocation = widget->allocation.width;
-		adjustment = view->hadjustment;
-	} else {
-		requisition = widget->requisition.height;
-		allocation = widget->allocation.height;
-		adjustment = view->vadjustment;
-	}
-
-	if (!adjustment)
-		return;
-
-	factor = 1.0;
-	switch (view->pending_scroll) {
-    	        case SCROLL_TO_KEEP_POSITION:
-    	        case SCROLL_TO_FIND_LOCATION:
-			factor = (adjustment->value) / adjustment->upper;
-			break;
-    	        case SCROLL_TO_PAGE_POSITION:
-			break;
-    	        case SCROLL_TO_CENTER:
-			factor = (adjustment->value + adjustment->page_size * 0.5) / adjustment->upper;
-			break;
-	}
-
-	adjustment->page_size = allocation;
-	adjustment->step_increment = allocation * 0.1;
-	adjustment->page_increment = allocation * 0.9;
-	adjustment->lower = 0;
-	adjustment->upper = MAX (allocation, requisition);
-
-	/*
-	 * We add 0.5 to the values before to average out our rounding errors.
-	 */
-	switch (view->pending_scroll) {
-    	        case SCROLL_TO_KEEP_POSITION:
-    	        case SCROLL_TO_FIND_LOCATION:
-			new_value = CLAMP (adjustment->upper * factor + 0.5, 0, adjustment->upper - adjustment->page_size);
-			gtk_adjustment_set_value (adjustment, (int)new_value);
-			break;
-    	        case SCROLL_TO_PAGE_POSITION:
-			scroll_to_current_page (view, orientation);
-			break;
-    	        case SCROLL_TO_CENTER:
-			new_value = CLAMP (adjustment->upper * factor - adjustment->page_size * 0.5 + 0.5,
-					   0, adjustment->upper - adjustment->page_size);
-			gtk_adjustment_set_value (adjustment, (int)new_value);
-			break;
-	}
-
-	gtk_adjustment_changed (adjustment);
-}
-
-static void
-view_update_range_and_current_page (EvView *view)
-{
-	gint current_page;
-	gint best_current_page = -1;
-	
-	/* Presentation trumps all other modes */
-	if (view->presentation) {
-		view->start_page = view->current_page;
-		view->end_page = view->current_page;
-	} else if (view->continuous) {
-		GdkRectangle current_area, unused, page_area;
-		GtkBorder border;
-		gboolean found = FALSE;
-		gint area_max = -1, area;
-		int i;
-
-		if (!(view->vadjustment && view->hadjustment))
-			return;
-
-		current_area.x = view->hadjustment->value;
-		current_area.width = view->hadjustment->upper;
-		current_area.y = view->vadjustment->value;
-		current_area.height = view->vadjustment->page_size;
-
-		for (i = 0; i < ev_page_cache_get_n_pages (view->page_cache); i++) {
-
-			get_page_extents (view, i, &page_area, &border);
-
-			if (gdk_rectangle_intersect (&current_area, &page_area, &unused)) {
-				area = unused.width * unused.height;
-
-				if (!found) {
-					area_max = area;
-					view->start_page = i;
-					found = TRUE;
-					best_current_page = i;
-				}
-				if (area > area_max) {
-					best_current_page = (area == area_max) ? MIN (i, best_current_page) : i;
-					area_max = area;
-				}
-
-				view->end_page = i;
-			} else if (found && view->current_page <= view->end_page) {
-				break;
-			}
-		}
-
-	} else if (view->dual_page) {
-		if (view->current_page % 2 == ev_page_cache_get_dual_even_left (view->page_cache)) {
-			view->start_page = view->current_page;
-			if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache))
-				view->end_page = view->start_page + 1;
-			else 
-				view->end_page = view->start_page;
-		} else {
-			if (view->current_page < 1)
-				view->start_page = view->current_page;
-			else
-				view->start_page = view->current_page - 1;
-			view->end_page = view->current_page;
-		}
-	} else {
-		view->start_page = view->current_page;
-		view->end_page = view->current_page;
-	}
-
-	best_current_page = MAX (best_current_page, view->start_page);
-	current_page = ev_page_cache_get_current_page (view->page_cache);
-
-	if ((current_page != best_current_page) && (view->pending_scroll == SCROLL_TO_KEEP_POSITION)) {
-		view->current_page = best_current_page;
-		ev_page_cache_set_current_page (view->page_cache, best_current_page);
-	}
-
-	ev_pixbuf_cache_set_page_range (view->pixbuf_cache,
-					view->start_page,
-					view->end_page,
-					view->rotation,
-					view->scale,
-					view->selection_info.selections);
-}
-
-static void
-set_scroll_adjustment (EvView *view,
-		       GtkOrientation  orientation,
-		       GtkAdjustment  *adjustment)
-{
-	GtkAdjustment **to_set;
-
-	if (orientation == GTK_ORIENTATION_HORIZONTAL)
-		to_set = &view->hadjustment;
-	else
-		to_set = &view->vadjustment;
-
-	if (*to_set != adjustment) {
-		if (*to_set) {
-			g_signal_handlers_disconnect_by_func (*to_set,
-							      (gpointer) on_adjustment_value_changed,
-							      view);
-			g_object_unref (*to_set);
-		}
-
-		*to_set = adjustment;
-		view_set_adjustment_values (view, orientation);
-
-		if (*to_set) {
-			g_object_ref (*to_set);
-			g_signal_connect (*to_set, "value_changed",
-					  G_CALLBACK (on_adjustment_value_changed), view);
-		}
-	}
-}
-
-static void
-ev_view_set_scroll_adjustments (GtkLayout      *layout,
-				GtkAdjustment  *hadjustment,
-				GtkAdjustment  *vadjustment)
-{
-	EvView *view = EV_VIEW (layout);
-	
-	set_scroll_adjustment (view, GTK_ORIENTATION_HORIZONTAL, hadjustment);
-	set_scroll_adjustment (view, GTK_ORIENTATION_VERTICAL, vadjustment);
-	
-	on_adjustment_value_changed (NULL, view);
-}
-
-static void
-add_scroll_binding_keypad (GtkBindingSet  *binding_set,
-    			   guint           keyval,
-    			   GdkModifierType modifiers,
-    			   GtkScrollType   scroll,
-			   gboolean        horizontal)
-{
-  guint keypad_keyval = keyval - GDK_Left + GDK_KP_Left;
-
-  gtk_binding_entry_add_signal (binding_set, keyval, modifiers,
-                                "binding_activated", 2,
-                                GTK_TYPE_SCROLL_TYPE, scroll,
-				G_TYPE_BOOLEAN, horizontal);
-  gtk_binding_entry_add_signal (binding_set, keypad_keyval, modifiers,
-                                "binding_activated", 2,
-                                GTK_TYPE_SCROLL_TYPE, scroll,
-				G_TYPE_BOOLEAN, horizontal);
-}
-
-void
-ev_view_scroll (EvView        *view,
-	        GtkScrollType  scroll,
-		gboolean       horizontal)
-{
-	GtkAdjustment *adjustment;
-	double value, increment;
-	gboolean first_page = FALSE;
-	gboolean last_page = FALSE;
-
-	view->jump_to_find_result = FALSE;
-
-	if (view->presentation || view->sizing_mode == EV_SIZING_BEST_FIT) {
-		switch (scroll) {
-			case GTK_SCROLL_PAGE_BACKWARD:
-			case GTK_SCROLL_STEP_BACKWARD:
-				ev_view_previous_page (view);
-				break;
-			case GTK_SCROLL_PAGE_FORWARD:
-			case GTK_SCROLL_STEP_FORWARD:
-				ev_view_next_page (view);
-				break;
-			default:
-				break;
-		}
-		return;
-	}
-
-	/* Assign values for increment and vertical adjustment */
-	adjustment = horizontal ? view->hadjustment : view->vadjustment;
-	increment = adjustment->page_size * 0.75;
-	value = adjustment->value;
-
-	/* Assign boolean for first and last page */
-	if (view->current_page == 0)
-		first_page = TRUE;
-	if (view->current_page == ev_page_cache_get_n_pages (view->page_cache) - 1)
-		last_page = TRUE;
-
-	switch (scroll) {
-		case GTK_SCROLL_PAGE_BACKWARD:
-			/* Do not jump backwards if at the first page */
-			if (value == (adjustment->lower) && first_page) {
-				/* Do nothing */
-				/* At the top of a page, assign the upper bound limit of previous page */
-			} else if (value == (adjustment->lower)) {
-				value = adjustment->upper - adjustment->page_size;
-				ev_view_previous_page (view);
-				/* Jump to the top */
-			} else {
-				value = MAX (value - increment, adjustment->lower);
-			}
-			break;
-		case GTK_SCROLL_PAGE_FORWARD:
-			/* Do not jump forward if at the last page */
-			if (value == (adjustment->upper - adjustment->page_size) && last_page) {
-				/* Do nothing */
-			/* At the bottom of a page, assign the lower bound limit of next page */
-			} else if (value == (adjustment->upper - adjustment->page_size)) {
-				value = 0;
-				ev_view_next_page (view);
-			/* Jump to the bottom */
-			} else {
-				value = MIN (value + increment, adjustment->upper - adjustment->page_size);
-			}
-			break;
-	        case GTK_SCROLL_STEP_BACKWARD:
-			value -= adjustment->step_increment;
-			break;
-	        case GTK_SCROLL_STEP_FORWARD:
-			value += adjustment->step_increment;
-			break;
-        	case GTK_SCROLL_STEP_DOWN:
-			value -= adjustment->step_increment / 10;
-			break;
-        	case GTK_SCROLL_STEP_UP:
-			value += adjustment->step_increment / 10;
-			break;
-        	default:
-			break;
-	}
-
-	value = CLAMP (value, adjustment->lower,
-		       adjustment->upper - adjustment->page_size);	
-
-	gtk_adjustment_set_value (adjustment, value);
-}
-
-#define MARGIN 5
-
-static void
-ensure_rectangle_is_visible (EvView *view, GdkRectangle *rect)
-{
-	GtkWidget *widget = GTK_WIDGET (view);
-	GtkAdjustment *adjustment;
-	int value;
-
-	view->pending_scroll = SCROLL_TO_FIND_LOCATION;
-
-	adjustment = view->vadjustment;
-
-	if (rect->y < adjustment->value) {
-		value = MAX (adjustment->lower, rect->y - MARGIN);
-		gtk_adjustment_set_value (view->vadjustment, value);
-	} else if (rect->y + rect->height >
-		   adjustment->value + widget->allocation.height) {
-		value = MIN (adjustment->upper, rect->y + rect->height -
-			     widget->allocation.height + MARGIN);
-		gtk_adjustment_set_value (view->vadjustment, value);
-	}
-
-	adjustment = view->hadjustment;
-
-	if (rect->x < adjustment->value) {
-		value = MAX (adjustment->lower, rect->x - MARGIN);
-		gtk_adjustment_set_value (view->hadjustment, value);
-	} else if (rect->x + rect->height >
-		   adjustment->value + widget->allocation.width) {
-		value = MIN (adjustment->upper, rect->x + rect->width -
-			     widget->allocation.width + MARGIN);
-		gtk_adjustment_set_value (view->hadjustment, value);
-	}
-
-	gtk_widget_queue_resize (GTK_WIDGET (view));
-}
-
-/*** Geometry computations ***/
-
-static void
-compute_border (EvView *view, int width, int height, GtkBorder *border)
-{
-	if (view->presentation) {
-		border->left = 0;
-		border->right = 0;
-		border->top = 0;
-		border->bottom = 0;
-	} else {
-		ev_document_misc_get_page_border_size (width, height, border);
-	}
-}
-
-static void
-get_page_y_offset (EvView *view, int page, double zoom, int *y_offset)
-{
-	int max_width, offset;
-	GtkBorder border;
-
-	g_return_if_fail (y_offset != NULL);
-
-	ev_page_cache_get_max_width (view->page_cache, view->rotation, zoom, &max_width);
-
-	compute_border (view, max_width, max_width, &border);
-
-	if (view->dual_page) {
-		ev_page_cache_get_height_to_page (view->page_cache, page,
-						  view->rotation, zoom, NULL, &offset);
-		offset += ((page + ev_page_cache_get_dual_even_left (view->page_cache)) / 2 + 1) * view->spacing + ((page + ev_page_cache_get_dual_even_left (view->page_cache)) / 2 ) * (border.top + border.bottom);
-	} else {
-		ev_page_cache_get_height_to_page (view->page_cache, page,
-						  view->rotation, zoom, &offset, NULL);
-		offset += (page + 1) * view->spacing + page * (border.top + border.bottom);
-	}
-
-	*y_offset = offset;
-	return;
-}
-
-static gboolean
-get_page_extents (EvView       *view,
-		  gint          page,
-		  GdkRectangle *page_area,
-		  GtkBorder    *border)
-{
-	GtkWidget *widget;
-	int width, height;
-
-	widget = GTK_WIDGET (view);
-
-	/* Get the size of the page */
-	ev_page_cache_get_size (view->page_cache, page,
-				view->rotation,
-				view->scale,
-				&width, &height);
-	compute_border (view, width, height, border);
-	page_area->width = width + border->left + border->right;
-	page_area->height = height + border->top + border->bottom;
-
-	if (view->presentation) {
-		page_area->x = (MAX (0, widget->allocation.width - width))/2;
-		page_area->y = (MAX (0, widget->allocation.height - height))/2;
-	} else if (view->continuous) {
-		gint max_width;
-		gint x, y;
-
-		ev_page_cache_get_max_width (view->page_cache, view->rotation,
-					     view->scale, &max_width);
-		max_width = max_width + border->left + border->right;
-		/* Get the location of the bounding box */
-		if (view->dual_page) {
-			x = view->spacing + ((page % 2 == ev_page_cache_get_dual_even_left (view->page_cache)) ? 0 : 1) * (max_width + view->spacing);
-			x = x + MAX (0, widget->allocation.width - (max_width * 2 + view->spacing * 3)) / 2;
-			if (page % 2 == ev_page_cache_get_dual_even_left (view->page_cache))
-				x = x + (max_width - width - border->left - border->right);
-		} else {
-			x = view->spacing;
-			x = x + MAX (0, widget->allocation.width - (width + view->spacing * 2)) / 2;
-		}
-
-		get_page_y_offset (view, page, view->scale, &y);
-
-		page_area->x = x;
-		page_area->y = y;
-	} else {
-		gint x, y;
-		if (view->dual_page) {
-			gint width_2, height_2;
-			gint max_width = width;
-			gint max_height = height;
-			GtkBorder overall_border;
-			gint other_page;
-
-			other_page = (page % 2 == ev_page_cache_get_dual_even_left (view->page_cache)) ? page + 1: page - 1;
-
-			/* First, we get the bounding box of the two pages */
-			if (other_page < ev_page_cache_get_n_pages (view->page_cache)
-			    && (0 <= other_page)) {
-				ev_page_cache_get_size (view->page_cache,
-							other_page,
-							view->rotation,
-							view->scale,
-							&width_2, &height_2);
-				if (width_2 > width)
-					max_width = width_2;
-				if (height_2 > height)
-					max_height = height_2;
-			}
-			compute_border (view, max_width, max_height, &overall_border);
-
-			/* Find the offsets */
-			x = view->spacing;
-			y = view->spacing;
-
-			/* Adjust for being the left or right page */
-			if (page % 2 == ev_page_cache_get_dual_even_left (view->page_cache))
-				x = x + max_width - width;
-			else
-				x = x + (max_width + overall_border.left + overall_border.right) + view->spacing;
-
-			y = y + (max_height - height)/2;
-
-			/* Adjust for extra allocation */
-			x = x + MAX (0, widget->allocation.width -
-				     ((max_width + overall_border.left + overall_border.right) * 2 + view->spacing * 3))/2;
-			y = y + MAX (0, widget->allocation.height - (height + view->spacing * 2))/2;
-		} else {
-			x = view->spacing;
-			y = view->spacing;
-
-			/* Adjust for extra allocation */
-			x = x + MAX (0, widget->allocation.width - (width + border->left + border->right + view->spacing * 2))/2;
-			y = y + MAX (0, widget->allocation.height - (height + border->top + border->bottom +  view->spacing * 2))/2;
-		}
-
-		page_area->x = x;
-		page_area->y = y;
-	}
-
-	return TRUE;
-}
-
-static void
-view_point_to_doc_point (EvView *view,
-			 GdkPoint *view_point,
-			 GdkRectangle *page_area,
-			 double  *doc_point_x,
-			 double  *doc_point_y)
-{
-	*doc_point_x = (double) (view_point->x - page_area->x) / view->scale;
-	*doc_point_y = (double) (view_point->y - page_area->y) / view->scale;
-}
-
-static void
-view_rect_to_doc_rect (EvView *view,
-		       GdkRectangle *view_rect,
-		       GdkRectangle *page_area,
-		       EvRectangle  *doc_rect)
-{
-	doc_rect->x1 = (double) (view_rect->x - page_area->x) / view->scale;
-	doc_rect->y1 = (double) (view_rect->y - page_area->y) / view->scale;
-	doc_rect->x2 = doc_rect->x1 + (double) view_rect->width / view->scale;
-	doc_rect->y2 = doc_rect->y1 + (double) view_rect->height / view->scale;
-}
-
-static gboolean
-doc_point_to_view_point (EvView       *view,
-                         int           page,
-		         EvPoint      *doc_point,
-		         GdkPoint     *view_point)
-{
-	GdkRectangle page_area;
-	GtkBorder border;
-	double x, y, view_x, view_y;
-	int width, height;
-
-	ev_page_cache_get_size (view->page_cache, page,
-				view->rotation,
-				1.0,
-				&width, &height);
-
-	if (view->rotation == 0) {
-		x = doc_point->x;
-		y = doc_point->y;
-	} else if (view->rotation == 90) {
-		x = width - doc_point->y;
-		y = doc_point->x;
-	} else if (view->rotation == 180) {
-		x = width - doc_point->x;
-		y = height - doc_point->y;
-	} else if (view->rotation == 270) {
-		x = doc_point->y;
-		y = height - doc_point->x;
-	} else {
-		g_assert_not_reached ();
-	}
-
-	get_page_extents (view, page, &page_area, &border);
-
-	view_x = x * view->scale;
-	view_y = y * view->scale;
-	view_point->x = view_x + page_area.x;
-	view_point->y = view_y + page_area.y;
-
-	return (view_x > 0 && view_x <= page_area.width &&
-		view_y > 0 && view_y <= page_area.height);
-}
-
-static void
-doc_rect_to_view_rect (EvView       *view,
-                       int           page,
-		       EvRectangle  *doc_rect,
-		       GdkRectangle *view_rect)
-{
-	GdkRectangle page_area;
-	GtkBorder border;
-	double x, y, w, h;
-	int width, height;
-
-	ev_page_cache_get_size (view->page_cache, page,
-				view->rotation,
-				1.0,
-				&width, &height);
-
-	if (view->rotation == 0) {
-		x = doc_rect->x1;
-		y = doc_rect->y1;
-		w = doc_rect->x2 - doc_rect->x1;
-		h = doc_rect->y2 - doc_rect->y1;
-	} else if (view->rotation == 90) {
-		x = width - doc_rect->y2;
-		y = doc_rect->x1;
-		w = doc_rect->y2 - doc_rect->y1;
-		h = doc_rect->x2 - doc_rect->x1;
-	} else if (view->rotation == 180) {
-		x = width - doc_rect->x2;
-		y = height - doc_rect->y2;
-		w = doc_rect->x2 - doc_rect->x1;
-		h = doc_rect->y2 - doc_rect->y1;
-	} else if (view->rotation == 270) {
-		x = doc_rect->y1;
-		y = height - doc_rect->x2;
-		w = doc_rect->y2 - doc_rect->y1;
-		h = doc_rect->x2 - doc_rect->x1;
-	} else {
-		g_assert_not_reached ();
-	}
-
-	get_page_extents (view, page, &page_area, &border);
-
-	view_rect->x = x * view->scale + page_area.x;
-	view_rect->y = y * view->scale + page_area.y;
-	view_rect->width = w * view->scale;
-	view_rect->height = h * view->scale;
-}
-
-static void
-find_page_at_location (EvView  *view,
-		       gdouble  x,
-		       gdouble  y,
-		       gint    *page,
-		       gint    *x_offset,
-		       gint    *y_offset)
-{
-	int i;
-
-	if (view->document == NULL)
-		return;
-
-	g_assert (page);
-	g_assert (x_offset);
-	g_assert (y_offset);
-
-	for (i = view->start_page; i <= view->end_page; i++) {
-		GdkRectangle page_area;
-		GtkBorder border;
-
-		if (! get_page_extents (view, i, &page_area, &border))
-			continue;
-
-		if ((x >= page_area.x + border.left) &&
-		    (x < page_area.x + page_area.width - border.right) &&
-		    (y >= page_area.y + border.top) &&
-		    (y < page_area.y + page_area.height - border.bottom)) {
-			*page = i;
-			*x_offset = x - (page_area.x + border.left);
-			*y_offset = y - (page_area.y + border.top);
-			return;
-		}
-	}
-
-	*page = -1;
-}
-
-static gboolean
-location_in_text (EvView  *view,
-		  gdouble  x,
-		  gdouble  y)
-{
-	GdkRegion *region;
-	gint page = -1;
-	gint x_offset = 0, y_offset = 0;
-
-	find_page_at_location (view, x, y, &page, &x_offset, &y_offset);
-
-	if (page == -1)
-		return FALSE;
-	
-	region = ev_pixbuf_cache_get_text_mapping (view->pixbuf_cache, page);
-
-	if (region)
-		return gdk_region_point_in (region, x_offset / view->scale, y_offset / view->scale);
-	else
-		return FALSE;
-}
-
-static int
-ev_view_get_width (EvView *view)
-{
-	return GTK_WIDGET (view)->allocation.width;
-}
-
-static int
-ev_view_get_height (EvView *view)
-{
-	return GTK_WIDGET (view)->allocation.height;
-}
-
-static gboolean
-location_in_selected_text (EvView  *view,
-			   gdouble  x,
-			   gdouble  y)
-{
-	gint page = -1;
-	gint x_offset = 0, y_offset = 0;
-	EvViewSelection *selection;
-	GList *l = NULL;
-
-	for (l = view->selection_info.selections; l != NULL; l = l->next) {
-		selection = (EvViewSelection *)l->data;
-		
-		find_page_at_location (view, x, y, &page, &x_offset, &y_offset);
-		
-		if (page != selection->page)
-			continue;
-		
-		if (selection->covered_region &&
-		    gdk_region_point_in (selection->covered_region, x_offset, y_offset))
-			return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-get_doc_point_from_offset (EvView *view, 
-			   gint    page, 
-			   gint    x_offset, 
-			   gint    y_offset, 
-			   gint   *x_new, 
-			   gint   *y_new)
-{
-        int width, height;
-	double x, y;
-
-        ev_page_cache_get_size (view->page_cache, page,
-                                view->rotation,
-                                1.0,
-                                &width, &height);
-
-	x_offset = x_offset / view->scale;
-	y_offset = y_offset / view->scale;
-
-        if (view->rotation == 0) {
-                x = x_offset;
-                y = y_offset;
-        } else if (view->rotation == 90) {
-                x = y_offset;
-                y = width - x_offset;
-        } else if (view->rotation == 180) {
-                x = width - x_offset;
-                y = height - y_offset;
-        } else if (view->rotation == 270) {
-                x = height - y_offset; 
-                y = x_offset;
-        } else {
-                g_assert_not_reached ();
-        }
-
-	*x_new = x;
-	*y_new = y;
-	
-	return TRUE;
-}
-
-/*** Hyperref ***/
-static EvLink *
-ev_view_get_link_at_location (EvView  *view,
-  	         	      gdouble  x,
-		              gdouble  y)
-{
-	gint page = -1;
-	gint x_offset = 0, y_offset = 0;
-	gint x_new = 0, y_new = 0;
-	GList *link_mapping;
-
-	if (!EV_IS_DOCUMENT_LINKS (view->document))
-		return NULL;
-	
-	x += view->scroll_x;
-	y += view->scroll_y;
-
-	find_page_at_location (view, x, y, &page, &x_offset, &y_offset);
-
-	if (page == -1)
-		return NULL;
-
-	
-	if (get_doc_point_from_offset (view, page, x_offset, 
-				       y_offset, &x_new, &y_new) == FALSE)
-		return NULL;
-
-	link_mapping = ev_pixbuf_cache_get_link_mapping (view->pixbuf_cache, page);
-
-	if (link_mapping)
-		return ev_link_mapping_find (link_mapping, x_new, y_new);
-	else
-		return NULL;
-}
-
-static void
-goto_fitr_dest (EvView *view, EvLinkDest *dest)
-{
-	EvPoint doc_point;
-	gdouble zoom, left, top;
-	gboolean change_left, change_top;
-
-	left = ev_link_dest_get_left (dest, &change_left);
-	top = ev_link_dest_get_top (dest, &change_top);
-
-	zoom = zoom_for_size_best_fit (ev_link_dest_get_right (dest) - left,
-				       ev_link_dest_get_bottom (dest) - top,
-				       ev_view_get_width (view),
-				       ev_view_get_height (view), 0, 0);
-
-	ev_view_set_sizing_mode (view, EV_SIZING_FREE);
-	ev_view_set_zoom (view, zoom, FALSE);
-
-	doc_point.x = change_left ? left : 0;
-	doc_point.y = change_top ? top : 0;
-	
-	view->current_page = ev_link_dest_get_page (dest);
-	if (change_left || change_top)
-		view->pending_point = doc_point;
-	view->pending_scroll = SCROLL_TO_PAGE_POSITION;
-
-	gtk_widget_queue_resize (GTK_WIDGET (view));
-}
-
-static void
-goto_fitv_dest (EvView *view, EvLinkDest *dest)
-{
-	EvPoint doc_point;
-	int doc_width, doc_height, page;
-	double zoom, left;
-	gboolean change_left;
-
-	page = ev_link_dest_get_page (dest);
-	ev_page_cache_get_size (view->page_cache, page, 0, 1.0, &doc_width, &doc_height);
-
-	left = ev_link_dest_get_left (dest, &change_left);
-	doc_point.x = change_left ? left : 0;
-	doc_point.y = 0;
-
-	zoom = zoom_for_size_fit_height (doc_width - doc_point.x , doc_height,
-					 ev_view_get_width (view),
-				         ev_view_get_height (view), 0);
-
-	ev_view_set_sizing_mode (view, EV_SIZING_FREE);
-	ev_view_set_zoom (view, zoom, FALSE);
-
-	view->current_page = page;
-	if (change_left)
-		view->pending_point = doc_point;
-	view->pending_scroll = SCROLL_TO_PAGE_POSITION;
-
-	gtk_widget_queue_resize (GTK_WIDGET (view));
-}
-
-static void
-goto_fith_dest (EvView *view, EvLinkDest *dest)
-{
-	EvPoint doc_point;
-	int doc_width, doc_height, page;
-	gdouble zoom, top;
-	gboolean change_top;
-
-	page = ev_link_dest_get_page (dest);
-	ev_page_cache_get_size (view->page_cache, page, 0, 1.0, &doc_width, &doc_height);
-
-	top = ev_link_dest_get_top (dest, &change_top);
-
-	doc_point.x = 0;
-	doc_point.y = change_top ? top : 0;
-
-	zoom = zoom_for_size_fit_width (doc_width, top,
-					ev_view_get_width (view),
-				        ev_view_get_height (view), 0);
-
-	ev_view_set_sizing_mode (view, EV_SIZING_FIT_WIDTH);
-	ev_view_set_zoom (view, zoom, FALSE);
-
-	view->current_page = page;
-	if (change_top)
-		view->pending_point = doc_point;
-	view->pending_scroll = SCROLL_TO_PAGE_POSITION;
-
-	gtk_widget_queue_resize (GTK_WIDGET (view));
-}
-
-static void
-goto_fit_dest (EvView *view, EvLinkDest *dest)
-{
-	double zoom;
-	int doc_width, doc_height;
-	int page;
-
-	page = ev_link_dest_get_page (dest);
-	ev_page_cache_get_size (view->page_cache, page, 0, 1.0, &doc_width, &doc_height);
-
-	zoom = zoom_for_size_best_fit (doc_width, doc_height, ev_view_get_width (view),
-				       ev_view_get_height (view), 0, 0);
-
-	ev_view_set_sizing_mode (view, EV_SIZING_BEST_FIT);
-	ev_view_set_zoom (view, zoom, FALSE);
-
-	view->current_page = page;
-	view->pending_scroll = SCROLL_TO_PAGE_POSITION;
-
-	gtk_widget_queue_resize (GTK_WIDGET (view));
-}
-
-static void
-goto_xyz_dest (EvView *view, EvLinkDest *dest)
-{
-	EvPoint doc_point;
-	gint page;
-	gdouble zoom, left, top;
-	gboolean change_zoom, change_left, change_top; 
-
-	zoom = ev_link_dest_get_zoom (dest, &change_zoom);
-	page = ev_link_dest_get_page (dest);
-
-	if (change_zoom && zoom > 1) {
-		ev_view_set_sizing_mode (view, EV_SIZING_FREE);
-		ev_view_set_zoom (view, zoom, FALSE);
-	}
-
-	left = ev_link_dest_get_left (dest, &change_left);
-	top = ev_link_dest_get_top (dest, &change_top);
-
-	doc_point.x = change_left ? left : 0;
-	doc_point.y = change_top ? top : 0;
-
-	view->current_page = page;
-	if (change_left || change_top)
-		view->pending_point = doc_point;
-	view->pending_scroll = SCROLL_TO_PAGE_POSITION;
-
-	gtk_widget_queue_resize (GTK_WIDGET (view));
-}
-
-static void
-goto_dest (EvView *view, EvLinkDest *dest)
-{
-	EvLinkDestType type;
-	int page, n_pages, current_page;
-
-	page = ev_link_dest_get_page (dest);
-	n_pages = ev_page_cache_get_n_pages (view->page_cache);
-
-	if (page < 0 || page >= n_pages)
-		return;
-
-	current_page = view->current_page;
-	
-	type = ev_link_dest_get_dest_type (dest);
-
-	switch (type) {
-	        case EV_LINK_DEST_TYPE_PAGE:
-			ev_page_cache_set_current_page (view->page_cache, page);
-			break;
-	        case EV_LINK_DEST_TYPE_FIT:
-			goto_fit_dest (view, dest);
-			break;
-	        case EV_LINK_DEST_TYPE_FITH:
-			goto_fith_dest (view, dest);
-			break;
-	        case EV_LINK_DEST_TYPE_FITV:
-			goto_fitv_dest (view, dest);
-			break;
-	        case EV_LINK_DEST_TYPE_FITR:
-			goto_fitr_dest (view, dest);
-			break;
-	        case EV_LINK_DEST_TYPE_XYZ:
-			goto_xyz_dest (view, dest);
-			break;
-	        case EV_LINK_DEST_TYPE_PAGE_LABEL:
-			ev_page_cache_set_page_label (view->page_cache, ev_link_dest_get_page_label (dest));
-			break;
-	        default:
-			g_assert_not_reached ();
-	}
-
-	if (current_page != view->current_page)
-		ev_page_cache_set_current_page (view->page_cache,
-						view->current_page);
-}
-
-static void
-ev_view_goto_dest (EvView *view, EvLinkDest *dest)
-{
-	EvLinkDestType type;
-
-	type = ev_link_dest_get_dest_type (dest);
-
-	if (type == EV_LINK_DEST_TYPE_NAMED) {
-		EvLinkDest  *dest2;	
-		const gchar *named_dest;
-
-		named_dest = ev_link_dest_get_named_dest (dest);
-		dest2 = ev_document_links_find_link_dest (EV_DOCUMENT_LINKS (view->document),
-							  named_dest);
-		if (dest2) {
-			goto_dest (view, dest2);
-			g_object_unref (dest2);
-		}
-
-		return;
-	}
-
-	goto_dest (view, dest);
-}
-	
-void
-ev_view_handle_link (EvView *view, EvLink *link)
-{
-	EvLinkAction    *action = NULL;
-	EvLinkActionType type;
-
-	action = ev_link_get_action (link);
-	if (!action)
-		return;
-
-	type = ev_link_action_get_action_type (action);
-
-	switch (type) {
-	        case EV_LINK_ACTION_TYPE_GOTO_DEST: {
-			EvLinkDest *dest;
-			
-			g_signal_emit (view, signals[SIGNAL_HANDLE_LINK], 0, link);
-		
-			dest = ev_link_action_get_dest (action);
-			ev_view_goto_dest (view, dest);
-		}
-			break;
-	        case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
-	        case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
-	        case EV_LINK_ACTION_TYPE_LAUNCH:
-	        case EV_LINK_ACTION_TYPE_NAMED:
-			g_signal_emit (view, signals[SIGNAL_EXTERNAL_LINK], 0, action);
-			break;
-	}
-}
-
-gchar *
-ev_view_page_label_from_dest (EvView *view, EvLinkDest *dest)
-{
-	EvLinkDestType type;
-	gchar *msg = NULL;
-
-	type = ev_link_dest_get_dest_type (dest);
-
-	switch (type) {
-	        case EV_LINK_DEST_TYPE_NAMED: {
-			EvLinkDest  *dest2;
-			const gchar *named_dest;
-			
-			named_dest = ev_link_dest_get_named_dest (dest);
-			dest2 = ev_document_links_find_link_dest (EV_DOCUMENT_LINKS (view->document),
-								  named_dest);
-			if (dest2) {
-				msg = ev_page_cache_get_page_label (view->page_cache,
-								    ev_link_dest_get_page (dest2));
-				g_object_unref (dest2);
-			}
-		}
-			
-			break;
-	        case EV_LINK_DEST_TYPE_PAGE_LABEL: {
-	    		msg = g_strdup (ev_link_dest_get_page_label (dest));
-	        }
-	    		break;
-	        default: 
-			msg = ev_page_cache_get_page_label (view->page_cache,
-							    ev_link_dest_get_page (dest));
-	}
-	
-	return msg;
-}
-
-static char *
-tip_from_action_named (EvLinkAction *action)
-{
-	const gchar *name = ev_link_action_get_name (action);
-	
-	if (g_ascii_strcasecmp (name, "FirstPage") == 0) {
-		return g_strdup (_("Go to first page"));
-	} else if (g_ascii_strcasecmp (name, "PrevPage") == 0) {
-		return g_strdup (_("Go to previous page"));
-	} else if (g_ascii_strcasecmp (name, "NextPage") == 0) {
-		return g_strdup (_("Go to next page"));
-	} else if (g_ascii_strcasecmp (name, "LastPage") == 0) {
-		return g_strdup (_("Go to last page"));
-	} else if (g_ascii_strcasecmp (name, "GoToPage") == 0) {
-		return g_strdup (_("Go to page"));
-	} else if (g_ascii_strcasecmp (name, "Find") == 0) {
-		return g_strdup (_("Find"));
-	}
-	
-	return NULL;
-}
-
-static char *
-tip_from_link (EvView *view, EvLink *link)
-{
-	EvLinkAction *action;
-	EvLinkActionType type;
-	char *msg = NULL;
-	char *page_label;
-	const char *title;
-
-	action = ev_link_get_action (link);
-	title = ev_link_get_title (link);
-	
-	if (!action)
-		return title ? g_strdup (title) : NULL;
-		
-	type = ev_link_action_get_action_type (action);
-
-	switch (type) {
-	        case EV_LINK_ACTION_TYPE_GOTO_DEST:
-			page_label = ev_view_page_label_from_dest (view,
-								   ev_link_action_get_dest (action));
-			if (page_label) {
-    				msg = g_strdup_printf (_("Go to page %s"), page_label);
-				g_free (page_label);
-			}
-			break;
-	        case EV_LINK_ACTION_TYPE_GOTO_REMOTE:
-			if (title) {
-				msg = g_strdup_printf (_("Go to %s on file “%s”"), title,
-						       ev_link_action_get_filename (action));
-			} else {
-				msg = g_strdup_printf (_("Go to file “%s”"),
-						       ev_link_action_get_filename (action));
-			}
-			break;
-	        case EV_LINK_ACTION_TYPE_EXTERNAL_URI:
-			msg = g_strdup (ev_link_action_get_uri (action));
-			break;
-	        case EV_LINK_ACTION_TYPE_LAUNCH:
-			msg = g_strdup_printf (_("Launch %s"),
-					       ev_link_action_get_filename (action));
-			break;
-	        case EV_LINK_ACTION_TYPE_NAMED:
-			msg = tip_from_action_named (action);
-			break;
-	        default:
-			if (title)
-				msg = g_strdup (title);
-			break;
-	}
-	
-	return msg;
-}
-
-static void
-ev_view_handle_cursor_over_xy (EvView *view, gint x, gint y)
-{
-	EvLink      *link;
-	EvFormField *field;
-
-	if (view->cursor == EV_VIEW_CURSOR_HIDDEN)
-		return;
-
-	if (view->drag_info.in_drag) {
-		if (view->cursor != EV_VIEW_CURSOR_DRAG)
-			ev_view_set_cursor (view, EV_VIEW_CURSOR_DRAG);
-		return;
-	}
-
-	if (view->scroll_info.autoscrolling) {
-		if (view->cursor != EV_VIEW_CURSOR_AUTOSCROLL)
-			ev_view_set_cursor (view, EV_VIEW_CURSOR_AUTOSCROLL);
-		return;
-	}
-	
-	link = ev_view_get_link_at_location (view, x, y);
-        if (link) {
-		g_object_set (view, "has-tooltip", TRUE, NULL);
-		ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK);
-	} else if ((field = ev_view_get_form_field_at_location (view, x, y))) {
-		if (field->is_read_only) {
-			if (view->cursor == EV_VIEW_CURSOR_LINK ||
-			    view->cursor == EV_VIEW_CURSOR_IBEAM ||
-			    view->cursor == EV_VIEW_CURSOR_DRAG)
-				ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
-		} else if (EV_IS_FORM_FIELD_TEXT (field)) {
-			ev_view_set_cursor (view, EV_VIEW_CURSOR_IBEAM);
-		} else {
-			ev_view_set_cursor (view, EV_VIEW_CURSOR_LINK);
-		}
-	} else if (location_in_text (view, x + view->scroll_x, y + view->scroll_y)) {
-		ev_view_set_cursor (view, EV_VIEW_CURSOR_IBEAM);
-	} else {
-		if (view->cursor == EV_VIEW_CURSOR_LINK ||
-		    view->cursor == EV_VIEW_CURSOR_IBEAM ||
-		    view->cursor == EV_VIEW_CURSOR_DRAG ||
-		    view->cursor == EV_VIEW_CURSOR_AUTOSCROLL)
-			ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
-	}
-}
-
-/*** Images ***/
-static EvImage *
-ev_view_get_image_at_location (EvView  *view,
-			       gdouble  x,
-			       gdouble  y)
-{
-	gint page = -1;
-	gint x_offset = 0, y_offset = 0;
-	gint x_new = 0, y_new = 0;
-	GList *image_mapping;
-
-	if (!EV_IS_DOCUMENT_IMAGES (view->document))
-		return NULL;
-
-	x += view->scroll_x;
-	y += view->scroll_y;
-
-	find_page_at_location (view, x, y, &page, &x_offset, &y_offset);
-
-	if (page == -1)
-		return NULL;
-
-	if (get_doc_point_from_offset (view, page, x_offset,
-				       y_offset, &x_new, &y_new) == FALSE)
-		return NULL;
-
-	image_mapping = ev_pixbuf_cache_get_image_mapping (view->pixbuf_cache, page);
-
-	if (image_mapping)
-		return ev_image_mapping_find (image_mapping, x_new, y_new);
-	else
-		return NULL;
-}
-
-/*** Forms ***/
-static EvFormField *
-ev_view_get_form_field_at_location (EvView  *view,
-				    gdouble  x,
-				    gdouble  y)
-{
-	gint page = -1;
-	gint x_offset = 0, y_offset = 0;
-	gint x_new = 0, y_new = 0;
-	GList *forms_mapping;
-	
-	if (!EV_IS_DOCUMENT_FORMS (view->document))
-		return NULL;
-
-	x += view->scroll_x;
-	y += view->scroll_y;
-	
-	find_page_at_location (view, x, y, &page, &x_offset, &y_offset);
-	
-	if (page == -1)
-		return NULL;
-
-	if (get_doc_point_from_offset (view, page, x_offset,
-				       y_offset, &x_new, &y_new) == FALSE)
-		return NULL;
-
-	forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, page);
-
-	if (forms_mapping)
-		return ev_form_field_mapping_find (forms_mapping, x_new, y_new);
-	else
-		return NULL;
-}
-
-static GdkRegion *
-ev_view_form_field_get_region (EvView      *view,
-			       EvFormField *field)
-{
-	EvRectangle  field_area;
-	GdkRectangle view_area;
-	GList       *forms_mapping;
-
-	forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache,
-								field->page->index);
-	ev_form_field_mapping_get_area (forms_mapping, field, &field_area);
-	doc_rect_to_view_rect (view, field->page->index, &field_area, &view_area);
-	view_area.x -= view->scroll_x;
-	view_area.y -= view->scroll_y;
-
-	return gdk_region_rectangle (&view_area);
-}
-
-static gboolean
-ev_view_forms_remove_widgets (EvView *view)
-{
-	ev_view_remove_all (view);
-
-	return FALSE;
-}
-
-static void
-ev_view_form_field_destroy (GtkWidget *widget,
-			    EvView    *view)
-{
-	g_idle_add ((GSourceFunc)ev_view_forms_remove_widgets, view);
-}
-
-static GtkWidget *
-ev_view_form_field_button_create_widget (EvView      *view,
-					 EvFormField *field)
-{
-	EvFormFieldButton *field_button = EV_FORM_FIELD_BUTTON (field);
-	GdkRegion         *field_region = NULL;
-	
-	switch (field_button->type) {
-	        case EV_FORM_FIELD_BUTTON_PUSH:
-			return NULL;
-	        case EV_FORM_FIELD_BUTTON_CHECK:
-  	        case EV_FORM_FIELD_BUTTON_RADIO: {
-			gboolean  state;
-			GList    *forms_mapping, *l;
-
-			state = ev_document_forms_form_field_button_get_state (EV_DOCUMENT_FORMS (view->document),
-									       field);
-
-			/* FIXME: it actually depends on NoToggleToOff flags */
-			if (field_button->type == EV_FORM_FIELD_BUTTON_RADIO &&
-			    state && field_button->state)
-				return NULL;
-			
-			field_region = ev_view_form_field_get_region (view, field);
-
-			/* For radio buttons and checkbox buttons that are in a set
-			 * we need to update also the region for the current selected item
-			 */
-			forms_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache,
-										field->page->index);
-			for (l = forms_mapping; l; l = g_list_next (l)) {
-				EvFormField *button = ((EvFormFieldMapping *)(l->data))->field;
-				GdkRegion   *button_region;
-
-				if (button->id == field->id)
-					continue;
-
-				/* FIXME: only buttons in the same group should be updated */
-				if (!EV_IS_FORM_FIELD_BUTTON (button) ||
-				    EV_FORM_FIELD_BUTTON (button)->type != field_button->type ||
-				    EV_FORM_FIELD_BUTTON (button)->state != TRUE)
-					continue;
-
-				button_region = ev_view_form_field_get_region (view, button);
-				gdk_region_union (field_region, button_region);
-				gdk_region_destroy (button_region);
-			}
-			
-			ev_document_forms_form_field_button_set_state (EV_DOCUMENT_FORMS (view->document),
-								       field, !state);
-			field_button->state = !state;
-		}
-			break;
-	}
-
-	ev_view_reload_page (view, field->page->index, field_region);
-	gdk_region_destroy (field_region);
-	
-	return NULL;
-}
-
-static void
-ev_view_form_field_text_save (EvView    *view,
-			      GtkWidget *widget)
-{
-	EvFormField *field;
-
-	if (!view->document)
-		return;
-	
-	field = g_object_get_data (G_OBJECT (widget), "form-field");
-	
-	if (field->changed) {
-		EvFormFieldText *field_text = EV_FORM_FIELD_TEXT (field);
-		GdkRegion       *field_region;
-
-		field_region = ev_view_form_field_get_region (view, field);
-		
-		ev_document_forms_form_field_text_set_text (EV_DOCUMENT_FORMS (view->document),
-							    field, field_text->text);
-		field->changed = FALSE;
-		ev_view_reload_page (view, field->page->index, field_region);
-		gdk_region_destroy (field_region);
-	}
-}
-
-static void
-ev_view_form_field_text_changed (GtkWidget   *widget,
-				 EvFormField *field)
-{
-	EvFormFieldText *field_text = EV_FORM_FIELD_TEXT (field);
-	gchar           *text = NULL;
-
-	if (GTK_IS_ENTRY (widget)) {
-		text = g_strdup (gtk_entry_get_text (GTK_ENTRY (widget)));
-	} else if (GTK_IS_TEXT_BUFFER (widget)) {
-		GtkTextIter start, end;
-
-		gtk_text_buffer_get_bounds (GTK_TEXT_BUFFER (widget), &start, &end);
-		text = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (widget),
-						 &start, &end, FALSE);
-	}
-
-	if (!field_text->text ||
-	    (field_text->text && g_ascii_strcasecmp (field_text->text, text) != 0)) {
-		g_free (field_text->text);
-		field_text->text = text;
-		field->changed = TRUE;
-	}
-}
-
-static GtkWidget *
-ev_view_form_field_text_create_widget (EvView      *view,
-				       EvFormField *field)
-{
-	EvFormFieldText *field_text = EV_FORM_FIELD_TEXT (field);
-	GtkWidget       *text = NULL;
-	gchar           *txt;
-
-	txt = ev_document_forms_form_field_text_get_text (EV_DOCUMENT_FORMS (view->document),
-							  field);
-
-	switch (field_text->type) {
-	        case EV_FORM_FIELD_TEXT_FILE_SELECT:
-			/* TODO */
-	        case EV_FORM_FIELD_TEXT_NORMAL:
-			text = gtk_entry_new ();
-			gtk_entry_set_has_frame (GTK_ENTRY (text), FALSE);
-			gtk_entry_set_max_length (GTK_ENTRY (text), field_text->max_len);
-			gtk_entry_set_visibility (GTK_ENTRY (text), !field_text->is_password);
-			
-			if (txt) {
-				gtk_entry_set_text (GTK_ENTRY (text), txt);
-				g_free (txt);
-			}
-
-			g_signal_connect (G_OBJECT (text), "changed",
-					  G_CALLBACK (ev_view_form_field_text_changed),
-					  field);
-			g_signal_connect_after (G_OBJECT (text), "activate",
-						G_CALLBACK (ev_view_form_field_destroy),
-						view);
-			break;
-	        case EV_FORM_FIELD_TEXT_MULTILINE: {
-			GtkTextBuffer *buffer;
-		
-			text = gtk_text_view_new ();
-			buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text));
-			
-			if (txt) {
-				gtk_text_buffer_set_text (buffer, txt, -1);
-				g_free (txt);
-			}
-			
-			g_signal_connect (G_OBJECT (buffer), "changed",
-					  G_CALLBACK (ev_view_form_field_text_changed),
-					  field);
-		}
-			break;
-	}			
-
-	g_object_weak_ref (G_OBJECT (text),
-			   (GWeakNotify)ev_view_form_field_text_save,
-			   view);
-
-	return text;
-}
-
-static void
-ev_view_form_field_choice_save (EvView    *view,
-				GtkWidget *widget)
-{
-	EvFormField *field;
-
-	if (!view->document)
-		return;
-	
-	field = g_object_get_data (G_OBJECT (widget), "form-field");
-
-	if (field->changed) {
-		GList             *l;
-		EvFormFieldChoice *field_choice = EV_FORM_FIELD_CHOICE (field);
-		GdkRegion         *field_region;
-
-		field_region = ev_view_form_field_get_region (view, field);
-
-		if (field_choice->is_editable) {
-			ev_document_forms_form_field_choice_set_text (EV_DOCUMENT_FORMS (view->document),
-								      field, field_choice->text);
-		} else {
-			ev_document_forms_form_field_choice_unselect_all (EV_DOCUMENT_FORMS (view->document), field);
-			for (l = field_choice->selected_items; l; l = g_list_next (l)) {
-				ev_document_forms_form_field_choice_select_item (EV_DOCUMENT_FORMS (view->document),
-										 field,
-										 GPOINTER_TO_INT (l->data));
-			}
-		}
-		field->changed = FALSE;
-		ev_view_reload_page (view, field->page->index, field_region);
-		gdk_region_destroy (field_region);
-	}
-}
-
-static void
-ev_view_form_field_choice_changed (GtkWidget   *widget,
-				   EvFormField *field)
-{
-	EvFormFieldChoice *field_choice = EV_FORM_FIELD_CHOICE (field);
-	
-	if (GTK_IS_COMBO_BOX (widget)) {
-		gint item;
-		
-		item = gtk_combo_box_get_active (GTK_COMBO_BOX (widget));
-		if (!field_choice->selected_items ||
-		    GPOINTER_TO_INT (field_choice->selected_items->data) != item) {
-			g_list_free (field_choice->selected_items);
-			field_choice->selected_items = NULL;
-			field_choice->selected_items = g_list_prepend (field_choice->selected_items,
-								       GINT_TO_POINTER (item));
-			field->changed = TRUE;
-		}
-
-		if (GTK_IS_COMBO_BOX_ENTRY (widget)) {
-			gchar *text;
-			
-			text = gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget));
-			if (!field_choice->text ||
-			    (field_choice->text && g_ascii_strcasecmp (field_choice->text, text) != 0)) {
-				g_free (field_choice->text);
-				field_choice->text = text;
-				field->changed = TRUE;
-			}
-		}
-	} else if (GTK_IS_TREE_SELECTION (widget)) {
-		GtkTreeSelection *selection = GTK_TREE_SELECTION (widget);
-		GtkTreeModel     *model;
-		GList            *items, *l;
-		
-		items = gtk_tree_selection_get_selected_rows (selection, &model);
-		g_list_free (field_choice->selected_items);
-		field_choice->selected_items = NULL;
-
-		for (l = items; l && l->data; l = g_list_next (l)) {
-			GtkTreeIter  iter;
-			GtkTreePath *path = (GtkTreePath *)l->data;
-			gint         item;
-			
-			gtk_tree_model_get_iter (model, &iter, path);
-			gtk_tree_model_get (model, &iter, 1, &item, -1);
-
-			field_choice->selected_items = g_list_prepend (field_choice->selected_items,
-								       GINT_TO_POINTER (item));
-
-			gtk_tree_path_free (path);
-		}
-
-		g_list_free (items);
-
-		field->changed = TRUE;
-	}
-}
-
-static GtkWidget *
-ev_view_form_field_choice_create_widget (EvView      *view,
-					 EvFormField *field)
-{
-	EvFormFieldChoice *field_choice = EV_FORM_FIELD_CHOICE (field);
-	GtkWidget         *choice;
-	GtkTreeModel      *model;
-	gint               n_items, i;
-	gint               selected_item = 0;
-
-	n_items = ev_document_forms_form_field_choice_get_n_items (EV_DOCUMENT_FORMS (view->document),
-								   field);
-	model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT));
-	for (i = 0; i < n_items; i++) {
-		GtkTreeIter iter;
-		gchar      *item;
-
-		item = ev_document_forms_form_field_choice_get_item (EV_DOCUMENT_FORMS (view->document),
-								     field, i);
-		if (ev_document_forms_form_field_choice_is_item_selected (
-			    EV_DOCUMENT_FORMS (view->document), field, i)) {
-			selected_item = i;
-			/* FIXME: we need a get_selected_items function in poppler */
-			field_choice->selected_items = g_list_prepend (field_choice->selected_items,
-								       GINT_TO_POINTER (i));
-		}
-		
-		if (item) {
-			gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-			gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-					    0, item,
-					    1, i,
-					    -1);
-			g_free (item);
-		}
-	}
-
-	if (field_choice->type == EV_FORM_FIELD_CHOICE_LIST) {
-		GtkCellRenderer  *renderer;
-		GtkWidget        *tree_view;
-		GtkTreeSelection *selection;
-
-		tree_view = gtk_tree_view_new_with_model (model);
-		gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
-
-		selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
-		if (field_choice->multi_select) {
-			gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
-		}
-
-		/* TODO: set selected items */
-
-		renderer = gtk_cell_renderer_text_new ();
-		gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-							     0,
-							     "choix", renderer,
-							     "text", 0,
-							     NULL);
-
-		choice = gtk_scrolled_window_new (NULL, NULL);
-		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (choice),
-						GTK_POLICY_AUTOMATIC,
-						GTK_POLICY_AUTOMATIC);
-		gtk_container_add (GTK_CONTAINER (choice), tree_view);
-		gtk_widget_show (tree_view);
-
-		g_signal_connect (G_OBJECT (selection), "changed",
-				  G_CALLBACK (ev_view_form_field_choice_changed),
-				  field);
-		g_signal_connect_after (G_OBJECT (selection), "changed",
-					G_CALLBACK (ev_view_form_field_destroy),
-					view);
-	} else if (field_choice->is_editable) { /* ComboBoxEntry */
-		gchar *text;
-		
-		choice = gtk_combo_box_entry_new_with_model (model, 0);
-		text = ev_document_forms_form_field_choice_get_text (EV_DOCUMENT_FORMS (view->document), field);
-		if (text) {
-			gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (choice))), text);
-			g_free (text);
-		}
-
-		g_signal_connect (G_OBJECT (choice), "changed",
-				  G_CALLBACK (ev_view_form_field_choice_changed),
-				  field);
-		g_signal_connect_after (G_OBJECT (GTK_BIN (choice)->child), "activate",
-					G_CALLBACK (ev_view_form_field_destroy),
-					view);
-	} else { /* ComboBoxText */
-		GtkCellRenderer *renderer;
-
-		choice = gtk_combo_box_new_with_model (model);
-		renderer = gtk_cell_renderer_text_new ();
-		gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (choice),
-					    renderer, TRUE);
-		gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (choice),
-						renderer,
-						"text", 0,
-						NULL);
-		gtk_combo_box_set_active (GTK_COMBO_BOX (choice), selected_item);
-		gtk_combo_box_popup (GTK_COMBO_BOX (choice));
-		
-		g_signal_connect (G_OBJECT (choice), "changed",
-				  G_CALLBACK (ev_view_form_field_choice_changed),
-				  field);
-		g_signal_connect_after (G_OBJECT (choice), "changed",
-					G_CALLBACK (ev_view_form_field_destroy),
-					view);
-	}
-
-	g_object_unref (model);
-
-	g_object_weak_ref (G_OBJECT (choice),
-			   (GWeakNotify)ev_view_form_field_choice_save,
-			   view);
-
-	return choice;
-}
-
-static void
-ev_view_handle_form_field (EvView      *view,
-			   EvFormField *field,
-			   gdouble      x,
-			   gdouble      y)
-{
-	GtkWidget   *field_widget = NULL;
-	GList       *form_field_mapping;
-	EvRectangle  field_area;
-	GdkRectangle view_area;
-
-	if (field->is_read_only)
-		return;
-	
-	if (EV_IS_FORM_FIELD_BUTTON (field)) {
-		field_widget = ev_view_form_field_button_create_widget (view, field);
-	} else if (EV_IS_FORM_FIELD_TEXT (field)) {
-		field_widget = ev_view_form_field_text_create_widget (view, field);
-	} else if (EV_IS_FORM_FIELD_CHOICE (field)) {
-		field_widget = ev_view_form_field_choice_create_widget (view, field);
-	} else if (EV_IS_FORM_FIELD_SIGNATURE (field)) {
-		/* TODO */
-	}
-
-	/* Form field doesn't require a widget */
-	if (!field_widget)
-		return;
-
-	g_object_set_data_full (G_OBJECT (field_widget), "form-field",
-				g_object_ref (field),
-				(GDestroyNotify)g_object_unref);
-
-	form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache, field->page->index);
-	ev_form_field_mapping_get_area (form_field_mapping, field, &field_area);
-	
-	doc_rect_to_view_rect (view, field->page->index, &field_area, &view_area);
-	view_area.x -= view->scroll_x;
-	view_area.y -= view->scroll_y;
-
-	gtk_layout_put (GTK_LAYOUT (view), field_widget, view_area.x, view_area.y);
-	gtk_widget_show (field_widget);
-	gtk_widget_grab_focus (field_widget);
-}
-
-/*** GtkWidget implementation ***/
-
-static void
-ev_view_size_request_continuous_dual_page (EvView         *view,
-			     	           GtkRequisition *requisition)
-{
-	int max_width;
-	gint n_pages;
-	GtkBorder border;
-
-	ev_page_cache_get_max_width (view->page_cache, view->rotation,
-				     view->scale, &max_width);
-	compute_border (view, max_width, max_width, &border);
-
-	n_pages = ev_page_cache_get_n_pages (view->page_cache) + 1;
-
-	requisition->width = (max_width + border.left + border.right) * 2 + (view->spacing * 3);
-	get_page_y_offset (view, n_pages, view->scale, &requisition->height);
-
-	if (view->sizing_mode == EV_SIZING_FIT_WIDTH) {
-		requisition->width = 1;
-	} else if (view->sizing_mode == EV_SIZING_BEST_FIT) {
-		requisition->width = 1;
-		/* FIXME: This could actually be set on one page docs or docs
-		 * with a strange aspect ratio. */
-		/* requisition->height = 1;*/
-	}
-}
-
-static void
-ev_view_size_request_continuous (EvView         *view,
-				 GtkRequisition *requisition)
-{
-	int max_width;
-	int n_pages;
-	GtkBorder border;
-
-
-	ev_page_cache_get_max_width (view->page_cache, view->rotation,
-				     view->scale, &max_width);
-	n_pages = ev_page_cache_get_n_pages (view->page_cache);
-	compute_border (view, max_width, max_width, &border);
-
-	requisition->width = max_width + (view->spacing * 2) + border.left + border.right;
-	get_page_y_offset (view, n_pages, view->scale, &requisition->height);
-
-	if (view->sizing_mode == EV_SIZING_FIT_WIDTH) {
-		requisition->width = 1;
-	} else if (view->sizing_mode == EV_SIZING_BEST_FIT) {
-		requisition->width = 1;
-		/* FIXME: This could actually be set on one page docs or docs
-		 * with a strange aspect ratio. */
-		/* requisition->height = 1;*/
-	}
-}
-
-static void
-ev_view_size_request_dual_page (EvView         *view,
-				GtkRequisition *requisition)
-{
-	GtkBorder border;
-	gint width, height;
-
-	/* Find the largest of the two. */
-	ev_page_cache_get_size (view->page_cache,
-				view->current_page,
-				view->rotation,
-				view->scale,
-				&width, &height);
-	if (view->current_page + 1 < ev_page_cache_get_n_pages (view->page_cache)) {
-		gint width_2, height_2;
-		ev_page_cache_get_size (view->page_cache,
-					view->current_page + 1,
-					view->rotation,
-					view->scale,
-					&width_2, &height_2);
-		if (width_2 > width) {
-			width = width_2;
-			height = height_2;
-		}
-	}
-	compute_border (view, width, height, &border);
-
-	requisition->width = ((width + border.left + border.right) * 2) +
-		(view->spacing * 3);
-	requisition->height = (height + border.top + border.bottom) +
-		(view->spacing * 2);
-
-	if (view->sizing_mode == EV_SIZING_FIT_WIDTH) {
-		requisition->width = 1;
-	} else if (view->sizing_mode == EV_SIZING_BEST_FIT) {
-		requisition->width = 1;
-		requisition->height = 1;
-	}
-}
-
-static void
-ev_view_size_request_single_page (EvView         *view,
-				  GtkRequisition *requisition)
-{
-	GtkBorder border;
-	gint width, height;
-
-	ev_page_cache_get_size (view->page_cache,
-				view->current_page,
-				view->rotation,
-				view->scale,
-				&width, &height);
-	compute_border (view, width, height, &border);
-
-	requisition->width = width + border.left + border.right + (2 * view->spacing);
-	requisition->height = height + border.top + border.bottom + (2 * view->spacing);
-
-	if (view->sizing_mode == EV_SIZING_FIT_WIDTH) {
-		requisition->width = 1;
-		requisition->height = height + border.top + border.bottom + (2 * view->spacing);
-	} else if (view->sizing_mode == EV_SIZING_BEST_FIT) {
-		requisition->width = 1;
-		requisition->height = 1;
-	}
-}
-
-static void
-ev_view_size_request (GtkWidget      *widget,
-		      GtkRequisition *requisition)
-{
-	EvView *view = EV_VIEW (widget);
-	
-	if (view->document == NULL) {
-		requisition->width = 1;
-		requisition->height = 1;
-		return;
-	}
-
-	if (view->presentation) {
-		requisition->width = 1;
-		requisition->height = 1;
-		return;
-	}
-
-	if (view->continuous && view->dual_page)
-		ev_view_size_request_continuous_dual_page (view, requisition);
-	else if (view->continuous)
-		ev_view_size_request_continuous (view, requisition);
-	else if (view->dual_page)
-		ev_view_size_request_dual_page (view, requisition);
-	else
-		ev_view_size_request_single_page (view, requisition);
-}
-
-static void
-ev_view_size_allocate (GtkWidget      *widget,
-		       GtkAllocation  *allocation)
-{
-	EvView *view = EV_VIEW (widget);
-	GList  *children, *l;
-
-	GTK_WIDGET_CLASS (ev_view_parent_class)->size_allocate (widget, allocation);
-	
-	if (view->sizing_mode == EV_SIZING_FIT_WIDTH ||
-	    view->sizing_mode == EV_SIZING_BEST_FIT) {
-
-		g_signal_emit (view, signals[SIGNAL_ZOOM_INVALID], 0);
-
-		ev_view_size_request (widget, &widget->requisition);
-	}
-	
-	view_set_adjustment_values (view, GTK_ORIENTATION_HORIZONTAL);
-	view_set_adjustment_values (view, GTK_ORIENTATION_VERTICAL);
-
-	if (view->document)
-		view_update_range_and_current_page (view);
-
-	view->pending_scroll = SCROLL_TO_KEEP_POSITION;
-	view->pending_resize = FALSE;
-
-	children = gtk_container_get_children (GTK_CONTAINER (widget));
-	for (l = children; l && l->data; l = g_list_next (l)) {
-		EvFormField   *field;
-		EvRectangle    field_area;
-		GdkRectangle   view_area;
-		GList         *form_field_mapping;
-		GtkAllocation  child_allocation;
-		GtkRequisition child_requisition;
-		GtkWidget     *child = (GtkWidget *)l->data;
-		
-		field = g_object_get_data (G_OBJECT (child), "form-field");
-		if (!field)
-			continue;
-
-		form_field_mapping = ev_pixbuf_cache_get_form_field_mapping (view->pixbuf_cache,
-									     field->page->index);
-		ev_form_field_mapping_get_area (form_field_mapping, field, &field_area);
-
-		doc_rect_to_view_rect (view, field->page->index, &field_area, &view_area);
-		view_area.x -= view->scroll_x;
-		view_area.y -= view->scroll_y;
-
-		gtk_widget_size_request (child, &child_requisition);
-		if (child_requisition.width != view_area.width ||
-		    child_requisition.height != view_area.height)
-			gtk_widget_set_size_request (child, view_area.width, view_area.height);
-
-		gtk_container_child_get (GTK_CONTAINER (widget),
-					 child,
-					 "x", &child_allocation.x,
-					 "y", &child_allocation.y,
-					 NULL);
-		if (child_allocation.x != view_area.x ||
-		    child_allocation.y != view_area.y) {
-			gtk_layout_move (GTK_LAYOUT (widget), child, view_area.x, view_area.y);
-		}
-	}
-	g_list_free (children);
-}
-
-static void
-ev_view_realize (GtkWidget *widget)
-{
-	EvView *view = EV_VIEW (widget);
-
-	if (GTK_WIDGET_CLASS (ev_view_parent_class)->realize)
-		(* GTK_WIDGET_CLASS (ev_view_parent_class)->realize) (widget);
-
-	gdk_window_set_events (view->layout.bin_window,
-			       (gdk_window_get_events (view->layout.bin_window) | 
-				GDK_EXPOSURE_MASK |
-				GDK_BUTTON_PRESS_MASK |
-				GDK_BUTTON_RELEASE_MASK |
-				GDK_SCROLL_MASK |
-				GDK_KEY_PRESS_MASK |
-				GDK_POINTER_MOTION_MASK |
-				GDK_POINTER_MOTION_HINT_MASK |
-				GDK_ENTER_NOTIFY_MASK |
-				GDK_LEAVE_NOTIFY_MASK));
-
-	if (view->presentation)
-		gdk_window_set_background (view->layout.bin_window, &widget->style->black);
-	else
-		gdk_window_set_background (view->layout.bin_window, &widget->style->mid [GTK_STATE_NORMAL]);
-}
-
-static gboolean
-ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event)
-{
-	EvView *view = EV_VIEW (widget);
-	guint state;
-
-	state = event->state & gtk_accelerator_get_default_mod_mask ();
-
-	if (state == GDK_CONTROL_MASK && view->presentation == FALSE) {
-		ev_view_set_sizing_mode (view, EV_SIZING_FREE);
-
-		if (event->direction == GDK_SCROLL_UP ||
-		    event->direction == GDK_SCROLL_LEFT) {
-			if (ev_view_can_zoom_in (view)) {
-				ev_view_zoom_in (view);
-			}
-		} else {
-			if (ev_view_can_zoom_out (view)) {
-				ev_view_zoom_out (view);
-			}
-		}
-
-		return TRUE;
-	}
-
-	view->jump_to_find_result = FALSE;
-
-	/* Shift+Wheel scrolls the in the perpendicular direction */
-	if (state & GDK_SHIFT_MASK) {
-		if (event->direction == GDK_SCROLL_UP)
-			event->direction = GDK_SCROLL_LEFT;
-		else if (event->direction == GDK_SCROLL_LEFT)
-			event->direction = GDK_SCROLL_UP;
-		else if (event->direction == GDK_SCROLL_DOWN)
-			event->direction = GDK_SCROLL_RIGHT;
-		else if (event->direction == GDK_SCROLL_RIGHT)
-			event->direction = GDK_SCROLL_DOWN;
-
-		event->state &= ~GDK_SHIFT_MASK;
-		state &= ~GDK_SHIFT_MASK;
-	}
-
-	if (state == 0 && view->presentation) {
-		switch (event->direction) {
-		        case GDK_SCROLL_DOWN:
-		        case GDK_SCROLL_RIGHT:
-				ev_view_next_page (view);	
-				break;
-		        case GDK_SCROLL_UP:
-		        case GDK_SCROLL_LEFT:
-				ev_view_previous_page (view);
-				break;
-		}
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-static EvViewSelection *
-find_selection_for_page (EvView *view,
-			 gint    page)
-{
-	GList *list;
-
-	for (list = view->selection_info.selections; list != NULL; list = list->next) {
-		EvViewSelection *selection;
-
-		selection = (EvViewSelection *) list->data;
-
-		if (selection->page == page)
-			return selection;
-	}
-
-	return NULL;
-}
-
-static void
-draw_end_presentation_page (EvView       *view,
-			    GdkRectangle *page_area)
-{
-	PangoLayout *layout;
-	PangoFontDescription *font_desc;
-	gchar *markup;
-	const gchar *text = _("End of presentation. Press Escape to exit.");
-
-	if (view->presentation_state != EV_PRESENTATION_END)
-		return;
-
-	layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), NULL);
-	markup = g_strdup_printf ("<span foreground=\"white\">%s</span>", text);
-	pango_layout_set_markup (layout, markup, -1);
-	g_free (markup);
-
-	font_desc = pango_font_description_new ();
-	pango_font_description_set_size (font_desc, 16 * PANGO_SCALE);
-	pango_layout_set_font_description (layout, font_desc);
-
-	gtk_paint_layout (GTK_WIDGET (view)->style,
-			  view->layout.bin_window,
-			  GTK_WIDGET_STATE (view),
-			  FALSE,
-			  page_area,
-			  GTK_WIDGET (view),
-			  NULL,
-			  page_area->x + 15,
-			  page_area->y + 15,
-			  layout);
-
-	pango_font_description_free (font_desc);
-	g_object_unref (layout);
-}
-
-static gboolean
-ev_view_expose_event (GtkWidget      *widget,
-		      GdkEventExpose *event)
-{
-	EvView  *view = EV_VIEW (widget);
-	cairo_t *cr;
-	gint     i;
-
-	if (view->animation && ev_transition_animation_ready (view->animation)) {
-		GdkRectangle page_area;
-		GtkBorder    border;
-
-		if (get_page_extents (view, view->current_page, &page_area, &border)) {
-			cr = gdk_cairo_create (view->layout.bin_window);
-
-			/* normalize to x=0, y=0 */
-			cairo_translate (cr, page_area.x, page_area.y);
-			page_area.x = page_area.y = 0;
-
-			ev_transition_animation_paint (view->animation, cr, page_area);
-			cairo_destroy (cr);
-		}
-
-		return TRUE;
-	}
-
-	if (view->presentation) {
-		switch (view->presentation_state) {
-		        case EV_PRESENTATION_END: {
-				GdkRectangle area = {0};
-
-				area.width = widget->allocation.width;
-				area.height = widget->allocation.height;
-				
-				draw_end_presentation_page (view, &area);
-			}
-				return FALSE;
-		        case EV_PRESENTATION_BLACK:
-		        case EV_PRESENTATION_WHITE:
-				return FALSE;
-		        case EV_PRESENTATION_NORMAL:
-		        default:
-				break;
-		}
-	} else if (view->loading) {
-		GdkRectangle area = {0};
-		
-		area.width = widget->allocation.width;
-		area.height = widget->allocation.height;
-
-		draw_loading_text (view,
-				   &area,
-				   &(event->area));
-	}
-
-	if (view->document == NULL)
-		return FALSE;
-
-	cr = gdk_cairo_create (view->layout.bin_window);
-	
-	for (i = view->start_page; i <= view->end_page; i++) {
-		GdkRectangle page_area;
-		GtkBorder border;
-		gboolean page_ready = TRUE;
-
-		if (!get_page_extents (view, i, &page_area, &border))
-			continue;
-
-		page_area.x -= view->scroll_x;
-		page_area.y -= view->scroll_y;
-
-		draw_one_page (view, i, cr, &page_area, &border, &(event->area), &page_ready);
-
-		if (page_ready && view->find_pages && view->highlight_find_results)
-			highlight_find_results (view, i);
-	}
-
-	cairo_destroy (cr);
-
-	if (GTK_WIDGET_CLASS (ev_view_parent_class)->expose_event)
-		(* GTK_WIDGET_CLASS (ev_view_parent_class)->expose_event) (widget, event);
-
-	return FALSE;
-}
-
-static gboolean
-ev_view_do_popup_menu (EvView *view,
-		       gdouble x,
-		       gdouble y)
-{
-	EvLink  *link;
-	EvImage *image;
-
-	image = ev_view_get_image_at_location (view, x, y);
-	if (image) {
-		g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, image);
-		return TRUE;
-	}
-
-	link = ev_view_get_link_at_location (view, x, y);
-	if (link) {
-		g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, link);
-		return TRUE;
-	}
-
-	g_signal_emit (view, signals[SIGNAL_POPUP_MENU], 0, NULL);
-
-	return TRUE;
-}
-
-static gboolean
-ev_view_popup_menu (GtkWidget *widget)
-{
-	gint x, y;
-	
-	gtk_widget_get_pointer (widget, &x, &y);
-	return ev_view_do_popup_menu (EV_VIEW (widget), x, y);
-}
-
-static void
-get_link_area (EvView       *view,
-	       gint          x,
-	       gint          y,
-	       EvLink       *link,
-	       GdkRectangle *area)
-{
-	EvRectangle  ev_rect;
-	GList       *link_mapping;
-	gint         page;
-	gint         x_offset = 0, y_offset = 0;
-
-	x += view->scroll_x;
-	y += view->scroll_y;
-	
-	find_page_at_location (view, x, y, &page, &x_offset, &y_offset);
-	
-	link_mapping = ev_pixbuf_cache_get_link_mapping (view->pixbuf_cache, page);
-	ev_link_mapping_get_area (link_mapping, link, &ev_rect);
-
-	doc_rect_to_view_rect (view, page, &ev_rect, area);
-	area->y -= view->scroll_y ;
-}
-
-static gboolean
-ev_view_query_tooltip (GtkWidget         *widget,
-		       gint               x,
-		       gint               y,
-		       gboolean           keyboard_tip,
-		       GtkTooltip        *tooltip)
-{
-	EvView *view = EV_VIEW (widget);
-	EvLink *link;
-	gchar  *text;
-
-	link = ev_view_get_link_at_location (view, x, y);
-	if (!link)
-		return FALSE;
-
-	text = tip_from_link (view, link);
-	if (text && g_utf8_validate (text, -1, NULL)) {
-		GdkRectangle link_area;
-
-		get_link_area (view, x, y, link, &link_area);
-		gtk_tooltip_set_text (tooltip, text);
-		gtk_tooltip_set_tip_area (tooltip, &link_area);
-	}
-	g_free (text);
-
-	return TRUE;
-}
-
-static void
-start_selection_for_event (EvView         *view,
-			   GdkEventButton *event)
-{
-	EvSelectionStyle style;
-
-	clear_selection (view);
-	
-	view->selection_info.start.x = event->x + view->scroll_x;
-	view->selection_info.start.y = event->y + view->scroll_y;
-
-	switch (event->type) {
-	        case GDK_2BUTTON_PRESS:
-			style = EV_SELECTION_STYLE_WORD;
-			break;
-	        case GDK_3BUTTON_PRESS:
-			style = EV_SELECTION_STYLE_LINE;
-			break;
-	        default:
-			style = EV_SELECTION_STYLE_GLYPH;
-			break;
-	}
-
-	view->selection_info.style = style;
-}
-
-static gboolean
-ev_view_button_press_event (GtkWidget      *widget,
-			    GdkEventButton *event)
-{
-	EvView *view = EV_VIEW (widget);
-
-	if (!view->document)
-		return FALSE;
-	
-	if (!GTK_WIDGET_HAS_FOCUS (widget)) {
-		gtk_widget_grab_focus (widget);
-	}
-	
-	view->pressed_button = event->button;
-	view->selection_info.in_drag = FALSE;
-
-	if (view->scroll_info.autoscrolling)
-		return TRUE;
-	
-	switch (event->button) {
-	        case 1: {
-			EvImage *image;
-			EvFormField *field;
-
-			if (EV_IS_SELECTION (view->document) && view->selection_info.selections) {
-				if (event->type == GDK_3BUTTON_PRESS) {
-					start_selection_for_event (view, event);
-				} else if (location_in_selected_text (view,
-							       event->x + view->scroll_x,
-							       event->y + view->scroll_y)) {
-					view->selection_info.in_drag = TRUE;
-				} else {
-					start_selection_for_event (view, event);
-				}
-
-				gtk_widget_queue_draw (widget);
-			} else if ((field = ev_view_get_form_field_at_location (view, event->x, event->y))) {
-				ev_view_remove_all (view);
-				ev_view_handle_form_field (view, field, event->x, event->y);
-			} else if (!location_in_text (view, event->x + view->scroll_x, event->y + view->scroll_y) &&
-				   (image = ev_view_get_image_at_location (view, event->x, event->y))) {
-				if (view->image_dnd_info.image)
-					g_object_unref (view->image_dnd_info.image);
-				view->image_dnd_info.image = g_object_ref (image);
-				view->image_dnd_info.in_drag = TRUE;
-
-				view->image_dnd_info.start.x = event->x + view->scroll_x;
-				view->image_dnd_info.start.y = event->y + view->scroll_y;
-			} else {
-				ev_view_remove_all (view);
-				
-				if (EV_IS_SELECTION (view->document))
-					start_selection_for_event (view, event);
-			}
-		}			
-			return TRUE;
-		case 2:
-			/* use root coordinates as reference point because
-			 * scrolling changes window relative coordinates */
-			view->drag_info.start.x = event->x_root;
-			view->drag_info.start.y = event->y_root;
-			view->drag_info.hadj = gtk_adjustment_get_value (view->hadjustment);
-			view->drag_info.vadj = gtk_adjustment_get_value (view->vadjustment);
-
-			ev_view_set_cursor (view, EV_VIEW_CURSOR_DRAG);
-
-			return TRUE;
-		case 3:
-			view->scroll_info.start_y = event->y;
-			return ev_view_do_popup_menu (view, event->x, event->y);
-	}
-	
-	return FALSE;
-}
-
-static void
-ev_view_remove_all (EvView *view)
-{
-	GList *children, *child;
-
-	children = gtk_container_get_children (GTK_CONTAINER (view));
-	for (child = children; child && child->data; child = g_list_next (child)) {
-		gtk_container_remove (GTK_CONTAINER (view),
-				      GTK_WIDGET (child->data));
-	}
-	g_list_free (children);
-}
-
-/*** Drag and Drop ***/
-static void
-ev_view_drag_data_get (GtkWidget        *widget,
-		       GdkDragContext   *context,
-		       GtkSelectionData *selection_data,
-		       guint             info,
-		       guint             time)
-{
-	EvView *view = EV_VIEW (widget);
-
-	switch (info) {
-	        case TARGET_DND_TEXT:
-			if (EV_IS_SELECTION (view->document) &&
-			    view->selection_info.selections) {
-				gchar *text;
-
-				text = get_selected_text (view);
-				gtk_selection_data_set_text (selection_data,
-							     text,
-							     strlen (text));
-				g_free (text);
-			}
-			break;
-	        case TARGET_DND_IMAGE:
-			if (view->image_dnd_info.image) {
-				GdkPixbuf *pixbuf;
-
-				ev_document_doc_mutex_lock ();
-				pixbuf = ev_document_images_get_image (EV_DOCUMENT_IMAGES (view->document),
-								       view->image_dnd_info.image);
-				ev_document_doc_mutex_unlock ();
-				
-				gtk_selection_data_set_pixbuf (selection_data, pixbuf);
-				g_object_unref (pixbuf);
-			}
-			break;
-	        case TARGET_DND_URI:
-			if (view->image_dnd_info.image) {
-				GdkPixbuf   *pixbuf;
-				const gchar *tmp_uri;
-				gchar      **uris;
-
-				ev_document_doc_mutex_lock ();
-				pixbuf = ev_document_images_get_image (EV_DOCUMENT_IMAGES (view->document),
-								       view->image_dnd_info.image);
-				ev_document_doc_mutex_unlock ();
-				
-				tmp_uri = ev_image_save_tmp (view->image_dnd_info.image, pixbuf);
-				g_object_unref (pixbuf);
-
-				uris = g_new0 (gchar *, 2);
-				uris[0] = (gchar *)tmp_uri;
-				
-				gtk_selection_data_set_uris (selection_data, uris);
-
-				/* g_free instead of g_strfreev since tmp_uri is const */ 
-				g_free (uris);
-			}
-	}
-}
-
-static gboolean
-ev_view_drag_motion (GtkWidget      *widget,
-		     GdkDragContext *context,
-		     gint            x,
-		     gint            y,
-		     guint           time)
-{
-	if (gtk_drag_get_source_widget (context) == widget)
-		gdk_drag_status (context, 0, time);
-	else
-		gdk_drag_status (context, context->suggested_action, time);
-	
-	return TRUE;
-}
-		     
-static gboolean
-selection_update_idle_cb (EvView *view)
-{
-	compute_selections (view,
-			    view->selection_info.style,
-			    &view->selection_info.start,
-			    &view->motion);
-	view->selection_update_id = 0;
-	return FALSE;
-}
-
-static gboolean
-selection_scroll_timeout_cb (EvView *view)
-{	
-	gint x, y, shift = 0;
-	GtkWidget *widget = GTK_WIDGET (view);
-	
-	gtk_widget_get_pointer (widget, &x, &y);
-
-	if (y > widget->allocation.height) {
-		shift = (y - widget->allocation.height) / 2;
-	} else if (y < 0) {
-		shift = y / 2;
-	}
-
-	if (shift)
-		gtk_adjustment_set_value (view->vadjustment,
-					  CLAMP (view->vadjustment->value + shift,
-					  view->vadjustment->lower,
-					  view->vadjustment->upper -
-					  view->vadjustment->page_size));	
-
-	if (x > widget->allocation.width) {
-		shift = (x - widget->allocation.width) / 2;
-	} else if (x < 0) {
-		shift = x / 2;
-	}
-
-	if (shift)
-		gtk_adjustment_set_value (view->hadjustment,
-					  CLAMP (view->hadjustment->value + shift,
-					  view->hadjustment->lower,
-					  view->hadjustment->upper -
-					  view->hadjustment->page_size));	
-
-	return TRUE;
-}
-
-static gboolean
-ev_view_drag_update_momentum (EvView *view)
-{
-	int i;
-	if (!view->drag_info.in_drag)
-		return FALSE;
-	
-	for (i = DRAG_HISTORY - 1; i > 0; i--) {
-		view->drag_info.buffer[i].x = view->drag_info.buffer[i-1].x;
-		view->drag_info.buffer[i].y = view->drag_info.buffer[i-1].y;
-	}
-
-	/* Momentum is a moving average of 10ms granularity over
-	 * the last 100ms with each 10ms stored in buffer. 
-	 */
-	
-	view->drag_info.momentum.x = (view->drag_info.buffer[DRAG_HISTORY - 1].x - view->drag_info.buffer[0].x);
-	view->drag_info.momentum.y = (view->drag_info.buffer[DRAG_HISTORY - 1].y - view->drag_info.buffer[0].y);
-
-	return TRUE;
-}
-
-static gboolean
-ev_view_scroll_drag_release (EvView *view)
-{
-	gdouble dhadj_value, dvadj_value;
-	gdouble oldhadjustment, oldvadjustment;
-
-	view->drag_info.momentum.x /= 1.2;
-	view->drag_info.momentum.y /= 1.2; /* Alter these constants to change "friction" */
-
-	dhadj_value = view->hadjustment->page_size *
-		      (gdouble)view->drag_info.momentum.x / GTK_WIDGET (view)->allocation.width;
-	dvadj_value = view->vadjustment->page_size *
-		      (gdouble)view->drag_info.momentum.y / GTK_WIDGET (view)->allocation.height;
-
-	oldhadjustment = gtk_adjustment_get_value (view->hadjustment);
-	oldvadjustment = gtk_adjustment_get_value (view->vadjustment);
-
-	if (((oldhadjustment + dhadj_value) > (view->hadjustment->upper - view->hadjustment->page_size)) ||
-	   ((oldhadjustment + dhadj_value) < 0))
-		view->drag_info.momentum.x *= -0.5; /* 0.5 rather than 1 means the edges absorb some momentum */
-	if (((oldvadjustment + dvadj_value) > (view->vadjustment->upper - view->vadjustment->page_size)) ||
-	   ((oldvadjustment + dvadj_value) < 0))
-		view->drag_info.momentum.y *= -0.5;
-
-	gtk_adjustment_set_value (view->hadjustment,
-				MIN (oldhadjustment + dhadj_value,
-				view->hadjustment->upper - view->hadjustment->page_size));
-	gtk_adjustment_set_value (view->vadjustment,
-				MIN (oldvadjustment + dvadj_value,
-				view->vadjustment->upper - view->vadjustment->page_size));
-
-	if (((view->drag_info.momentum.x < 1) && (view->drag_info.momentum.x > -1)) &&
-	   ((view->drag_info.momentum.y < 1) && (view->drag_info.momentum.y > -1)))
-		return FALSE;
-	else
-		return TRUE;
-}
-
-static gboolean
-ev_view_motion_notify_event (GtkWidget      *widget,
-			     GdkEventMotion *event)
-{
-	EvView *view = EV_VIEW (widget);
-	gint x, y;
-
-	if (!view->document)
-		return FALSE;
-	
-		
-        if (event->is_hint || event->window != view->layout.bin_window) {
-	    gtk_widget_get_pointer (widget, &x, &y);
-        } else {
-	    x = event->x;
-	    y = event->y;
-	}
-
-	if (view->scroll_info.autoscrolling) {
-		view->scroll_info.last_y = y;
-		return TRUE;
-	}
-
-	if (view->selection_info.in_drag) {
-		if (gtk_drag_check_threshold (widget,
-					      view->selection_info.start.x,
-					      view->selection_info.start.y,
-					      x, y)) {
-			GtkTargetList *target_list = gtk_target_list_new (NULL, 0);
-
-			gtk_target_list_add_text_targets (target_list, TARGET_DND_TEXT);
-
-			gtk_drag_begin (widget, target_list,
-					GDK_ACTION_COPY,
-					1, (GdkEvent *)event);
-
-			view->selection_info.in_drag = FALSE;
-
-			gtk_target_list_unref (target_list);
-
-			return TRUE;
-		}
-	} else if (view->image_dnd_info.in_drag) {
-		if (gtk_drag_check_threshold (widget,
-					      view->selection_info.start.x,
-					      view->selection_info.start.y,
-					      x, y)) {
-			GtkTargetList *target_list = gtk_target_list_new (NULL, 0);
-
-			gtk_target_list_add_uri_targets (target_list, TARGET_DND_URI);
-			gtk_target_list_add_image_targets (target_list, TARGET_DND_IMAGE, TRUE);
-
-			gtk_drag_begin (widget, target_list,
-					GDK_ACTION_COPY,
-					1, (GdkEvent *)event);
-
-			view->image_dnd_info.in_drag = FALSE;
-
-			gtk_target_list_unref (target_list);
-
-			return TRUE;
-		}
-	}
-	
-	switch (view->pressed_button) {
-	case 1:
-		/* For the Evince 0.4.x release, we limit selection to un-rotated
-		 * documents only.
-		 */
-		if (view->rotation != 0)
-			return FALSE;
-
-		/* Schedule timeout to scroll during selection and additionally 
-		 * scroll once to allow arbitrary speed. */
-		if (!view->selection_scroll_id)
-		    view->selection_scroll_id = g_timeout_add (SCROLL_TIME,
-							       (GSourceFunc)selection_scroll_timeout_cb,
-							       view);
-		else 
-		    selection_scroll_timeout_cb (view);
-
-		view->selection_info.in_selection = TRUE;
-		view->motion.x = x + view->scroll_x;
-		view->motion.y = y + view->scroll_y;
-
-		/* Queue an idle to handle the motion.  We do this because	
-		 * handling any selection events in the motion could be slower	
-		 * than new motion events reach us.  We always put it in the	
-		 * idle to make sure we catch up and don't visibly lag the	
-		 * mouse. */
-		if (!view->selection_update_id)
-			view->selection_update_id = g_idle_add ((GSourceFunc)selection_update_idle_cb, view);
-
-		return TRUE;
-	case 2:
-		if (!view->drag_info.in_drag) {
-			gboolean start;
-			int i;
-
-			start = gtk_drag_check_threshold (widget,
-							  view->drag_info.start.x,
-							  view->drag_info.start.y,
-							  event->x_root,
-							  event->y_root);
-			view->drag_info.in_drag = start;
-			view->drag_info.drag_timeout_id = g_timeout_add (10,
-				(GSourceFunc)ev_view_drag_update_momentum, view);
-			/* Set 100 to choose how long it takes to build up momentum */
-			/* Clear out previous momentum info: */
-			for (i = 0; i < DRAG_HISTORY; i++) {
-				view->drag_info.buffer[i].x = event->x;
-				view->drag_info.buffer[i].y = event->y;
-			}
-			view->drag_info.momentum.x = 0;
-			view->drag_info.momentum.y = 0;
-		}
-
-		if (view->drag_info.in_drag) {
-			int dx, dy;
-			gdouble dhadj_value, dvadj_value;
-
-			view->drag_info.buffer[0].x = event->x;
-			view->drag_info.buffer[0].y = event->y;
-
-			dx = event->x_root - view->drag_info.start.x;
-			dy = event->y_root - view->drag_info.start.y;
-
-			dhadj_value = view->hadjustment->page_size *
-				      (gdouble)dx / widget->allocation.width;
-			dvadj_value = view->vadjustment->page_size *
-				      (gdouble)dy / widget->allocation.height;
-
-			/* clamp scrolling to visible area */
-			gtk_adjustment_set_value (view->hadjustment,
-						  MIN(view->drag_info.hadj - dhadj_value,
-						      view->hadjustment->upper -
-						      view->hadjustment->page_size));
-			gtk_adjustment_set_value (view->vadjustment,
-						  MIN(view->drag_info.vadj - dvadj_value,
-						      view->vadjustment->upper -
-						      view->vadjustment->page_size));
-
-			return TRUE;
-		}
-
-		break;
-	default:
-		ev_view_handle_cursor_over_xy (view, x, y);
-	} 
-
-	return FALSE;
-}
-
-static gboolean
-ev_view_button_release_event (GtkWidget      *widget,
-			      GdkEventButton *event)
-{
-	EvView *view = EV_VIEW (widget);
-	EvLink *link = NULL;
-
-	view->image_dnd_info.in_drag = FALSE;
-
-	if (view->scroll_info.autoscrolling) {
-		ev_view_autoscroll_stop (view);
-		view->pressed_button = -1;
-
-		return TRUE;
-	} 
-
-	if (view->drag_info.in_drag) {
-		view->drag_info.release_timeout_id =
-			g_timeout_add (20,
-				       (GSourceFunc)ev_view_scroll_drag_release, view);
-	}
-
-	if (view->document && !view->drag_info.in_drag && view->pressed_button != 3) {
-		link = ev_view_get_link_at_location (view, event->x, event->y);
-	}
-	
-	view->drag_info.in_drag = FALSE;
-
-	if (view->pressed_button == 2) {
-		ev_view_handle_cursor_over_xy (view, event->x, event->y);
-	}
-
-	view->pressed_button = -1;
-
-	if (view->selection_scroll_id) {
-	    g_source_remove (view->selection_scroll_id);
-	    view->selection_scroll_id = 0;
-	}
-	if (view->selection_update_id) {
-	    g_source_remove (view->selection_update_id);
-	    view->selection_update_id = 0;
-	}
-
-	if (!view->selection_info.in_selection &&
-	    view->selection_info.style != EV_SELECTION_STYLE_GLYPH) {
-		compute_selections (view,
-				    view->selection_info.style,
-				    &(view->selection_info.start),
-				    &(view->selection_info.start));
-	}
-
-	if (view->selection_info.selections) {
-		clear_link_selected (view);
-		ev_view_update_primary_selection (view);
-		
-		if (view->selection_info.in_drag) {
-			clear_selection (view);
-			gtk_widget_queue_draw (widget);
-		}
-		
-		view->selection_info.in_drag = FALSE;
-	} else if (link) {
-		if (event->button == 2) {
-			EvLinkAction    *action;
-			EvLinkActionType type;
-
-			action = ev_link_get_action (link);
-			if (!action)
-				return FALSE;
-
-			type = ev_link_action_get_action_type (action);
-			if (type == EV_LINK_ACTION_TYPE_GOTO_DEST) {
-				g_signal_emit (view,
-					       signals[SIGNAL_EXTERNAL_LINK],
-					       0, action);
-			}
-		} else {
-			ev_view_handle_link (view, link);
-		}
-	} else if (view->presentation) {
-		switch (event->button) {
-		        case 1:
-				ev_view_next_page (view);	
-				return TRUE;
-		        case 3:
-				ev_view_previous_page (view);	
-				return TRUE;
-		}
-	}
- 
-	return FALSE;
-}
-
-/* Goto Window */
-/* Cut and paste from gtkwindow.c */
-static void
-send_focus_change (GtkWidget *widget,
-		   gboolean   in)
-{
-	GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE);
-
-	g_object_ref (widget);
-
-	if (in)
-		GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
-	else
-		GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
-
-	fevent->focus_change.type = GDK_FOCUS_CHANGE;
-	fevent->focus_change.window = g_object_ref (widget->window);
-	fevent->focus_change.in = in;
-
-	gtk_widget_event (widget, fevent);
-
-	g_object_notify (G_OBJECT (widget), "has-focus");
-
-	g_object_unref (widget);
-	gdk_event_free (fevent);
-}
-
-static void
-ev_view_goto_window_hide (EvView *view)
-{
-	/* send focus-in event */
-	send_focus_change (view->goto_entry, FALSE);
-	gtk_widget_hide (view->goto_window);
-	gtk_entry_set_text (GTK_ENTRY (view->goto_entry), "");
-}
-
-static gboolean
-ev_view_goto_window_delete_event (GtkWidget   *widget,
-				  GdkEventAny *event,
-				  EvView      *view)
-{
-	ev_view_goto_window_hide (view);
-
-	return TRUE;
-}
-
-static gboolean
-key_is_numeric (guint keyval)
-{
-	return ((keyval >= GDK_0 && keyval <= GDK_9) ||
-		(keyval >= GDK_KP_0 && keyval <= GDK_KP_9));
-}
-
-static gboolean
-ev_view_goto_window_key_press_event (GtkWidget   *widget,
-				     GdkEventKey *event,
-				     EvView      *view)
-{
-	switch (event->keyval) {
-	        case GDK_Escape:
-	        case GDK_Tab:
-	        case GDK_KP_Tab:
-	        case GDK_ISO_Left_Tab:
-			ev_view_goto_window_hide (view);
-			return TRUE;
-	        case GDK_Return:
-	        case GDK_KP_Enter:
-	        case GDK_ISO_Enter:
-	        case GDK_BackSpace:
-	        case GDK_Delete:
-			return FALSE;
-	        default:
-			if (!key_is_numeric (event->keyval))
-				return TRUE;
-	}
-
-	return FALSE;
-}
-
-static gboolean
-ev_view_goto_window_button_press_event (GtkWidget      *widget,
-					GdkEventButton *event,
-					EvView         *view)
-{
-	ev_view_goto_window_hide (view);
-
-	return TRUE;
-}
-
-static void
-ev_view_goto_entry_activate (GtkEntry *entry,
-			     EvView   *view)
-{
-	const gchar *text;
-	gint         page;
-
-	text = gtk_entry_get_text (entry);
-	page = atoi (text) - 1;
-	
-	ev_view_goto_window_hide (view);
-
-	if (page >= 0 &&
-	    page < ev_page_cache_get_n_pages (view->page_cache))
-		ev_page_cache_set_current_page (view->page_cache, page);
-}
-
-static void
-ev_view_goto_window_create (EvView *view)
-{
-	GtkWidget *frame, *hbox, *toplevel, *label;
-
-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	
-	if (view->goto_window) {
-		if (GTK_WINDOW (toplevel)->group)
-			gtk_window_group_add_window (GTK_WINDOW (toplevel)->group,
-						     GTK_WINDOW (view->goto_window));
-		else if (GTK_WINDOW (view->goto_window)->group)
-			gtk_window_group_remove_window (GTK_WINDOW (view->goto_window)->group,
-							GTK_WINDOW (view->goto_window));
-		return;
-	}
-
-	view->goto_window = gtk_window_new (GTK_WINDOW_POPUP);
-
-	if (GTK_WINDOW (toplevel)->group)
-		gtk_window_group_add_window (GTK_WINDOW (toplevel)->group,
-					     GTK_WINDOW (view->goto_window));
-	
-	gtk_window_set_modal (GTK_WINDOW (view->goto_window), TRUE);
-
-	g_signal_connect (view->goto_window, "delete_event",
-			  G_CALLBACK (ev_view_goto_window_delete_event),
-			  view);
-	g_signal_connect (view->goto_window, "key_press_event",
-			  G_CALLBACK (ev_view_goto_window_key_press_event),
-			  view);
-	g_signal_connect (view->goto_window, "button_press_event",
-			  G_CALLBACK (ev_view_goto_window_button_press_event),
-			  view);
-
-	frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
-	gtk_container_add (GTK_CONTAINER (view->goto_window), frame);
-	gtk_widget_show (frame);
-
-	hbox = gtk_hbox_new (FALSE, 0);
-	gtk_container_set_border_width (GTK_CONTAINER (hbox), 3);
-	gtk_container_add (GTK_CONTAINER (frame), hbox);
-	gtk_widget_show (hbox);
-
-	label = gtk_label_new(_("Jump to page:"));
-	gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 3);
-	gtk_widget_show (label);
-	gtk_widget_realize (label);
-
-	view->goto_entry = gtk_entry_new ();
-	g_signal_connect (view->goto_entry, "activate",
-			  G_CALLBACK (ev_view_goto_entry_activate),
-			  view);
-	gtk_box_pack_start (GTK_BOX (hbox), view->goto_entry, TRUE, TRUE, 0);
-	gtk_widget_show (view->goto_entry);
-	gtk_widget_realize (view->goto_entry);
-}
-
-static void
-ev_view_goto_entry_grab_focus (EvView *view)
-{
-	GtkWidgetClass *entry_parent_class;
-	
-	entry_parent_class = g_type_class_peek_parent (GTK_ENTRY_GET_CLASS (view->goto_entry));
-	(entry_parent_class->grab_focus) (view->goto_entry);
-
-	send_focus_change (view->goto_entry, TRUE);
-}
-
-static void
-ev_view_goto_window_send_key_event (EvView   *view,
-				    GdkEvent *event)
-{
-	GdkEventKey *new_event;
-	GdkScreen   *screen;
-
-	/* Move goto window off screen */
-	screen = gtk_widget_get_screen (GTK_WIDGET (view));
-	gtk_window_move (GTK_WINDOW (view->goto_window),
-			 gdk_screen_get_width (screen) + 1,
-			 gdk_screen_get_height (screen) + 1);
-	gtk_widget_show (view->goto_window);
-
-	new_event = (GdkEventKey *) gdk_event_copy (event);
-	g_object_unref (new_event->window);
-	new_event->window = g_object_ref (view->goto_window->window);
-	gtk_widget_realize (view->goto_window);
-
-	gtk_widget_event (view->goto_window, (GdkEvent *)new_event);
-	gdk_event_free ((GdkEvent *)new_event);
-	gtk_widget_hide (view->goto_window);
-}
-
-static gboolean
-ev_view_key_press_event (GtkWidget   *widget,
-			 GdkEventKey *event)
-{
-	EvView *view = EV_VIEW (widget);
-	EvPresentationState current;
-
-	if (!view->document)
-		return FALSE;
-	
-	if (!view->presentation ||
-	    view->presentation_state == EV_PRESENTATION_END)
-		return gtk_bindings_activate_event (GTK_OBJECT (widget), event);
-
-
-	current = view->presentation_state;
-
-	switch (event->keyval) {
-	        case GDK_b:
-	        case GDK_B:
-	        case GDK_period:
-	        case GDK_KP_Decimal:
-			view->presentation_state =
-				(view->presentation_state == EV_PRESENTATION_BLACK) ?
-				EV_PRESENTATION_NORMAL : EV_PRESENTATION_BLACK;
-			break;
-	        case GDK_w:
-	        case GDK_W:
-			view->presentation_state =
-				(view->presentation_state == EV_PRESENTATION_WHITE) ?
-				EV_PRESENTATION_NORMAL : EV_PRESENTATION_WHITE;
-			break;
-	        default:
-			if (view->presentation_state == EV_PRESENTATION_BLACK ||
-			    view->presentation_state == EV_PRESENTATION_WHITE) {
-				view->presentation_state = EV_PRESENTATION_NORMAL;
-			}
-	}
-
-	if (current == view->presentation_state) {
-		if (ev_page_cache_get_n_pages (view->page_cache) > 1 &&
-		    key_is_numeric (event->keyval)) {
-			gint x, y;
-			
-			ev_view_goto_window_create (view);
-			ev_view_goto_window_send_key_event (view, (GdkEvent *)event);
-			gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
-			gtk_window_move (GTK_WINDOW (view->goto_window), x, y);
-			gtk_widget_show (view->goto_window);
-			ev_view_goto_entry_grab_focus (view);
-			
-			return TRUE;
-		}
-		
-		return gtk_bindings_activate_event (GTK_OBJECT (widget), event);
-	}
-
-	switch (view->presentation_state) {
-	        case EV_PRESENTATION_NORMAL:
-	        case EV_PRESENTATION_BLACK:
-			gdk_window_set_background (view->layout.bin_window,
-						   &widget->style->black);
-			break;
-	        case EV_PRESENTATION_WHITE:
-			gdk_window_set_background (view->layout.bin_window,
-						   &widget->style->white);
-			break;
-	        default:
-			return gtk_bindings_activate_event (GTK_OBJECT (widget), event);
-	}
-
-	gtk_widget_queue_draw (widget);
-	return TRUE;
-}
-
-static gint
-ev_view_focus_in (GtkWidget     *widget,
-		  GdkEventFocus *event)
-{
-	if (EV_VIEW (widget)->pixbuf_cache)
-		ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache);
-	gtk_widget_queue_draw (widget);
-
-	return FALSE;
-}
-
-static gint
-ev_view_focus_out (GtkWidget     *widget,
-		     GdkEventFocus *event)
-{
-	if (EV_VIEW (widget)->goto_window)
-		ev_view_goto_window_hide (EV_VIEW (widget));
-	
-	if (EV_VIEW (widget)->pixbuf_cache)
-		ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache);
-	gtk_widget_queue_draw (widget);
-
-	return FALSE;
-}
-
-static gboolean
-ev_view_leave_notify_event (GtkWidget *widget, GdkEventCrossing   *event)
-{
-	EvView *view = EV_VIEW (widget);
-
-	if (view->cursor != EV_VIEW_CURSOR_NORMAL)
-		ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
-
-	return FALSE;
-}
-
-static gboolean
-ev_view_enter_notify_event (GtkWidget *widget, GdkEventCrossing   *event)
-{
-	EvView *view = EV_VIEW (widget);
-
-	ev_view_handle_cursor_over_xy (view, event->x, event->y);
-    
-	return FALSE;
-}
-
-static void
-ev_view_style_set (GtkWidget *widget,
-		   GtkStyle  *old_style)
-{
-	if (EV_VIEW (widget)->pixbuf_cache)
-		ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache);
-
-	GTK_WIDGET_CLASS (ev_view_parent_class)->style_set (widget, old_style);
-}
-
-/*** Drawing ***/
-
-static guint32
-ev_gdk_color_to_rgb (const GdkColor *color)
-{
-  guint32 result;
-  result = (0xff0000 | (color->red & 0xff00));
-  result <<= 8;
-  result |= ((color->green & 0xff00) | (color->blue >> 8));
-  return result;
-}
-
-static void
-draw_rubberband (GtkWidget *widget, GdkWindow *window,
-		 const GdkRectangle *rect, guchar alpha)
-{
-	GdkGC *gc;
-	GdkPixbuf *pixbuf;
-	GdkColor *fill_color_gdk;
-	guint fill_color;
-
-	fill_color_gdk = gdk_color_copy (&GTK_WIDGET (widget)->style->base[GTK_STATE_SELECTED]);
-	fill_color = ev_gdk_color_to_rgb (fill_color_gdk) << 8 | alpha;
-
-	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
-				 rect->width, rect->height);
-	gdk_pixbuf_fill (pixbuf, fill_color);
-
-	gdk_draw_pixbuf (window, NULL, pixbuf,
-			 0, 0,
-			 rect->x - EV_VIEW (widget)->scroll_x, rect->y - EV_VIEW (widget)->scroll_y,
-			 rect->width, rect->height,
-			 GDK_RGB_DITHER_NONE,
-			 0, 0);
-
-	g_object_unref (pixbuf);
-
-	gc = gdk_gc_new (window);
-	gdk_gc_set_rgb_fg_color (gc, fill_color_gdk);
-	gdk_draw_rectangle (window, gc, FALSE,
-			    rect->x - EV_VIEW (widget)->scroll_x, rect->y - EV_VIEW (widget)->scroll_y,
-			    rect->width - 1,
-			    rect->height - 1);
-	g_object_unref (gc);
-
-	gdk_color_free (fill_color_gdk);
-}
-
-
-static void
-highlight_find_results (EvView *view, int page)
-{
-	gint i, n_results = 0;
-
-	n_results = ev_view_find_get_n_results (view, page);
-
-	for (i = 0; i < n_results; i++) {
-		EvRectangle *rectangle;
-		GdkRectangle view_rectangle;
-		guchar alpha;
-
-		if (i == view->find_result && page == view->current_page) {
-			alpha = 0x90;
-		} else {
-			alpha = 0x20;
-		}
-
-		rectangle = ev_view_find_get_result (view, page, i);
-		doc_rect_to_view_rect (view, page, rectangle, &view_rectangle);
-		draw_rubberband (GTK_WIDGET (view), view->layout.bin_window,
-				 &view_rectangle, alpha);
-        }
-}
-
-static void
-draw_loading_text (EvView       *view,
-		   GdkRectangle *page_area,
-		   GdkRectangle *expose_area)
-{
-	cairo_t *cr;
-	gint     width, height;
-
-	if (!view->loading_text) {
-		const gchar *loading_text = _("Loading...");
-		PangoLayout *layout;
-		PangoFontDescription *font_desc;
-		PangoRectangle logical_rect;
-		gint target_width;
-		gdouble real_scale;
-
-		ev_document_fc_mutex_lock ();
-
-		layout = gtk_widget_create_pango_layout (GTK_WIDGET (view), loading_text);
-		
-		font_desc = pango_font_description_new ();
-		
-		/* We set the font to be 10 points, get the size, and scale appropriately */
-		pango_font_description_set_size (font_desc, 10 * PANGO_SCALE);
-		pango_layout_set_font_description (layout, font_desc);
-		pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-
-		target_width = MAX (page_area->width / 2, 1);
-		real_scale = ((double)target_width / (double) logical_rect.width) * (PANGO_SCALE * 10);
-		pango_font_description_set_size (font_desc, (int)real_scale);
-		pango_layout_set_font_description (layout, font_desc);
-		pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
-
-		view->loading_text = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-								 logical_rect.width,
-								 logical_rect.height);
-		cr = cairo_create (view->loading_text);
-		cairo_set_source_rgb (cr,
-				      155 / (double)255,
-				      155 / (double)255,
-				      155 / (double)255);
-		pango_cairo_show_layout (cr, layout);
-		cairo_destroy (cr);
-
-		pango_font_description_free (font_desc);
-		g_object_unref (layout);
-
-		ev_document_fc_mutex_unlock ();
-	}
-
-	width = (page_area->width - cairo_image_surface_get_width (view->loading_text)) / 2;
-	height = (page_area->height - cairo_image_surface_get_height (view->loading_text)) / 2;
-	
-	cr = gdk_cairo_create (view->layout.bin_window);
-	cairo_translate (cr,
-			 page_area->x + width,
-			 page_area->y + height);
-	cairo_set_source_surface (cr, view->loading_text, 0, 0);
-	cairo_paint (cr);
-	cairo_destroy (cr);
-}
-
-static void
-draw_one_page (EvView       *view,
-	       gint          page,
-	       cairo_t      *cr,
-	       GdkRectangle *page_area,
-	       GtkBorder    *border,
-	       GdkRectangle *expose_area,
-	       gboolean     *page_ready)
-{
-	GdkRectangle overlap;
-	GdkRectangle real_page_area;
-
-	g_assert (view->document);
-
-	if (! gdk_rectangle_intersect (page_area, expose_area, &overlap))
-		return;
-
-	/* Render the document itself */
-	real_page_area = *page_area;
-
-	real_page_area.x += border->left;
-	real_page_area.y += border->top;
-	real_page_area.width -= (border->left + border->right);
-	real_page_area.height -= (border->top + border->bottom);
-	*page_ready = TRUE;
-
-	if (!view->presentation) {
-		gint current_page;
-		
-		current_page = ev_page_cache_get_current_page (view->page_cache);
-		ev_document_misc_paint_one_page (view->layout.bin_window,
-						 GTK_WIDGET (view),
-						 page_area, border, 
-						 page == current_page);
-	}
-
-	if (gdk_rectangle_intersect (&real_page_area, expose_area, &overlap)) {
-		gint             width, height;
-		gint             page_width, page_height;
-		cairo_surface_t *page_surface = NULL;
-		gint             selection_width, selection_height;
-		cairo_surface_t *selection_surface = NULL;
-
-		page_surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, page);
-
-		if (!page_surface) {
-			if (!view->presentation) {
-				draw_loading_text (view,
-						   &real_page_area,
-						   expose_area);
-			}
-
-			*page_ready = FALSE;
-
-			return;
-		}
-
-		ev_page_cache_get_size (view->page_cache,
-					page, view->rotation,
-					view->scale,
-					&width, &height);
-
-		page_width = cairo_image_surface_get_width (page_surface);
-		page_height = cairo_image_surface_get_height (page_surface);
-
-		cairo_save (cr);
-		cairo_translate (cr, overlap.x, overlap.y);
-
-		if (width != page_width || height != page_height) {
-			cairo_pattern_set_filter (cairo_get_source (cr),
-						  CAIRO_FILTER_FAST);
-			cairo_scale (cr,
-				     (gdouble)width / page_width,
-				     (gdouble)height / page_height);
-		}
-
-		cairo_surface_set_device_offset (page_surface,
-						 overlap.x - real_page_area.x,
-						 overlap.y - real_page_area.y);
-		cairo_set_source_surface (cr, page_surface, 0, 0);
-		cairo_paint (cr);
-		cairo_restore (cr);
-		
-		/* Get the selection pixbuf iff we have something to draw */
-		if (find_selection_for_page (view, page) &&
-		    view->selection_mode == EV_VIEW_SELECTION_TEXT) {
-			selection_surface =
-				ev_pixbuf_cache_get_selection_surface (view->pixbuf_cache,
-								       page,
-								       view->scale,
-								       NULL);
-		}
-
-		if (!selection_surface) {
-			return;
-		}
-
-		selection_width = cairo_image_surface_get_width (selection_surface);
-		selection_height = cairo_image_surface_get_height (selection_surface);
-
-		cairo_save (cr);
-		cairo_translate (cr, overlap.x, overlap.y);
-
-		if (width != selection_width || height != selection_height) {
-			cairo_pattern_set_filter (cairo_get_source (cr),
-						  CAIRO_FILTER_FAST);
-			cairo_scale (cr,
-				     (gdouble)width / selection_width,
-				     (gdouble)height / selection_height);
-		}
-
-		cairo_surface_set_device_offset (selection_surface,
-						 overlap.x - real_page_area.x,
-						 overlap.y - real_page_area.y);
-		cairo_set_source_surface (cr, selection_surface, 0, 0);
-		cairo_paint (cr);
-		cairo_restore (cr);
-	}
-}
-
-/*** GObject functions ***/
-
-static void
-ev_view_finalize (GObject *object)
-{
-	EvView *view = EV_VIEW (object);
-
-	clear_selection (view);
-	clear_link_selected (view);
-
-	if (view->image_dnd_info.image)
-		g_object_unref (view->image_dnd_info.image);
-	view->image_dnd_info.image = NULL;
-
-	G_OBJECT_CLASS (ev_view_parent_class)->finalize (object);
-}
-
-static void
-ev_view_destroy (GtkObject *object)
-{
-	EvView *view = EV_VIEW (object);
-
-	if (view->document) {
-		g_object_unref (view->document);
-		view->document = NULL;
-	}
-
-	if (view->pixbuf_cache) {
-		g_object_unref (view->pixbuf_cache);
-		view->pixbuf_cache = NULL;
-	}
-
-	if (view->goto_window) {
-		gtk_widget_destroy (view->goto_window);
-		view->goto_window = NULL;
-		view->goto_entry = NULL;
-	}
-
-	if (view->selection_scroll_id) {
-	    g_source_remove (view->selection_scroll_id);
-	    view->selection_scroll_id = 0;
-	}
-
-	if (view->selection_update_id) {
-	    g_source_remove (view->selection_update_id);
-	    view->selection_update_id = 0;
-	}
-
-	if (view->loading_text) {
-		cairo_surface_destroy (view->loading_text);
-		view->loading_text = NULL;
-	}
-
-	if (view->scroll_info.timeout_id) {
-	    g_source_remove (view->scroll_info.timeout_id);
-	    view->scroll_info.timeout_id = 0;
-	}
-
-	if (view->drag_info.drag_timeout_id) {
-		g_source_remove (view->drag_info.drag_timeout_id);
-		view->drag_info.drag_timeout_id = 0;
-	}
-
-	if (view->drag_info.release_timeout_id) {
-		g_source_remove (view->drag_info.release_timeout_id);
-		view->drag_info.release_timeout_id = 0;
-	}
-
-	ev_view_presentation_transition_stop (view);
-
-	ev_view_set_scroll_adjustments (GTK_LAYOUT (view), NULL, NULL);
-
-	GTK_OBJECT_CLASS (ev_view_parent_class)->destroy (object);
-}
-
-static void
-ev_view_set_property (GObject      *object,
-		      guint         prop_id,
-		      const GValue *value,
-		      GParamSpec   *pspec)
-{
-	EvView *view = EV_VIEW (object);
-
-	switch (prop_id) {
-	        case PROP_CONTINUOUS:
-			ev_view_set_continuous (view, g_value_get_boolean (value));
-			break;
-	        case PROP_DUAL_PAGE:
-			ev_view_set_dual_page (view, g_value_get_boolean (value));
-			break;
-	        case PROP_FULLSCREEN:
-			ev_view_set_fullscreen (view, g_value_get_boolean (value));
-			break;
-	        case PROP_PRESENTATION:
-			ev_view_set_presentation (view, g_value_get_boolean (value));
-			break;
-	        case PROP_SIZING_MODE:
-			ev_view_set_sizing_mode (view, g_value_get_enum (value));
-			break;
-	        case PROP_ZOOM:
-			ev_view_set_zoom (view, g_value_get_double (value), FALSE);
-			break;
-	        case PROP_ROTATION:
-			ev_view_set_rotation (view, g_value_get_int (value));
-			break;
-	        default:
-			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-	}
-}
-
-static AtkObject *
-ev_view_get_accessible (GtkWidget *widget)
-{
-	static gboolean first_time = TRUE;
-
-	if (first_time)	{
-		AtkObjectFactory *factory;
-		AtkRegistry *registry;
-		GType derived_type; 
-		GType derived_atk_type; 
-
-		/*
-		 * Figure out whether accessibility is enabled by looking at the
-		 * type of the accessible object which would be created for
-		 * the parent type of EvView.
-		 */
-		derived_type = g_type_parent (EV_TYPE_VIEW);
-
-		registry = atk_get_default_registry ();
-		factory = atk_registry_get_factory (registry,
-						    derived_type);
-		derived_atk_type = atk_object_factory_get_accessible_type (factory);
-		if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE)) 
-			atk_registry_set_factory_type (registry, 
-						       EV_TYPE_VIEW,
-						       ev_view_accessible_factory_get_type ());
-		first_time = FALSE;
-	} 
-	return GTK_WIDGET_CLASS (ev_view_parent_class)->get_accessible (widget);
-}
-
-static void
-ev_view_get_property (GObject *object,
-		      guint prop_id,
-		      GValue *value,
-		      GParamSpec *pspec)
-{
-	EvView *view = EV_VIEW (object);
-
-	switch (prop_id) {
-	        case PROP_CONTINUOUS:
-			g_value_set_boolean (value, view->continuous);
-			break;
-	        case PROP_DUAL_PAGE:
-			g_value_set_boolean (value, view->dual_page);
-			break;
-	        case PROP_FULLSCREEN:
-			g_value_set_boolean (value, view->fullscreen);
-			break;
-	        case PROP_PRESENTATION:
-			g_value_set_boolean (value, view->presentation);
-			break;
-	        case PROP_SIZING_MODE:
-			g_value_set_enum (value, view->sizing_mode);
-			break;
-	        case PROP_ZOOM:
-			g_value_set_double (value, view->scale);
-			break;
-	        case PROP_ROTATION:
-			g_value_set_int (value, view->rotation);
-			break;
-	        case PROP_HAS_SELECTION:
-			g_value_set_boolean (value,
-					     view->selection_info.selections != NULL);
-			break;
-	        default:
-			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-	}
-}
-
-static void
-ev_view_class_init (EvViewClass *class)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (class);
-	GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (class);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-	GtkLayoutClass *layout_class = GTK_LAYOUT_CLASS (class);
-	GtkBindingSet *binding_set;
-
-	object_class->finalize = ev_view_finalize;
-	object_class->set_property = ev_view_set_property;
-	object_class->get_property = ev_view_get_property;
-
-	widget_class->expose_event = ev_view_expose_event;
-	widget_class->button_press_event = ev_view_button_press_event;
-	widget_class->motion_notify_event = ev_view_motion_notify_event;
-	widget_class->button_release_event = ev_view_button_release_event;
-	widget_class->key_press_event = ev_view_key_press_event;
-	widget_class->focus_in_event = ev_view_focus_in;
-	widget_class->focus_out_event = ev_view_focus_out;
- 	widget_class->get_accessible = ev_view_get_accessible;
-	widget_class->size_request = ev_view_size_request;
-	widget_class->size_allocate = ev_view_size_allocate;
-	widget_class->realize = ev_view_realize;
-	widget_class->scroll_event = ev_view_scroll_event;
-	widget_class->enter_notify_event = ev_view_enter_notify_event;
-	widget_class->leave_notify_event = ev_view_leave_notify_event;
-	widget_class->style_set = ev_view_style_set;
-	widget_class->drag_data_get = ev_view_drag_data_get;
-	widget_class->drag_motion = ev_view_drag_motion;
-	widget_class->popup_menu = ev_view_popup_menu;
-	widget_class->query_tooltip = ev_view_query_tooltip;
-
-	gtk_object_class->destroy = ev_view_destroy;
-
-	layout_class->set_scroll_adjustments = ev_view_set_scroll_adjustments;
-	
-	class->binding_activated = ev_view_scroll;
-
-	signals[SIGNAL_BINDING_ACTIVATED] = g_signal_new ("binding_activated",
-	  	         G_TYPE_FROM_CLASS (object_class),
-		         G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-		         G_STRUCT_OFFSET (EvViewClass, binding_activated),
-		         NULL, NULL,
-		         ev_marshal_VOID__ENUM_BOOLEAN,
-		         G_TYPE_NONE, 2,
-		         GTK_TYPE_SCROLL_TYPE,
-		         G_TYPE_BOOLEAN);
-
-	signals[SIGNAL_ZOOM_INVALID] = g_signal_new ("zoom-invalid",
-	  	         G_TYPE_FROM_CLASS (object_class),
-		         G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-		         G_STRUCT_OFFSET (EvViewClass, zoom_invalid),
-		         NULL, NULL,
-		         ev_marshal_VOID__VOID,
-		         G_TYPE_NONE, 0, G_TYPE_NONE);
-	signals[SIGNAL_HANDLE_LINK] = g_signal_new ("handle-link",
-	  	         G_TYPE_FROM_CLASS (object_class),
-		         G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-		         G_STRUCT_OFFSET (EvViewClass, handle_link),
-		         NULL, NULL,
-		         g_cclosure_marshal_VOID__OBJECT,
-		         G_TYPE_NONE, 1,
-			 G_TYPE_OBJECT);
-	signals[SIGNAL_EXTERNAL_LINK] = g_signal_new ("external-link",
-	  	         G_TYPE_FROM_CLASS (object_class),
-		         G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-		         G_STRUCT_OFFSET (EvViewClass, external_link),
-		         NULL, NULL,
-		         g_cclosure_marshal_VOID__OBJECT,
-		         G_TYPE_NONE, 1,
-			 G_TYPE_OBJECT);
-	signals[SIGNAL_POPUP_MENU] = g_signal_new ("popup",
-	  	         G_TYPE_FROM_CLASS (object_class),
-		         G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-		         G_STRUCT_OFFSET (EvViewClass, popup_menu),
-		         NULL, NULL,
-		         g_cclosure_marshal_VOID__OBJECT,
-		         G_TYPE_NONE, 1,
-			 G_TYPE_OBJECT);
-
-
-	g_object_class_install_property (object_class,
-					 PROP_CONTINUOUS,
-					 g_param_spec_boolean ("continuous",
-							       "Continuous",
-							       "Continuous scrolling mode",
-							       TRUE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class,
-					 PROP_DUAL_PAGE,
-					 g_param_spec_boolean ("dual-page",
-							       "Dual Page",
-							       "Two pages visible at once",
-							       FALSE,
-							       G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_FULLSCREEN,
-					 g_param_spec_boolean ("fullscreen",
-							       "Full Screen",
-							       "Draw page in a fullscreen fashion",
-							       FALSE,
-							       G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_PRESENTATION,
-					 g_param_spec_boolean ("presentation",
-							       "Presentation",
-							       "Draw page in presentation mode",
-							       TRUE,
-							       G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class,
-					 PROP_SIZING_MODE,
-					 g_param_spec_enum ("sizing-mode",
-							    "Sizing Mode",
-							    "Sizing Mode",
-							    EV_TYPE_SIZING_MODE,
-							    EV_SIZING_FIT_WIDTH,
-							    G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class,
-					 PROP_ZOOM,
-					 g_param_spec_double ("zoom",
-							      "Zoom factor",
-							      "Zoom factor",
-							      0,
-							      G_MAXDOUBLE,
-							      1.0,
-							      G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_ROTATION,
-					 g_param_spec_double ("rotation",
-							      "Rotation",
-							      "Rotation",
-							      0,
-							      360,
-							      0,
-							      G_PARAM_READWRITE));
-	g_object_class_install_property (object_class,
-					 PROP_HAS_SELECTION,
-					 g_param_spec_boolean ("has-selection",
-							       "Has selection",
-							       "The view has selections",
-							       FALSE,
-							       G_PARAM_READABLE));
-
-	binding_set = gtk_binding_set_by_class (class);
-
-	add_scroll_binding_keypad (binding_set, GDK_Left,  0, GTK_SCROLL_STEP_BACKWARD, TRUE);
-	add_scroll_binding_keypad (binding_set, GDK_Right, 0, GTK_SCROLL_STEP_FORWARD,  TRUE);
-	add_scroll_binding_keypad (binding_set, GDK_Left,  GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, TRUE);
-	add_scroll_binding_keypad (binding_set, GDK_Right, GDK_MOD1_MASK, GTK_SCROLL_STEP_UP,  TRUE);
-	add_scroll_binding_keypad (binding_set, GDK_Up,    0, GTK_SCROLL_STEP_BACKWARD, FALSE);
-	add_scroll_binding_keypad (binding_set, GDK_Down,  0, GTK_SCROLL_STEP_FORWARD,  FALSE);
-	add_scroll_binding_keypad (binding_set, GDK_Up,    GDK_MOD1_MASK, GTK_SCROLL_STEP_DOWN, FALSE);
-	add_scroll_binding_keypad (binding_set, GDK_Down,  GDK_MOD1_MASK, GTK_SCROLL_STEP_UP,  FALSE);
-	gtk_binding_entry_add_signal (binding_set, GDK_H, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
-				      GTK_SCROLL_STEP_BACKWARD, G_TYPE_BOOLEAN, TRUE);
-	gtk_binding_entry_add_signal (binding_set, GDK_J, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
-				      GTK_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, FALSE);
-	gtk_binding_entry_add_signal (binding_set, GDK_K, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
-				      GTK_SCROLL_STEP_BACKWARD, G_TYPE_BOOLEAN, FALSE);
-	gtk_binding_entry_add_signal (binding_set, GDK_L, 0, "binding_activated", 2, GTK_TYPE_SCROLL_TYPE,
-				      GTK_SCROLL_STEP_FORWARD, G_TYPE_BOOLEAN, TRUE);
-	
-}
-
-static void
-ev_view_init (EvView *view)
-{
-	GTK_WIDGET_SET_FLAGS (view, GTK_CAN_FOCUS);
-
-	view->spacing = 5;
-	view->scale = 1.0;
-	view->current_page = 0;
-	view->pressed_button = -1;
-	view->cursor = EV_VIEW_CURSOR_NORMAL;
-	view->drag_info.in_drag = FALSE;
-	view->scroll_info.autoscrolling = FALSE;
-	view->selection_info.selections = NULL;
-	view->selection_info.in_selection = FALSE;
-	view->selection_info.in_drag = FALSE;
-	view->selection_mode = EV_VIEW_SELECTION_TEXT;
-	view->continuous = TRUE;
-	view->dual_page = FALSE;
-	view->presentation = FALSE;
-	view->presentation_state = EV_PRESENTATION_NORMAL;
-	view->fullscreen = FALSE;
-	view->sizing_mode = EV_SIZING_FIT_WIDTH;
-	view->pending_scroll = SCROLL_TO_KEEP_POSITION;
-	view->jump_to_find_result = TRUE;
-	view->highlight_find_results = FALSE;
-
-	gtk_layout_set_hadjustment (GTK_LAYOUT (view), NULL);
-	gtk_layout_set_vadjustment (GTK_LAYOUT (view), NULL);
-}
-
-/*** Callbacks ***/
-
-static void
-ev_view_change_page (EvView *view,
-		     gint    new_page,
-		     gboolean start_transition)
-{
-	gint x, y;
-
-	view->current_page = new_page;
-	view->pending_scroll = SCROLL_TO_PAGE_POSITION;
-
-	if (view->presentation && start_transition)
-		ev_view_presentation_transition_start (view);
-
-	gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
-	ev_view_handle_cursor_over_xy (view, x, y);
-
-	gtk_widget_queue_resize (GTK_WIDGET (view));
-}
-
-static void
-ev_view_transition_animation_finish (EvTransitionAnimation *animation,
-				     EvView                *view)
-{
-	g_object_unref (view->animation);
-	view->animation = NULL;
-	ev_view_change_page (view, view->current_page, TRUE);
-}
-
-/**
- * ev_view_transition_animation_cancel:
- * @animation: Animation to finish
- * @view: An EvView
- *
- * Does almost the same as cancel, but without scheduling the transition.
- */
-
-static void
-ev_view_transition_animation_cancel (EvTransitionAnimation *animation,
-				     EvView                *view)
-{
-	g_object_unref (view->animation);
-	view->animation = NULL;
-	ev_view_change_page (view, view->current_page, FALSE);
-}
-
-static void
-ev_view_transition_animation_frame (EvTransitionAnimation *animation,
-				    gdouble                progress,
-				    EvView                *view)
-{
-	gtk_widget_queue_draw (GTK_WIDGET (view));
-}
-
-static void
-ev_view_presentation_animation_start (EvView *view,
-                                      int     new_page)
-{
-	EvTransitionEffect *effect = NULL;
-	cairo_surface_t *surface;
-
-        if (EV_IS_DOCUMENT_TRANSITION (view->document))
-		effect = ev_document_transition_get_effect (EV_DOCUMENT_TRANSITION (view->document),
-							    view->current_page);
-	if (!effect)
-		return;
-
-	surface = ev_pixbuf_cache_get_surface (view->pixbuf_cache, view->current_page);
-	view->animation = ev_transition_animation_new (effect);
-	ev_transition_animation_set_origin_surface (view->animation, surface);
-		
-	g_signal_connect (view->animation, "frame",
-			  G_CALLBACK (ev_view_transition_animation_frame), view);
-	g_signal_connect (view->animation, "finished",
-			  G_CALLBACK (ev_view_transition_animation_finish), view);
-}
-
-static void
-job_finished_cb (EvPixbufCache *pixbuf_cache,
-		 GdkRegion     *region,
-		 EvView        *view)
-{
-	if (view->animation) {
-		cairo_surface_t *surface;
-
-		surface = ev_pixbuf_cache_get_surface (pixbuf_cache, view->current_page);
-		ev_transition_animation_set_dest_surface (view->animation, surface);
-	}
-
-	if (region) {
-		gdk_window_invalidate_region (view->layout.bin_window,
-					      region, TRUE);
-	} else {
-		gtk_widget_queue_draw (GTK_WIDGET (view));
-	}
-}
-
-static void
-page_changed_cb (EvPageCache *page_cache,
-		 int          new_page,
-		 EvView      *view)
-{
-	if (view->current_page != new_page) {
-		if (view->presentation)
-			ev_view_presentation_animation_start (view, new_page);
-
-		ev_view_change_page (view, new_page, TRUE);
-	} else {
-		gtk_widget_queue_draw (GTK_WIDGET (view));
-	}
-
-	view->find_result = 0;
-}
-
-static void
-on_adjustment_value_changed (GtkAdjustment *adjustment,
-			     EvView        *view)
-{
-	int dx = 0, dy = 0;
-	gint x, y;
-	GList *children, *l;
-
-	if (! GTK_WIDGET_REALIZED (view))
-		return;
-
-	if (view->hadjustment) {
-		dx = view->scroll_x - (int) view->hadjustment->value;
-		view->scroll_x = (int) view->hadjustment->value;
-	} else {
-		view->scroll_x = 0;
-	}
-
-	if (view->vadjustment) {
-		dy = view->scroll_y - (int) view->vadjustment->value;
-		view->scroll_y = (int) view->vadjustment->value;
-	} else {
-		view->scroll_y = 0;
-	}
-
-	children = gtk_container_get_children (GTK_CONTAINER (view));
-	for (l = children; l && l->data; l = g_list_next (l)) {
-		gint       child_x, child_y;
-		GtkWidget *child = (GtkWidget *)l->data;
-		
-		gtk_container_child_get (GTK_CONTAINER (view),
-					 child,
-					 "x", &child_x,
-					 "y", &child_y,
-					 NULL);
-		gtk_layout_move (GTK_LAYOUT (view), child, child_x + dx, child_y + dy);
-	}
-	g_list_free (children);
-	
-	if (view->pending_resize)
-		gtk_widget_queue_draw (GTK_WIDGET (view));
-	else
-		gdk_window_scroll (view->layout.bin_window, dx, dy);
-		
-	gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
-	ev_view_handle_cursor_over_xy (view, x, y);
-
-	if (view->document)
-		view_update_range_and_current_page (view);
-}
-
-GtkWidget*
-ev_view_new (void)
-{
-	GtkWidget *view;
-
-	view = g_object_new (EV_TYPE_VIEW, NULL);
-
-	return view;
-}
-
-static void
-setup_caches (EvView *view)
-{
-	view->page_cache = ev_page_cache_get (view->document);
-	g_signal_connect (view->page_cache, "page-changed", G_CALLBACK (page_changed_cb), view);
-	view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), view->document);
-	g_signal_connect (view->pixbuf_cache, "job-finished", G_CALLBACK (job_finished_cb), view);
-	page_changed_cb (view->page_cache,
-			 ev_page_cache_get_current_page (view->page_cache),
-			 view);
-}
-
-static void
-clear_caches (EvView *view)
-{
-	if (view->pixbuf_cache) {
-		g_object_unref (view->pixbuf_cache);
-		view->pixbuf_cache = NULL;
-	}
-
-	if (view->page_cache) {
-		view->page_cache = NULL;
-	}
-}
-
-void
-ev_view_set_loading (EvView 	  *view,
-		     gboolean      loading)
-{
-	view->loading = loading;
-	gtk_widget_queue_draw (GTK_WIDGET (view));
-}
-
-static gboolean
-ev_view_autoscroll_cb (EvView *view)
-{
-	gdouble speed, value;
-
-	/* If the user stops autoscrolling, autoscrolling will be
-	 * set to false but the timeout will continue; stop the timeout: */
-	if (!view->scroll_info.autoscrolling) {
-		view->scroll_info.timeout_id = 0;
-		return FALSE;
-	}
-	
-	if (view->scroll_info.last_y > view->scroll_info.start_y && 
-		(view->scroll_info.last_y < view->scroll_info.start_y))
-		return TRUE; 
-
-	/* Replace 100 with your speed of choice: The lower the faster.
-	 * Replace 3 with another speed of choice: The higher, the faster it accelerated
-	 * 	based on the distance of the starting point from the mouse
-	 * (All also effected by the timeout interval of this callback) */
-
-	if (view->scroll_info.start_y > view->scroll_info.last_y)
-		speed = -pow ((((gdouble)view->scroll_info.start_y - view->scroll_info.last_y) / 100), 3);
-	else
-		speed = pow ((((gdouble)view->scroll_info.last_y - view->scroll_info.start_y) / 100), 3);
-	
-	value = gtk_adjustment_get_value (view->vadjustment);
-	value = CLAMP (value + speed, 0, view->vadjustment->upper - view->vadjustment->page_size);
-	gtk_adjustment_set_value (view->vadjustment, value);
-	
-	return TRUE;
-
-}
-
-void
-ev_view_autoscroll_start (EvView *view)
-{
-	gint x, y;
-	
-	g_return_if_fail (EV_IS_VIEW (view));
-
-	if (view->scroll_info.autoscrolling)
-		return;
-	
-	view->scroll_info.autoscrolling = TRUE;
-	view->scroll_info.timeout_id =
-		g_timeout_add (20, (GSourceFunc)ev_view_autoscroll_cb,
-			       view);
-	
-	gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
-	ev_view_handle_cursor_over_xy (view, x, y);
-}
-
-void
-ev_view_autoscroll_stop (EvView *view)
-{
-	gint x, y;
-	
-	g_return_if_fail (EV_IS_VIEW (view));
-
-	if (!view->scroll_info.autoscrolling)
-		return;
-
-	view->scroll_info.autoscrolling = FALSE;
-	if (view->scroll_info.timeout_id) {
-		g_source_remove (view->scroll_info.timeout_id);
-		view->scroll_info.timeout_id = 0;
-	}
-
-	gtk_widget_get_pointer (GTK_WIDGET (view), &x, &y);
-	ev_view_handle_cursor_over_xy (view, x, y);
-}
-
-void
-ev_view_set_document (EvView     *view,
-		      EvDocument *document)
-{
-	g_return_if_fail (EV_IS_VIEW (view));
-
-	view->loading = FALSE;
-	
-	if (document != view->document) {
-		clear_caches (view);
-
-		if (view->document) {
-			g_object_unref (view->document);
-			view->page_cache = NULL;
-                }
-
-		view->document = document;
-		view->find_result = 0;
-
-		if (view->document) {
-			g_object_ref (view->document);
-			setup_caches (view);
-                }
-
-		gtk_widget_queue_resize (GTK_WIDGET (view));
-	}
-}
-
-static void
-ev_view_reload_page (EvView    *view,
-		     gint       page,
-		     GdkRegion *region)
-{
-	ev_pixbuf_cache_reload_page (view->pixbuf_cache,
-				     region,
-				     page,
-				     view->rotation,
-				     view->scale);
-}
-
-void
-ev_view_reload (EvView *view)
-{
-	ev_pixbuf_cache_clear (view->pixbuf_cache);
-	view_update_range_and_current_page (view);
-}
-
-/*** Zoom and sizing mode ***/
-
-#define EPSILON 0.0000001
-void
-ev_view_set_zoom (EvView   *view,
-		  double    factor,
-		  gboolean  relative)
-{
-	double scale;
-
-	if (relative)
-		scale = view->scale * factor;
-	else
-		scale = factor;
-
-	scale = CLAMP (scale,
-		       view->sizing_mode == EV_SIZING_FREE ? view->min_scale : 0,
-		       view->max_scale);
-
-	if (ABS (view->scale - scale) < EPSILON)
-		return;
-
-	if (view->loading_text) {
-		cairo_surface_destroy (view->loading_text);
-		view->loading_text = NULL;
-	}
-
-	view->scale = scale;
-	view->pending_resize = TRUE;
-
-	gtk_widget_queue_resize (GTK_WIDGET (view));
-
-	g_object_notify (G_OBJECT (view), "zoom");
-}
-
-double
-ev_view_get_zoom (EvView *view)
-{
-	return view->scale;
-}
-
-void
-ev_view_set_screen_dpi (EvView  *view,
-			gdouble  dpi)
-{
-	g_return_if_fail (EV_IS_VIEW (view));
-	g_return_if_fail (dpi > 0);
-
-	view->dpi = dpi;
-	view->min_scale = MIN_SCALE * dpi / 72.0;
-	view->max_scale = MAX_SCALE * dpi / 72.0;
-}
-
-gboolean
-ev_view_get_continuous (EvView *view)
-{
-	g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
-
-	return view->continuous;
-}
-
-void
-ev_view_set_continuous (EvView   *view,
-			gboolean  continuous)
-{
-	g_return_if_fail (EV_IS_VIEW (view));
-
-	continuous = continuous != FALSE;
-
-	if (view->continuous != continuous) {
-		view->continuous = continuous;
-		view->pending_scroll = SCROLL_TO_PAGE_POSITION;
-		gtk_widget_queue_resize (GTK_WIDGET (view));
-	}
-
-	g_object_notify (G_OBJECT (view), "continuous");
-}
-
-gboolean
-ev_view_get_dual_page (EvView *view)
-{
-	g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
-
-	return view->dual_page;
-}
-
-void
-ev_view_set_dual_page (EvView   *view,
-		       gboolean  dual_page)
-{
-	g_return_if_fail (EV_IS_VIEW (view));
-
-	dual_page = dual_page != FALSE;
-
-	if (view->dual_page == dual_page)
-		return;
-
-	view->pending_scroll = SCROLL_TO_PAGE_POSITION;
-	view->dual_page = dual_page;
-	/* FIXME: if we're keeping the pixbuf cache around, we should extend the
-	 * preload_cache_size to be 2 if dual_page is set.
-	 */
-	gtk_widget_queue_resize (GTK_WIDGET (view));
-
-	g_object_notify (G_OBJECT (view), "dual-page");
-}
-
-void
-ev_view_set_fullscreen (EvView   *view,
-			 gboolean  fullscreen)
-{
-	g_return_if_fail (EV_IS_VIEW (view));
-
-	fullscreen = fullscreen != FALSE;
-
-	if (view->fullscreen == fullscreen) 
-		return;
-		
-	view->fullscreen = fullscreen;
-	gtk_widget_queue_resize (GTK_WIDGET (view));
-	
-	g_object_notify (G_OBJECT (view), "fullscreen");
-}
-
-gboolean
-ev_view_get_fullscreen (EvView *view)
-{
-	g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
-
-	return view->fullscreen;
-}
-
-void
-ev_view_set_presentation (EvView   *view,
-			  gboolean  presentation)
-{
-	g_return_if_fail (EV_IS_VIEW (view));
-
-	presentation = presentation != FALSE;
-
-	if (view->presentation == presentation)
-		return;
-
-	if (!presentation)
-		view->presentation_state = EV_PRESENTATION_NORMAL;
-	
-	view->presentation = presentation;
-	view->pending_scroll = SCROLL_TO_PAGE_POSITION;
-	
-	if (presentation) {
-		view->sizing_mode_saved = view->sizing_mode;
-		view->scale_saved = view->scale;
-		ev_view_set_sizing_mode (view, EV_SIZING_BEST_FIT);
-	} else {
-		ev_view_set_sizing_mode (view, view->sizing_mode_saved);
-		ev_view_set_zoom (view, view->scale_saved, FALSE);
-	}
-	
-	gtk_widget_queue_resize (GTK_WIDGET (view));
-
-	if (presentation)
-		ev_view_presentation_transition_start (view);
-	else {
-		ev_view_presentation_transition_stop (view);
-
-		if (view->animation) {
-			/* stop any running animation */
-			ev_view_transition_animation_cancel (view->animation, view);
-		}
-	}
-
-	if (GTK_WIDGET_REALIZED (view)) {
-		if (view->presentation)
-			gdk_window_set_background (view->layout.bin_window,
-						   &GTK_WIDGET (view)->style->black);
-		else
-			gdk_window_set_background (view->layout.bin_window,
-						   &GTK_WIDGET (view)->style->mid [GTK_STATE_NORMAL]);
-	}
-
-	g_object_notify (G_OBJECT (view), "presentation");
-}
-
-gboolean
-ev_view_get_presentation (EvView *view)
-{
-	g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
-
-	return view->presentation;
-}
-
-static gboolean
-transition_next_page (EvView *view)
-{
-	ev_view_next_page (view);
-
-	return FALSE;
-}
-
-static void
-ev_view_presentation_transition_stop (EvView *view)
-{
-	if (view->trans_timeout_id > 0)
-		g_source_remove (view->trans_timeout_id);
-	view->trans_timeout_id = 0;
-}
-
-static void
-ev_view_presentation_transition_start (EvView *view)
-{
-	gdouble duration;
-	
-	if (!EV_IS_DOCUMENT_TRANSITION (view->document))
-		return;
-
-	ev_view_presentation_transition_stop (view);
-
-	duration = ev_document_transition_get_page_duration (EV_DOCUMENT_TRANSITION (view->document),
-							     view->current_page);
-	if (duration > 0) {
-		view->trans_timeout_id =
-			g_timeout_add_seconds (duration,
-					       (GSourceFunc) transition_next_page,
-					       view);
-	}
-}
-
-void
-ev_view_set_sizing_mode (EvView       *view,
-			 EvSizingMode  sizing_mode)
-{
-	g_return_if_fail (EV_IS_VIEW (view));
-
-	if (view->sizing_mode == sizing_mode)
-		return;
-
-	view->sizing_mode = sizing_mode;
-	gtk_widget_queue_resize (GTK_WIDGET (view));
-
-	g_object_notify (G_OBJECT (view), "sizing-mode");
-}
-
-EvSizingMode
-ev_view_get_sizing_mode (EvView *view)
-{
-	g_return_val_if_fail (EV_IS_VIEW (view), EV_SIZING_FREE);
-
-	return view->sizing_mode;
-}
-
-gboolean
-ev_view_can_zoom_in (EvView *view)
-{
-	return view->scale * ZOOM_IN_FACTOR <= view->max_scale;
-}
-
-gboolean
-ev_view_can_zoom_out (EvView *view)
-{
-	return view->scale * ZOOM_OUT_FACTOR >= view->min_scale;
-}
-
-void
-ev_view_zoom_in (EvView *view)
-{
-	g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
-
-	if (view->presentation)
-		return;
-	
-	view->pending_scroll = SCROLL_TO_CENTER;
-	ev_view_set_zoom (view, ZOOM_IN_FACTOR, TRUE);
-}
-
-void
-ev_view_zoom_out (EvView *view)
-{
-	g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
-
-	if (view->presentation)
-		return;
-	
-	view->pending_scroll = SCROLL_TO_CENTER;
-	ev_view_set_zoom (view, ZOOM_OUT_FACTOR, TRUE);
-}
-
-void
-ev_view_rotate_right (EvView *view)
-{
-	int rotation = view->rotation + 90;
-
-	if (rotation >= 360) {
-		rotation -= 360;
-	}
-
-	ev_view_set_rotation (view, rotation);
-}
-
-void
-ev_view_rotate_left (EvView *view)
-{
-	int rotation = view->rotation - 90;
-
-	if (rotation < 0) {
-		rotation += 360;
-	}
-
-	ev_view_set_rotation (view, rotation);
-}
-
-void
-ev_view_set_rotation (EvView *view, int rotation)
-{
-	view->rotation = rotation;
-
-	if (view->pixbuf_cache) {
-		ev_pixbuf_cache_clear (view->pixbuf_cache);
-		gtk_widget_queue_resize (GTK_WIDGET (view));
-	}
-
-	if (rotation != 0)
-		clear_selection (view);
-
-	g_object_notify (G_OBJECT (view), "rotation");
-}
-
-int
-ev_view_get_rotation (EvView *view)
-{
-	return view->rotation;
-}
-
-static double
-zoom_for_size_fit_width (int doc_width,
-			 int doc_height,
-			 int target_width,
-			 int target_height,
-			 int vsb_width)
-{
-	double scale;
-
-	scale = (double)target_width / doc_width;
-
-	if (doc_height * scale > target_height)
-		scale = (double) (target_width - vsb_width) / doc_width;
-
-	return scale;
-}
-
-static double
-zoom_for_size_fit_height (int doc_width,
-			  int doc_height,
-			  int target_width,
-			  int target_height,
-			  int vsb_height)
-{
-	double scale;
-
-	scale = (double)target_height / doc_height;
-
-	if (doc_width * scale > target_width)
-		scale = (double) (target_height - vsb_height) / doc_height;
-
-	return scale;
-}
-
-static double
-zoom_for_size_best_fit (int doc_width,
-			int doc_height,
-			int target_width,
-			int target_height,
-			int vsb_width,
-			int hsb_width)
-{
-	double w_scale;
-	double h_scale;
-
-	w_scale = (double)target_width / doc_width;
-	h_scale = (double)target_height / doc_height;
-
-	if (doc_height * w_scale > target_height)
-		w_scale = (double) (target_width - vsb_width) / doc_width;
-	if (doc_width * h_scale > target_width)
-		h_scale = (double) (target_height - hsb_width) / doc_height;
-
-	return MIN (w_scale, h_scale);
-}
-
-
-static void
-ev_view_zoom_for_size_presentation (EvView *view,
-				    int     width,
-				    int     height)
-{
-	int doc_width, doc_height;
-	gdouble scale;
-
-	ev_page_cache_get_size (view->page_cache,
-				view->current_page,
-				view->rotation,
-				1.0,
-				&doc_width,
-				&doc_height);
-	scale = zoom_for_size_best_fit (doc_width, doc_height, width, height, 0, 0);
-	ev_view_set_zoom (view, scale, FALSE);
-}
-
-static void
-ev_view_zoom_for_size_continuous_and_dual_page (EvView *view,
-			   int     width,
-			   int     height,
-			   int     vsb_width,
-			   int     hsb_height)
-{
-	int doc_width, doc_height;
-	GtkBorder border;
-	gdouble scale;
-
-	ev_page_cache_get_max_width (view->page_cache,
-				     view->rotation,
-				     1.0,
-				     &doc_width);
-	ev_page_cache_get_max_height (view->page_cache,
-				      view->rotation,
-				      1.0,
-				      &doc_height);
-	compute_border (view, doc_width, doc_height, &border);
-
-	doc_width = doc_width * 2;
-	width -= (2 * (border.left + border.right) + 3 * view->spacing);
-	height -= (border.top + border.bottom + 2 * view->spacing - 1);
-
-	/* FIXME: We really need to calculate the overall height here, not the
-	 * page height.  We assume there's always a vertical scrollbar for
-	 * now.  We need to fix this. */
-	if (view->sizing_mode == EV_SIZING_FIT_WIDTH)
-		scale = zoom_for_size_fit_width (doc_width, doc_height, width - vsb_width, height, 0);
-	else if (view->sizing_mode == EV_SIZING_BEST_FIT)
-		scale = zoom_for_size_best_fit (doc_width, doc_height, width - vsb_width, height, 0, hsb_height);
-	else
-		g_assert_not_reached ();
-
-	ev_view_set_zoom (view, scale, FALSE);
-}
-
-static void
-ev_view_zoom_for_size_continuous (EvView *view,
-				  int     width,
-				  int     height,
-				  int     vsb_width,
-				  int     hsb_height)
-{
-	int doc_width, doc_height;
-	GtkBorder border;
-	gdouble scale;
-
-	ev_page_cache_get_max_width (view->page_cache,
-				     view->rotation,
-				     1.0,
-				     &doc_width);
-	ev_page_cache_get_max_height (view->page_cache,
-				      view->rotation,
-				      1.0,
-				      &doc_height);
-	compute_border (view, doc_width, doc_height, &border);
-
-	width -= (border.left + border.right + 2 * view->spacing);
-	height -= (border.top + border.bottom + 2 * view->spacing - 1);
-
-	/* FIXME: We really need to calculate the overall height here, not the
-	 * page height.  We assume there's always a vertical scrollbar for
-	 * now.  We need to fix this. */
-	if (view->sizing_mode == EV_SIZING_FIT_WIDTH)
-		scale = zoom_for_size_fit_width (doc_width, doc_height, width - vsb_width, height, 0);
-	else if (view->sizing_mode == EV_SIZING_BEST_FIT)
-		scale = zoom_for_size_best_fit (doc_width, doc_height, width - vsb_width, height, 0, hsb_height);
-	else
-		g_assert_not_reached ();
-
-	ev_view_set_zoom (view, scale, FALSE);
-}
-
-static void
-ev_view_zoom_for_size_dual_page (EvView *view,
-				 int     width,
-				 int     height,
-				 int     vsb_width,
-				 int     hsb_height)
-{
-	GtkBorder border;
-	gint doc_width, doc_height;
-	gdouble scale;
-	gint other_page;
-
-	other_page = view->current_page ^ 1;
-
-	/* Find the largest of the two. */
-	ev_page_cache_get_size (view->page_cache,
-				view->current_page,
-				view->rotation,
-				1.0,
-				&doc_width, &doc_height);
-
-	if (other_page < ev_page_cache_get_n_pages (view->page_cache)) {
-		gint width_2, height_2;
-		ev_page_cache_get_size (view->page_cache,
-					other_page,
-					view->rotation,
-					1.0,
-					&width_2, &height_2);
-		if (width_2 > doc_width)
-			doc_width = width_2;
-		if (height_2 > doc_height)
-			doc_height = height_2;
-	}
-	compute_border (view, doc_width, doc_height, &border);
-
-	doc_width = doc_width * 2;
-	width -= ((border.left + border.right)* 2 + 3 * view->spacing);
-	height -= (border.top + border.bottom + 2 * view->spacing);
-
-	if (view->sizing_mode == EV_SIZING_FIT_WIDTH)
-		scale = zoom_for_size_fit_width (doc_width, doc_height, width, height, vsb_width);
-	else if (view->sizing_mode == EV_SIZING_BEST_FIT)
-		scale = zoom_for_size_best_fit (doc_width, doc_height, width, height, vsb_width, hsb_height);
-	else
-		g_assert_not_reached ();
-
-	ev_view_set_zoom (view, scale, FALSE);
-}
-
-static void
-ev_view_zoom_for_size_single_page (EvView *view,
-				   int     width,
-				   int     height,
-				   int     vsb_width,
-				   int     hsb_height)
-{
-	int doc_width, doc_height;
-	GtkBorder border;
-	gdouble scale;
-
-	ev_page_cache_get_size (view->page_cache,
-				view->current_page,
-				view->rotation,
-				1.0,
-				&doc_width,
-				&doc_height);
-	/* Get an approximate border */
-	compute_border (view, width, height, &border);
-
-	width -= (border.left + border.right + 2 * view->spacing);
-	height -= (border.top + border.bottom + 2 * view->spacing);
-
-	if (view->sizing_mode == EV_SIZING_FIT_WIDTH)
-		scale = zoom_for_size_fit_width (doc_width, doc_height, width, height, vsb_width);
-	else if (view->sizing_mode == EV_SIZING_BEST_FIT)
-		scale = zoom_for_size_best_fit (doc_width, doc_height, width, height, vsb_width, hsb_height);
-	else
-		g_assert_not_reached ();
-
-	ev_view_set_zoom (view, scale, FALSE);
-}
-
-void
-ev_view_set_zoom_for_size (EvView *view,
-			   int     width,
-			   int     height,
-			   int     vsb_width,
-			   int     hsb_height)
-{
-	g_return_if_fail (EV_IS_VIEW (view));
-	g_return_if_fail (view->sizing_mode == EV_SIZING_FIT_WIDTH ||
-			  view->sizing_mode == EV_SIZING_BEST_FIT);
-	g_return_if_fail (width >= 0);
-	g_return_if_fail (height >= 0);
-
-	if (view->document == NULL)
-		return;
-
-	if (view->presentation)
-		ev_view_zoom_for_size_presentation (view, width, height);
-	else if (view->continuous && view->dual_page)
-		ev_view_zoom_for_size_continuous_and_dual_page (view, width, height, vsb_width, hsb_height);
-	else if (view->continuous)
-		ev_view_zoom_for_size_continuous (view, width, height, vsb_width, hsb_height);
-	else if (view->dual_page)
-		ev_view_zoom_for_size_dual_page (view, width, height, vsb_width, hsb_height);
-	else
-		ev_view_zoom_for_size_single_page (view, width, height, vsb_width, hsb_height);
-}
-
-/*** Find ***/
-static gint
-ev_view_find_get_n_results (EvView *view, gint page)
-{
-	return view->find_pages ? g_list_length (view->find_pages[page]) : 0;
-}
-
-static EvRectangle *
-ev_view_find_get_result (EvView *view, gint page, gint result)
-{
-	return view->find_pages ? (EvRectangle *) g_list_nth_data (view->find_pages[page], result) : NULL;
-}
-
-static void
-jump_to_find_result (EvView *view)
-{
-	gint n_results;
-	gint page = view->current_page;
-
-	n_results = ev_view_find_get_n_results (view, page);
-
-	if (n_results > 0 && view->find_result < n_results) {
-		EvRectangle *rect;
-		GdkRectangle view_rect;
-
-		rect = ev_view_find_get_result (view, page, view->find_result);
-		doc_rect_to_view_rect (view, page, rect, &view_rect);
-		ensure_rectangle_is_visible (view, &view_rect);
-		view->jump_to_find_result = FALSE;
-	}
-}
-
-/**
- * jump_to_find_page
- * @view: #EvView instance
- * @direction: Direction to look
- * @shift: Shift from current page
- *
- * Jumps to the first page that has occurences of searched word.
- * Uses a direction where to look and a shift from current page. 
- *
- */
-static void
-jump_to_find_page (EvView *view, EvViewFindDirection direction, gint shift)
-{
-	int n_pages, i;
-
-	n_pages = ev_page_cache_get_n_pages (view->page_cache);
-
-	for (i = 0; i < n_pages; i++) {
-		int page;
-		
-		if (direction == EV_VIEW_FIND_NEXT)
-			page = view->current_page + i;
-		else
-			page = view->current_page - i;		
-		page += shift;
-		
-		if (page >= n_pages) {
-			page = page - n_pages;
-		} else if (page < 0) 
-			page = page + n_pages;
-
-		if (ev_view_find_get_n_results (view, page) > 0) {
-			ev_page_cache_set_current_page (view->page_cache, page);
-			break;
-		}
-	}
-}
-
-void
-ev_view_find_changed (EvView *view, GList **results, gint page)
-{
-	view->find_pages = results;
-	
-	if (view->jump_to_find_result == TRUE) {
-		jump_to_find_page (view, EV_VIEW_FIND_NEXT, 0);
-		jump_to_find_result (view);
-	}
-
-	if (view->current_page == page)
-		gtk_widget_queue_draw (GTK_WIDGET (view));
-}
-
-void
-ev_view_find_next (EvView *view)
-{
-	gint n_results;
-
-	n_results = ev_view_find_get_n_results (view, view->current_page);
-	view->find_result++;
-
-	if (view->find_result >= n_results) {
-		view->find_result = 0;
-		jump_to_find_page (view, EV_VIEW_FIND_NEXT, 1);
-		jump_to_find_result (view);
-	} else {
-		jump_to_find_result (view);
-		gtk_widget_queue_draw (GTK_WIDGET (view));
-	}
-}
-
-void
-ev_view_find_previous (EvView *view)
-{
-	view->find_result--;
-
-	if (view->find_result < 0) {
-		jump_to_find_page (view, EV_VIEW_FIND_PREV, -1);
-		view->find_result = MAX (0, ev_view_find_get_n_results (view, view->current_page) - 1);
-		jump_to_find_result (view);
-	} else {
-		jump_to_find_result (view);
-		gtk_widget_queue_draw (GTK_WIDGET (view));
-	}
-}
-
-void
-ev_view_find_search_changed (EvView *view)
-{
-	/* search string has changed, focus on new search result */
-	view->jump_to_find_result = TRUE;
-	view->find_pages = NULL;
-}
-
-void
-ev_view_find_set_highlight_search (EvView *view, gboolean value)
-{
-	view->highlight_find_results = value;
-	gtk_widget_queue_draw (GTK_WIDGET (view));
-}
-
-void
-ev_view_find_cancel (EvView *view)
-{
-	view->find_pages = NULL;
-}
-
-/*** Selections ***/
-
-/* compute_new_selection_rect/text calculates the area currently selected by
- * view_rect.  each handles a different mode;
- */
-static GList *
-compute_new_selection_rect (EvView       *view,
-			    GdkPoint     *start,
-			    GdkPoint     *stop)
-{
-	GdkRectangle view_rect;
-	int n_pages, i;
-	GList *list = NULL;
-
-	g_assert (view->selection_mode == EV_VIEW_SELECTION_RECTANGLE);
-	
-	view_rect.x = MIN (start->x, stop->x);
-	view_rect.y = MIN (start->y, stop->y);
-	view_rect.width = MAX (start->x, stop->x) - view_rect.x;
-	view_rect.width = MAX (start->y, stop->y) - view_rect.y;
-
-	n_pages = ev_page_cache_get_n_pages (view->page_cache);
-
-	for (i = 0; i < n_pages; i++) {
-		GdkRectangle page_area;
-		GtkBorder border;
-		
-		if (get_page_extents (view, i, &page_area, &border)) {
-			GdkRectangle overlap;
-
-			if (gdk_rectangle_intersect (&page_area, &view_rect, &overlap)) {
-				EvViewSelection *selection;
-
-				selection = g_new0 (EvViewSelection, 1);
-				selection->page = i;
-				view_rect_to_doc_rect (view, &overlap, &page_area,
-						       &(selection->rect));
-
-				list = g_list_append (list, selection);
-			}
-		}
-	}
-
-	return list;
-}
-
-static gboolean
-gdk_rectangle_point_in (GdkRectangle *rectangle,
-			GdkPoint     *point)
-{
-	return rectangle->x <= point->x &&
-		rectangle->y <= point->y &&
-		point->x < rectangle->x + rectangle->width &&
-		point->y < rectangle->y + rectangle->height;
-}
-
-static GList *
-compute_new_selection_text (EvView          *view,
-			    EvSelectionStyle style,
-			    GdkPoint        *start,
-			    GdkPoint        *stop)
-{
-	int n_pages, i, first, last;
-	GList *list = NULL;
-	EvViewSelection *selection;
-	gint width, height;
-	int start_page, end_page;
-
-	g_assert (view->selection_mode == EV_VIEW_SELECTION_TEXT);
-
-	n_pages = ev_page_cache_get_n_pages (view->page_cache);
-
-	/* First figure out the range of pages the selection
-	 * affects. */
-	first = n_pages;
-	last = 0;
-	if (view->continuous) {
-		start_page = 0;
-		end_page = n_pages;
-	} else if (view->dual_page) {
-		start_page = view->start_page;
-		end_page = view->end_page + 1;
-	} else {
-		start_page = view->current_page;
-		end_page = view->current_page + 1;
-	}
-
-	for (i = start_page; i < end_page; i++) {
-		GdkRectangle page_area;
-		GtkBorder border;
-		
-		get_page_extents (view, i, &page_area, &border);
-		if (gdk_rectangle_point_in (&page_area, start) || 
-		    gdk_rectangle_point_in (&page_area, stop)) {
-			if (first == n_pages)
-				first = i;
-			last = i;
-		}
-
-	}
-
-	/* Now create a list of EvViewSelection's for the affected
-	 * pages.  This could be an empty list, a list of just one
-	 * page or a number of pages.*/
-	for (i = first; i < last + 1; i++) {
-		GdkRectangle page_area;
-		GtkBorder border;
-		GdkPoint *point;
-
-		ev_page_cache_get_size (view->page_cache, i,
-					view->rotation,
-					1.0, &width, &height);
-
-		selection = g_new0 (EvViewSelection, 1);
-		selection->page = i;
-		selection->style = style;
-		selection->rect.x1 = selection->rect.y1 = 0;
-		selection->rect.x2 = width;
-		selection->rect.y2 = height;
-
-		get_page_extents (view, i, &page_area, &border);
-
-		if (gdk_rectangle_point_in (&page_area, start))
-			point = start;
-		else
-			point = stop;
-
-		if (i == first)
-			view_point_to_doc_point (view, point, &page_area,
-						 &selection->rect.x1,
-						 &selection->rect.y1);
-
-		/* If the selection is contained within just one page,
-		 * make sure we don't write 'start' into both points
-		 * in selection->rect. */
-		if (first == last)
-			point = stop;
-
-		if (i == last)
-			view_point_to_doc_point (view, point, &page_area,
-						 &selection->rect.x2,
-						 &selection->rect.y2);
-
-		list = g_list_append (list, selection);
-	}
-
-	return list;
-}
-
-/* This function takes the newly calculated list, and figures out which regions
- * have changed.  It then queues a redraw approporiately.
- */
-static void
-merge_selection_region (EvView *view,
-			GList  *new_list)
-{
-	GList *old_list;
-	GList *new_list_ptr, *old_list_ptr;
-
-	/* Update the selection */
-	old_list = ev_pixbuf_cache_get_selection_list (view->pixbuf_cache);
-	g_list_foreach (view->selection_info.selections, (GFunc)selection_free, NULL);
-	g_list_free (view->selection_info.selections);
-	view->selection_info.selections = new_list;
-	ev_pixbuf_cache_set_selection_list (view->pixbuf_cache, new_list);
-	g_object_notify (G_OBJECT (view), "has-selection");
-
-	new_list_ptr = new_list;
-	old_list_ptr = old_list;
-
-	while (new_list_ptr || old_list_ptr) {
-		EvViewSelection *old_sel, *new_sel;
-		int cur_page;
-		GdkRegion *region = NULL;
-
-		new_sel = (new_list_ptr) ? (new_list_ptr->data) : NULL;
-		old_sel = (old_list_ptr) ? (old_list_ptr->data) : NULL;
-
-		/* Assume that the lists are in order, and we run through them
-		 * comparing them, one page at a time.  We come out with the
-		 * first page we see. */
-		if (new_sel && old_sel) {
-			if (new_sel->page < old_sel->page) {
-				new_list_ptr = new_list_ptr->next;
-				old_sel = NULL;
-			} else if (new_sel->page > old_sel->page) {
-				old_list_ptr = old_list_ptr->next;
-				new_sel = NULL;
-			} else {
-				new_list_ptr = new_list_ptr->next;
-				old_list_ptr = old_list_ptr->next;
-			}
-		} else if (new_sel) {
-			new_list_ptr = new_list_ptr->next;
-		} else if (old_sel) {
-			old_list_ptr = old_list_ptr->next;
-		}
-
-		g_assert (new_sel || old_sel);
-
-		/* is the page we're looking at on the screen?*/
-		cur_page = new_sel ? new_sel->page : old_sel->page;
-		if (cur_page < view->start_page || cur_page > view->end_page)
-			continue;
-
-		/* seed the cache with a new page.  We are going to need the new
-		 * region too. */
-		if (new_sel) {
-			GdkRegion *tmp_region = NULL;
-
-			ev_pixbuf_cache_get_selection_surface (view->pixbuf_cache,
-							       cur_page,
-							       view->scale,
-							       &tmp_region);
-
-			if (tmp_region) {
-				new_sel->covered_region = gdk_region_copy (tmp_region);
-			}
-		}
-
-		/* Now we figure out what needs redrawing */
-		if (old_sel && new_sel) {
-			if (old_sel->covered_region && new_sel->covered_region) {
-				/* We only want to redraw the areas that have
-				 * changed, so we xor the old and new regions
-				 * and redraw if it's different */
-				region = gdk_region_copy (old_sel->covered_region);
-				gdk_region_xor (region, new_sel->covered_region);
-				if (gdk_region_empty (region)) {
-					gdk_region_destroy (region);
-					region = NULL;
-				}
-			} else if (old_sel->covered_region) {
-				region = gdk_region_copy (old_sel->covered_region);
-			} else if (new_sel->covered_region) {
-				region = gdk_region_copy (new_sel->covered_region);
-			}
-		} else if (old_sel && !new_sel) {
-			if (old_sel->covered_region && !gdk_region_empty (old_sel->covered_region)) {
-				region = gdk_region_copy (old_sel->covered_region);
-			}
-		} else if (!old_sel && new_sel) {
-			if (new_sel->covered_region && !gdk_region_empty (new_sel->covered_region)) {
-				region = gdk_region_copy (new_sel->covered_region);
-			}
-		} else {
-			g_assert_not_reached ();
-		}
-
-		/* Redraw the damaged region! */
-		if (region) {
-			GdkRectangle page_area;
-			GtkBorder border;
-
-			/* I don't know why but the region is smaller
-			 * than expected. This hack fixes it, I guess
-			 * 10 pixels more won't hurt
-			 */
-			gdk_region_shrink (region, -5, -5);
-
-			get_page_extents (view, cur_page, &page_area, &border);
-			gdk_region_offset (region,
-					   page_area.x + border.left - view->scroll_x,
-					   page_area.y + border.top - view->scroll_y);
-			gdk_window_invalidate_region (view->layout.bin_window, region, TRUE);
-			gdk_region_destroy (region);
-		}
-	}
-
-	/* Free the old list, now that we're done with it. */
-	g_list_foreach (old_list, (GFunc) selection_free, NULL);
-	g_list_free (old_list);
-}
-
-static void
-compute_selections (EvView          *view,
-		    EvSelectionStyle style,
-		    GdkPoint        *start,
-		    GdkPoint        *stop)
-{
-	GList *list;
-
-	if (view->selection_mode == EV_VIEW_SELECTION_RECTANGLE)
-		list = compute_new_selection_rect (view, start, stop);
-	else
-		list = compute_new_selection_text (view, style, start, stop);
-	merge_selection_region (view, list);
-}
-
-/* Free's the selection.  It's up to the caller to queue redraws if needed.
- */
-static void
-selection_free (EvViewSelection *selection)
-{
-	if (selection->covered_region)
-		gdk_region_destroy (selection->covered_region);
-	g_free (selection);
-}
-
-static void
-clear_selection (EvView *view)
-{
-	g_list_foreach (view->selection_info.selections, (GFunc)selection_free, NULL);
-	g_list_free (view->selection_info.selections);
-	view->selection_info.selections = NULL;
-	view->selection_info.in_selection = FALSE;
-	if (view->pixbuf_cache)
-		ev_pixbuf_cache_set_selection_list (view->pixbuf_cache, NULL);
-	g_object_notify (G_OBJECT (view), "has-selection");
-}
-
-void
-ev_view_select_all (EvView *view)
-{
-	GList *selections = NULL;
-	int n_pages, i;
-
-	/* Disable selection on rotated pages for the 0.4.0 series */
-	if (view->rotation != 0)
-		return;
-
-	clear_selection (view);
-	
-	n_pages = ev_page_cache_get_n_pages (view->page_cache);
-	for (i = 0; i < n_pages; i++) {
-		int width, height;
-		EvViewSelection *selection;
-
-		ev_page_cache_get_size (view->page_cache,
-					i,
-					view->rotation,
-					1.0, &width, &height);
-
-		selection = g_new0 (EvViewSelection, 1);
-		selection->page = i;
-		selection->style = EV_SELECTION_STYLE_GLYPH;
-		selection->rect.x1 = selection->rect.y1 = 0;
-		selection->rect.x2 = width;
-		selection->rect.y2 = height;
-
-		selections = g_list_append (selections, selection);
-	}
-
-	merge_selection_region (view, selections);
-	gtk_widget_queue_draw (GTK_WIDGET (view));
-}
-
-gboolean
-ev_view_get_has_selection (EvView *view)
-{
-	return view->selection_info.selections != NULL;
-}
-
-static char *
-get_selected_text (EvView *view)
-{
-	GString *text;
-	GList *l;
-	gchar *normalized_text;
-	EvRenderContext *rc;
-
-	text = g_string_new (NULL);
-	rc = ev_render_context_new (NULL, view->rotation, view->scale);
-
-	ev_document_doc_mutex_lock ();
-
-	for (l = view->selection_info.selections; l != NULL; l = l->next) {
-		EvViewSelection *selection = (EvViewSelection *)l->data;
-		EvPage *page;
-		gchar *tmp;
-
-		page = ev_document_get_page (view->document, selection->page);
-		ev_render_context_set_page (rc, page);
-		g_object_unref (page);
-		
-		tmp = ev_selection_get_selected_text (EV_SELECTION (view->document),
-						      rc, selection->style,
-						      &(selection->rect));
-
-		g_string_append (text, tmp);
-		g_free (tmp);
-	}
-
-	g_object_unref (rc);
-	
-	ev_document_doc_mutex_unlock ();
-	
-	normalized_text = g_utf8_normalize (text->str, text->len, G_NORMALIZE_NFKC);
-	g_string_free (text, TRUE);
-	return normalized_text;
-}
-
-static void
-ev_view_clipboard_copy (EvView      *view,
-			const gchar *text)
-{
-	GtkClipboard *clipboard;
-
-	clipboard = gtk_widget_get_clipboard (GTK_WIDGET (view),
-					      GDK_SELECTION_CLIPBOARD);
-	gtk_clipboard_set_text (clipboard, text, -1);
-}
-
-void
-ev_view_copy (EvView *ev_view)
-{
-	char *text;
-
-	if (!EV_IS_SELECTION (ev_view->document))
-		return;
-
-	text = get_selected_text (ev_view);
-	ev_view_clipboard_copy (ev_view, text);
-	g_free (text);
-}
-
-static void
-ev_view_primary_get_cb (GtkClipboard     *clipboard,
-			GtkSelectionData *selection_data,
-			guint             info,
-			gpointer          data)
-{
-	EvView *ev_view = EV_VIEW (data);
-
-	if (ev_view->link_selected) {
-		gtk_selection_data_set_text (selection_data,
-					     ev_link_action_get_uri (ev_view->link_selected),
-					     -1);
-	} else if (EV_IS_SELECTION (ev_view->document) &&
-		   ev_view->selection_info.selections) {
-		gchar *text;
-		
-		text = get_selected_text (ev_view);
-		if (text) {
-			gtk_selection_data_set_text (selection_data, text, -1);
-			g_free (text);
-		}
-	}
-}
-
-static void
-ev_view_primary_clear_cb (GtkClipboard *clipboard,
-			  gpointer      data)
-{
-	EvView *view = EV_VIEW (data);
-
-	clear_selection (view);
-	clear_link_selected (view);
-}
-
-static void
-ev_view_update_primary_selection (EvView *ev_view)
-{
-	GtkClipboard *clipboard;
-
-	clipboard = gtk_widget_get_clipboard (GTK_WIDGET (ev_view),
-                                              GDK_SELECTION_PRIMARY);
-
-	if (ev_view->selection_info.selections || ev_view->link_selected) {
-		if (!gtk_clipboard_set_with_owner (clipboard,
-						   clipboard_targets,
-						   G_N_ELEMENTS (clipboard_targets),
-						   ev_view_primary_get_cb,
-						   ev_view_primary_clear_cb,
-						   G_OBJECT (ev_view)))
-			ev_view_primary_clear_cb (clipboard, ev_view);
-	} else {
-		if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (ev_view))
-			gtk_clipboard_clear (clipboard);
-	}
-}
-
-static void
-clear_link_selected (EvView *view)
-{
-	if (view->link_selected) {
-		g_object_unref (view->link_selected);
-		view->link_selected = NULL;
-	}
-}
-
-void
-ev_view_copy_link_address (EvView       *view,
-			   EvLinkAction *action)
-{
-	clear_link_selected (view);
-	
-	ev_view_clipboard_copy (view, ev_link_action_get_uri (action));
-	
-	view->link_selected = g_object_ref (action);
-	ev_view_update_primary_selection (view);
-}
-
-/*** Cursor operations ***/
-
-static GdkCursor *
-ev_view_create_invisible_cursor(void)
-{
-       GdkBitmap *empty;
-       GdkColor black = { 0, 0, 0, 0 };
-       static char bits[] = { 0x00 };
-
-       empty = gdk_bitmap_create_from_data (NULL, bits, 1, 1);
-
-       return gdk_cursor_new_from_pixmap (empty, empty, &black, &black, 0, 0);
-}
-
-static void
-ev_view_set_cursor (EvView *view, EvViewCursor new_cursor)
-{
-	GdkCursor *cursor = NULL;
-	GdkDisplay *display;
-	GtkWidget *widget;
-
-	if (view->cursor == new_cursor) {
-		return;
-	}
-
-	widget = gtk_widget_get_toplevel (GTK_WIDGET (view));
-	display = gtk_widget_get_display (widget);
-	view->cursor = new_cursor;
-
-	switch (new_cursor) {
-		case EV_VIEW_CURSOR_NORMAL:
-			gdk_window_set_cursor (view->layout.bin_window, NULL);
-			break;
-		case EV_VIEW_CURSOR_IBEAM:
-			cursor = gdk_cursor_new_for_display (display, GDK_XTERM);
-			break;
-		case EV_VIEW_CURSOR_LINK:
-			cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
-			break;
-		case EV_VIEW_CURSOR_WAIT:
-			cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
-			break;
-                case EV_VIEW_CURSOR_HIDDEN:
-                        cursor = ev_view_create_invisible_cursor ();
-                        break;
-		case EV_VIEW_CURSOR_DRAG:
-			cursor = gdk_cursor_new_for_display (display, GDK_FLEUR);
-			break;
-		case EV_VIEW_CURSOR_AUTOSCROLL:
-			cursor = gdk_cursor_new_for_display (display, GDK_DOUBLE_ARROW);
-			break;
-	}
-
-	if (cursor) {
-		gdk_window_set_cursor (view->layout.bin_window, cursor);
-		gdk_cursor_unref (cursor);
-		gdk_flush();
-	}
-}
-
-void
-ev_view_hide_cursor (EvView *view)
-{
-       ev_view_set_cursor (view, EV_VIEW_CURSOR_HIDDEN);
-}
-
-void
-ev_view_show_cursor (EvView *view)
-{
-       ev_view_set_cursor (view, EV_VIEW_CURSOR_NORMAL);
-}
-
-static void
-ev_view_reset_presentation_state (EvView *view)
-{
-	if (!view->presentation ||
-	    view->presentation_state == EV_PRESENTATION_NORMAL)
-		return;
-
-	view->presentation_state = EV_PRESENTATION_NORMAL;
-	gdk_window_set_background (view->layout.bin_window,
-				   &GTK_WIDGET (view)->style->black);
-	gtk_widget_queue_draw (GTK_WIDGET (view));
-}
-
-gboolean
-ev_view_next_page (EvView *view)
-{
-	int page, n_pages;
-
-	g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
-	
-	if (!view->page_cache)
-		return FALSE;
-
-	if (view->presentation &&
-	    (view->presentation_state == EV_PRESENTATION_BLACK ||
-	     view->presentation_state == EV_PRESENTATION_WHITE)) {
-		ev_view_reset_presentation_state (view);
-		return FALSE; 
-	}
-
-	if (view->animation) {
-		ev_view_transition_animation_cancel (view->animation, view);
-	}
-
-	ev_view_presentation_transition_stop (view);
-	ev_view_reset_presentation_state (view);
-	
-	page = ev_page_cache_get_current_page (view->page_cache);
-	n_pages = ev_page_cache_get_n_pages (view->page_cache);
-
-	if (view->dual_page && !view->presentation)
-	        page = page + 2; 
-	else 
-		page = page + 1;
-
-	if (page < n_pages) {
-		ev_page_cache_set_current_page (view->page_cache, page);
-		return TRUE;
-	} else if (view->presentation && page == n_pages) {
-		view->presentation_state = EV_PRESENTATION_END;
-		gtk_widget_queue_draw (GTK_WIDGET (view));
-		return TRUE;
-	} else if (view->dual_page && page == n_pages) {
-		ev_page_cache_set_current_page (view->page_cache, page - 1);
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-gboolean
-ev_view_previous_page (EvView *view)
-{
-	int page;
-
-	g_return_val_if_fail (EV_IS_VIEW (view), FALSE);
-
-	if (!view->page_cache)
-		return FALSE;
-
-	if (view->presentation &&
-	    view->presentation_state == EV_PRESENTATION_END) {
-		ev_view_reset_presentation_state (view);
-		return TRUE;
-	}
-	
-	if (view->presentation && 
-	    (view->presentation_state == EV_PRESENTATION_BLACK ||
-	     view->presentation_state == EV_PRESENTATION_WHITE)) {
-		ev_view_reset_presentation_state (view);
-		return FALSE; 
-	}	
-
-        if (view->animation) {
-		ev_view_transition_animation_cancel (view->animation, view);
-        }
-
-	ev_view_reset_presentation_state (view);
-
-	page = ev_page_cache_get_current_page (view->page_cache);
-
-	if (view->dual_page && !view->presentation)
-	        page = page - 2; 
-	else 
-		page = page - 1;
-
-	if (page >= 0) {
-		ev_page_cache_set_current_page (view->page_cache, page);
-		return TRUE;
-	} else if (ev_view_get_dual_page (view) && page == -1) {
-		ev_page_cache_set_current_page (view->page_cache, 0);
-		return TRUE;
-	} else {	
-		return FALSE;
-	}
-}
-		
-/*** Enum description for usage in signal ***/
-
-GType
-ev_sizing_mode_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GEnumValue values[] = {
-      { EV_SIZING_FIT_WIDTH, "EV_SIZING_FIT_WIDTH", "fit-width" },
-      { EV_SIZING_BEST_FIT, "EV_SIZING_BEST_FIT", "best-fit" },
-      { EV_SIZING_FREE, "EV_SIZING_FREE", "free" },
-      { 0, NULL, NULL }
-    };
-    etype = g_enum_register_static ("EvSizingMode", values);
-  }
-  return etype;
-}
-
-void
-ev_view_update_view_size (EvView *view, GtkScrolledWindow * scrolled_window)
-{
-	int width, height;
-	GtkRequisition vsb_requisition;
-	GtkRequisition hsb_requisition;
-	int scrollbar_spacing;
-	
-	/* Calculate the width available for the content */ 
-	width  = GTK_WIDGET (scrolled_window)->allocation.width;
-	height = GTK_WIDGET (scrolled_window)->allocation.height;
-
-	if (gtk_scrolled_window_get_shadow_type (scrolled_window) == GTK_SHADOW_IN 
-	    && view) {
-		width -=  2 * GTK_WIDGET(view)->style->xthickness;
-		height -= 2 * GTK_WIDGET(view)->style->ythickness;
-	}
-
-	gtk_widget_size_request (scrolled_window->vscrollbar, &vsb_requisition);
-	gtk_widget_size_request (scrolled_window->hscrollbar, &hsb_requisition);
-	gtk_widget_style_get (GTK_WIDGET (scrolled_window), 
-			      "scrollbar_spacing", 
-			      &scrollbar_spacing, 
-			      NULL);
-	
-	if (EV_IS_VIEW(view)) {
-		ev_view_set_zoom_for_size (EV_VIEW (view),
-					   MAX (1, width),
-					   MAX (1, height),
-					   vsb_requisition.width + scrollbar_spacing,
-					   hsb_requisition.height + scrollbar_spacing);
-	}
-}
diff --git a/shell/ev-view.h b/shell/ev-view.h
deleted file mode 100644
index e3b3829..0000000
--- a/shell/ev-view.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/* this file is part of evince, a gnome document viewer
- *
- *  Copyright (C) 2004 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.
- */
-
-#ifndef __EV_VIEW_H__
-#define __EV_VIEW_H__
-
-#include <gtk/gtk.h>
-
-#include "ev-document.h"
-#include "ev-link.h"
-#include "ev-view-accessible.h"
-
-G_BEGIN_DECLS
-
-#define EV_TYPE_VIEW            (ev_view_get_type ())
-#define EV_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EV_TYPE_VIEW, EvView))
-#define EV_IS_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EV_TYPE_VIEW))
-
-#define EV_TYPE_SIZING_MODE     (ev_sizing_mode_get_type())
-#define EV_SIZING_MODE_CLASS    (g_type_class_peek (EV_TYPE_SIZING_MODE))
-
-typedef struct _EvView       EvView;
-typedef struct _EvViewClass  EvViewClass;
-
-
-typedef enum {
-	EV_SIZING_BEST_FIT,
-	EV_SIZING_FIT_WIDTH,
-	EV_SIZING_FREE,
-} EvSizingMode;
-
-typedef enum {
-	EV_VIEW_SELECTION_TEXT,
-	EV_VIEW_SELECTION_RECTANGLE,
-} EvViewSelectionMode;
-
-GType		ev_view_get_type	  (void) G_GNUC_CONST;
-GType           ev_sizing_mode_get_type   (void) G_GNUC_CONST;
-
-GtkWidget*	ev_view_new		  (void);
-void		ev_view_set_document	  (EvView         *view,
-			   		   EvDocument     *document);
-void 		ev_view_set_loading       (EvView 	  *view,
-				           gboolean        loading);
-void            ev_view_reload            (EvView         *view);
-
-/* Clipboard */
-void		ev_view_copy		  (EvView         *view);
-void            ev_view_copy_link_address (EvView         *view,
-					   EvLinkAction   *action);
-void		ev_view_select_all	  (EvView         *view);
-gboolean        ev_view_get_has_selection (EvView         *view);
-
-/* sizing and behavior */
-/* These are all orthoganal to each other, except 'presentation' trumps all
- * other behaviors
- */
-gboolean	ev_view_get_continuous	  (EvView         *view);
-void     	ev_view_set_continuous    (EvView         *view,
-					   gboolean        continuous);
-gboolean	ev_view_get_dual_page	  (EvView         *view);
-void     	ev_view_set_dual_page	  (EvView         *view,
-					   gboolean        dual_page);
-void     	ev_view_set_fullscreen	  (EvView         *view,
-					   gboolean        fullscreen);
-gboolean 	ev_view_get_fullscreen	  (EvView         *view);
-void     	ev_view_set_presentation  (EvView         *view,
-					   gboolean        presentation);
-gboolean 	ev_view_get_presentation  (EvView         *view);
-void     	ev_view_set_sizing_mode	  (EvView         *view,
-					   EvSizingMode    mode);
-EvSizingMode	ev_view_get_sizing_mode	  (EvView         *view);
-
-
-/* Page size */
-gboolean	ev_view_can_zoom_in       (EvView         *view);
-void		ev_view_zoom_in		  (EvView         *view);
-gboolean        ev_view_can_zoom_out      (EvView         *view);
-void		ev_view_zoom_out	  (EvView         *view);
-void		ev_view_set_zoom	  (EvView         *view,
-					   double          factor,
-					   gboolean        relative);
-void		ev_view_set_zoom_for_size (EvView         *view,
-					   int             width,
-					   int             height,
-					   int             vsb_width,
-					   int             hsb_height);
-double		ev_view_get_zoom	  (EvView         *view);
-void            ev_view_set_screen_dpi    (EvView         *view,
-					   gdouble         dpi);
-void		ev_view_rotate_left       (EvView         *view);
-void            ev_view_rotate_right      (EvView         *view);
-void            ev_view_set_rotation      (EvView         *view,
-					   int             rotation);
-int             ev_view_get_rotation      (EvView         *view);
-
-/* Find */
-void            ev_view_find_next                 (EvView         *view);
-void            ev_view_find_previous             (EvView         *view);
-void            ev_view_find_search_changed       (EvView         *view);
-void     	ev_view_find_set_highlight_search (EvView         *view,
-						   gboolean        value);
-void            ev_view_find_changed              (EvView         *view,
-						   GList         **results,
-						   gint            page);
-void            ev_view_find_cancel               (EvView         *view);
-
-/* Cursor */
-void           ev_view_hide_cursor        (EvView         *view);
-void           ev_view_show_cursor        (EvView         *view);
-
-/* Navigation */
-void	       ev_view_scroll             (EvView         *view,
-	                                   GtkScrollType   scroll,
-					   gboolean        horizontal);
-void	       ev_view_handle_link        (EvView         *view,
-					   EvLink         *link);
-gboolean       ev_view_next_page	  (EvView         *view);
-gboolean       ev_view_previous_page	  (EvView         *view);
-gchar*         ev_view_page_label_from_dest (EvView *view, EvLinkDest *dest);
-
-void           ev_view_update_view_size   (EvView            *view,
-					   GtkScrolledWindow *scrolled_window);
-
-void	       ev_view_autoscroll_start   (EvView *view);
-void           ev_view_autoscroll_stop    (EvView *view);
-
-G_END_DECLS
-
-#endif /* __EV_VIEW_H__ */