X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=thumbnailer%2Fevince-thumbnailer.c;h=8c79ae92db73228760a904a9e19c61efd1ce86b6;hb=67a923a1096f1e9765a5d804e4fb9fac39bcfcf2;hp=513d9e2d9815ea4590ed672f5709a6bc0b573393;hpb=dda75bc2dbcd9a6ed5507bb0609f057846edc261;p=evince.git

diff --git a/thumbnailer/evince-thumbnailer.c b/thumbnailer/evince-thumbnailer.c
index 513d9e2d..8c79ae92 100644
--- a/thumbnailer/evince-thumbnailer.c
+++ b/thumbnailer/evince-thumbnailer.c
@@ -30,32 +30,6 @@
 
 #define THUMBNAIL_SIZE 128
 
-static EvDocument *
-get_document_from_uri (const char *uri, gboolean slow, gchar **mime_type)
-{
-	EvDocument *document = NULL;
-        GnomeVFSFileInfo *info;
-        GnomeVFSResult result;
-
-        info = gnome_vfs_file_info_new ();
-        result = gnome_vfs_get_file_info (uri, info,
-	    			          GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
-		                          GNOME_VFS_FILE_INFO_FOLLOW_LINKS | 
-					  (slow ? GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE : 0));
-        if (result != GNOME_VFS_OK || info->mime_type == NULL) {
-		goto end;
-        } 
-	
-	document = ev_document_factory_get_document (info->mime_type);
-	if (mime_type != NULL) {
-		*mime_type = info->mime_type ? g_strdup (info->mime_type) : NULL;
-	}
-
-end:
-        gnome_vfs_file_info_unref (info);	
-        return document;
-}
-
 static gboolean
 evince_thumbnail_pngenc_get (const char *uri, const char *thumbnail, int size)
 {
@@ -64,11 +38,9 @@ evince_thumbnail_pngenc_get (const char *uri, const char *thumbnail, int size)
 	GdkPixbuf *pixbuf;
 	char *mime_type = NULL;
 
-	document = get_document_from_uri (uri, FALSE, &mime_type);
-	if (document == NULL) {
-		document = get_document_from_uri (uri, TRUE, &mime_type);
-	}
-	if (document == NULL) {
+	document = ev_document_factory_get_document  (uri, &mime_type, &error);
+
+	if (document == NULL || error) {
 		return FALSE;
 	}