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=513d9e2d9815ea4590ed672f5709a6bc0b573393;hb=a24ba773afb595b2be95a01702816aa66f50ac54;hp=dfa521bea4e931ad1936cb50ab1f752294112ad0;hpb=a5e3f1314e7e27fb0e765b3b9b8e1deb92c7c536;p=evince.git

diff --git a/thumbnailer/evince-thumbnailer.c b/thumbnailer/evince-thumbnailer.c
index dfa521be..513d9e2d 100644
--- a/thumbnailer/evince-thumbnailer.c
+++ b/thumbnailer/evince-thumbnailer.c
@@ -20,29 +20,57 @@
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-init.h>
+#include <libgnomevfs/gnome-vfs-ops.h>
 
 #include <ev-document.h>
-#include <ev-document-types.h>
 #include <ev-document-thumbnails.h>
+#include <ev-document-factory.h>
 
 #include <string.h>
 
 #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)
 {
 	EvDocument *document = NULL;
 	GError *error = NULL;
 	GdkPixbuf *pixbuf;
-	GType document_type;
 	char *mime_type = NULL;
 
-	document_type = ev_document_type_lookup (uri, &mime_type);
-	if (document_type == G_TYPE_INVALID)
+	document = get_document_from_uri (uri, FALSE, &mime_type);
+	if (document == NULL) {
+		document = get_document_from_uri (uri, TRUE, &mime_type);
+	}
+	if (document == NULL) {
 		return FALSE;
-
-	document = g_object_new (document_type, NULL);
+	}
 
 	if (!ev_document_load (document, uri, &error)) {
 		if (error->domain == EV_DOCUMENT_ERROR &&
@@ -58,15 +86,11 @@ evince_thumbnail_pngenc_get (const char *uri, const char *thumbnail, int size)
 	}
 
 	pixbuf = ev_document_thumbnails_get_thumbnail
-			(EV_DOCUMENT_THUMBNAILS (document), 0, size, FALSE);
+			(EV_DOCUMENT_THUMBNAILS (document), 0, 0, size, FALSE);
 	
 	if (pixbuf != NULL) {
 		const char *overlaid_icon_name = NULL;
 
-		if (strcmp (mime_type, "application/pdf") == 0) {
-			overlaid_icon_name = "pdf-icon.png";
-		}
-
 		if (overlaid_icon_name) {
 			GdkPixbuf *overlaid_pixbuf;