X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-jobs.c;h=8bd3d45290deaceccfd07fcf2ec16db0d94ad449;hb=71538f327d3dc3d0016c02e524677e8e22cb05f0;hp=fff0cf27b680d681fecd423a9acd8248ffe23a4e;hpb=67297a0108ba18a69972c98ee1771c3dad41d55b;p=evince.git

diff --git a/shell/ev-jobs.c b/shell/ev-jobs.c
index fff0cf27..8bd3d452 100644
--- 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);