Check for document links.

[evince.git] / shell / ev-jobs.c

diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c
index fff0cf27b680d681fecd423a9acd8248ffe23a4e..8bd3d45290deaceccfd07fcf2ec16db0d94ad449 100644 (file)
--- a/shell/ev-jobs.c
+++ b/shell/ev-jobs.c
@@ -271,7 +271,7 @@ ev_job_render_run (EvJobRender *job)
                                  G_CALLBACK (render_finished_cb), job);
        } else {
                job->pixbuf = ev_document_render_pixbuf (EV_JOB (job)->document, job->rc);
-               if (job->include_links)
+               if (job->include_links && EV_IS_DOCUMENT_LINKS (EV_JOB (job)->document))
                        job->link_mapping =
                                ev_document_links_get_links (EV_DOCUMENT_LINKS (EV_JOB (job)->document),
                                                             job->rc->page);
@@ -433,9 +433,13 @@ ev_job_xfer_run (EvJobXfer *job)
                char *tmp_name;
                char *base_name;
                
+               /* We'd like to keep extension of source uri since
+                * it helps to resolve some mime types, say cbz */
+               
                tmp_name = ev_tmp_filename ();
-               base_name = g_path_get_basename (job->uri);
-               job->local_uri = g_strconcat ("file:", tmp_name, base_name, NULL);
+               base_name = gnome_vfs_uri_extract_short_name (source_uri);
+               job->local_uri = g_strconcat ("file:", tmp_name, "-", base_name, NULL);
+               g_free (base_name);
                g_free (tmp_name);
                
                target_uri = gnome_vfs_uri_new (job->local_uri);