Cleanup mime type detection on document load. Fix for the bug #336448.

	* backend/ev-document-factory.c: (get_document_from_uri),
	(ev_document_factory_get_document):
	* backend/ev-document-factory.h:
	* properties/ev-properties-main.c: (ev_properties_get_pages):
	* shell/Makefile.am:
	* shell/ev-job-queue.c: (handle_job), (search_for_jobs_unlocked),
	(no_jobs_available_unlocked), (ev_job_queue_init), (find_queue),
	(ev_job_queue_remove_job):
	* shell/ev-job-queue.h:
	* shell/ev-job-xfer.c:
	* shell/ev-job-xfer.h:
	* shell/ev-jobs.c: (ev_job_fonts_init), (ev_job_fonts_class_init),
	(ev_job_fonts_new), (ev_job_fonts_run), (ev_job_xfer_init),
	(ev_job_xfer_dispose), (ev_job_xfer_class_init), (ev_job_xfer_new),
	(ev_job_xfer_run):
	* shell/ev-jobs.h:
	* shell/ev-window.c: (ev_window_is_empty),
	(password_dialog_response), (ev_window_clear_xfer_job),
	(ev_window_xfer_job_cb), (ev_window_open_uri),
	(ev_window_cmd_focus_page_selector),
	(ev_window_cmd_scroll_forward), (ev_window_cmd_scroll_backward),
	(ev_window_cmd_continuous), (ev_window_cmd_dual),
	(ev_window_cmd_view_best_fit), (ev_window_cmd_view_page_width),
	(ev_window_dispose):
	* thumbnailer/evince-thumbnailer.c: (evince_thumbnail_pngenc_get):

	* Cleanup mime type detection on document load. Fix for the
	bug #336448.

1 files changed, 23 insertions, 23 deletions

diff --git a/shell/ev-jobs.h b/shell/ev-jobs.h
index a0ef3f4..a7f6e82 100644
--- a/shell/ev-jobs.h
+++ b/shell/ev-jobs.h
@@ -37,12 +37,12 @@ typedef struct _EvJobThumbnailClass EvJobThumbnailClass;
 typedef struct _EvJobLinks EvJobLinks;
 typedef struct _EvJobLinksClass EvJobLinksClass;
 
-typedef struct _EvJobLoad EvJobLoad;
-typedef struct _EvJobLoadClass EvJobLoadClass;
-
 typedef struct _EvJobFonts EvJobFonts;
 typedef struct _EvJobFontsClass EvJobFontsClass;
 
+typedef struct _EvJobXfer EvJobXfer;
+typedef struct _EvJobXferClass EvJobXferClass;
+
 #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))
@@ -63,16 +63,16 @@ typedef struct _EvJobFontsClass EvJobFontsClass;
 #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_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_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_XFER		     (ev_job_xfer_get_type())
+#define EV_JOB_XFER(object)	     	     (G_TYPE_CHECK_INSTANCE_CAST((object), EV_TYPE_JOB_XFER, EvJobXfer))
+#define EV_JOB_XFER_CLASS(klass)	     (G_TYPE_CHACK_CLASS_CAST((klass), EV_TYPE_JOB_XFER, EvJobXferClass))
+#define EV_IS_JOB_XFER(object)		     (G_TYPE_CHECK_INSTANCE_TYPE((object), EV_TYPE_JOB_XFER))
+
 typedef enum {
 	EV_JOB_PRIORITY_LOW,
 	EV_JOB_PRIORITY_HIGH,
@@ -148,27 +148,28 @@ struct _EvJobThumbnailClass
 	EvJobClass parent_class;
 };
 
-struct _EvJobLoad
+struct _EvJobFonts
 {
 	EvJob parent;
-	GError *error;
-	gchar *uri;
+	gboolean scan_completed;
 };
 
-struct _EvJobLoadClass
+struct _EvJobFontsClass
 {
-	EvJobClass parent_class;
+        EvJobClass parent_class;
 };
 
-struct _EvJobFonts
+struct _EvJobXfer
 {
 	EvJob parent;
-	gboolean scan_completed;
+	GError *error;
+	char *uri;
+	char *local_uri;
 };
 
-struct _EvJobFontsClass
+struct _EvJobXferClass
 {
-        EvJobClass parent_class;
+	EvJobClass parent_class;
 };
 
 /* Base job class */
@@ -202,17 +203,16 @@ EvJob          *ev_job_thumbnail_new      (EvDocument     *document,
 					   gint            requested_width);
 void            ev_job_thumbnail_run      (EvJobThumbnail *thumbnail);
 
-/* EvJobLoad */
-GType 		ev_job_load_get_type 	  (void);
-EvJob 	       *ev_job_load_new 	  (EvDocument      *document,
-					   const gchar 	   *uri);
-void		ev_job_load_run 	  (EvJobLoad 	   *load);					   
-
 /* EvJobFonts */
 GType 		ev_job_fonts_get_type 	  (void);
 EvJob 	       *ev_job_fonts_new 	  (EvDocument      *document);
 void		ev_job_fonts_run 	  (EvJobFonts 	   *fonts);
 
+/* EvJobXfer */
+GType 		ev_job_xfer_get_type 	  (void);
+EvJob 	       *ev_job_xfer_new 	  (const gchar 	   *uri);
+void		ev_job_xfer_run 	  (EvJobXfer 	   *xfer);					   
+
 G_END_DECLS
 
 #endif /* __EV_JOBS_H__ */