Make sure copy_job_page_and_selection_to_job_info is always called before

2008-09-26  Carlos Garcia Campos  <carlosgc@gnome.org>

	* shell/ev-pixbuf-cache.c: (copy_job_to_job_info):

	Make sure copy_job_page_and_selection_to_job_info is always called
	before copy_job_to_job_info. Fixes bug #552382.

svn path=/trunk/; revision=3207

diff --git a/ChangeLog b/ChangeLog
index 03fc175d54fe8384914d7a1766808f80d5aa1b6a..4589b98d02d28eebc99c3206055aed44603c6294 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-26  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * shell/ev-pixbuf-cache.c: (copy_job_to_job_info):
+
+       Make sure copy_job_page_and_selection_to_job_info is always called
+       before copy_job_to_job_info. Fixes bug #552382.
+       
 2008-09-22  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * NEWS:

diff --git a/shell/ev-pixbuf-cache.c b/shell/ev-pixbuf-cache.c
index 91c24780aa6a542501b0fa1ec622b40550991c5e..d8927f12c4a2c0da6ee5ffc7148bd8b3b4ef759b 100644 (file)
--- a/shell/ev-pixbuf-cache.c
+++ b/shell/ev-pixbuf-cache.c
@@ -501,6 +501,12 @@ copy_job_to_job_info (EvJobRender   *job_render,
                      CacheJobInfo  *job_info,
                      EvPixbufCache *pixbuf_cache)
 {
+       if (!job_info->page_ready) {
+               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);