X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libdocument%2Fev-document-factory.c;h=09baef24683cf66412f633b39633db642088ba8c;hb=7401194be132a52138b9a40e29c63847d125795d;hp=5b2473f5e1b2e5e55e66ff3b381b2e9e0eeb7a3d;hpb=2a24c3f16f9ae6a6dc210abbef64c78aba4ddded;p=evince.git

diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c
index 5b2473f5..09baef24 100644
--- a/libdocument/ev-document-factory.c
+++ b/libdocument/ev-document-factory.c
@@ -23,10 +23,11 @@
 #endif
 
 #include <string.h>
+
 #include <gio/gio.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkfilechooserdialog.h>
+#include <gtk/gtk.h>
 
 #include "ev-backends-manager.h"
 #include "ev-document-factory.h"
@@ -103,61 +104,9 @@ get_compression_from_mime_type (const gchar *mime_type)
 	return EV_COMPRESSION_NONE;
 }
 
-static gchar *
-get_mime_type_from_uri (const gchar *uri)
-{
-	GFile       *file;
-	GFileInfo   *file_info;
-	const gchar *mime_type;
-
-	file = g_file_new_for_uri (uri);
-	file_info = g_file_query_info (file,
-				       G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
-				       0, NULL, NULL);
-	g_object_unref (file);
-
-	if (file_info == NULL)
-		return NULL;
-
-	mime_type = g_file_info_get_content_type (file_info);
-	g_object_unref (file_info);
-
-	return g_strdup (mime_type);
-}
-
-static gchar *
-get_mime_type_from_data (const gchar *uri)
-{
-	GFile            *file;
-	GFileInputStream *input_stream;
-	gssize            size_read;
-	guchar            buffer[1024];
-
-	file = g_file_new_for_uri (uri);
-	
-	input_stream = g_file_read (file, NULL, NULL);
-	if (!input_stream) {
-		g_object_unref (file);
-		return NULL;
-	}
-
-	size_read = g_input_stream_read (G_INPUT_STREAM (input_stream),
-					 buffer, 1024, NULL, NULL);
-	g_input_stream_close (G_INPUT_STREAM (input_stream), NULL, NULL);
-
-	g_object_unref (file);
-
-	if (size_read == -1)
-		return NULL;
-
-	return g_content_type_guess (NULL, /* no filename */
-				     buffer, 1024,
-				     NULL);
-}
-
 static EvDocument *
 get_document_from_uri (const char        *uri,
-		       gboolean           slow,
+		       gboolean           fast,
 		       EvCompressionType *compression,
 		       GError           **error)
 {
@@ -166,36 +115,40 @@ get_document_from_uri (const char        *uri,
 
 	*compression = EV_COMPRESSION_NONE;
 
-	mime_type = slow ?
-		get_mime_type_from_data (uri) :
-		get_mime_type_from_uri (uri);
-	
+	mime_type = ev_file_get_mime_type (uri, fast, error);
+
 	if (mime_type == NULL) {
-		g_set_error (error,
-			     EV_DOCUMENT_ERROR,	
-    			     0,
-			     _("Unknown MIME Type"));
 		g_free (mime_type);
+
+		if (*error == NULL) {
+			g_set_error (error,
+				     EV_DOCUMENT_ERROR,
+				     0,
+				     _("Unknown MIME Type"));
+		}
 		
 		return NULL;
 	}
 
+	document = ev_backends_manager_get_document (mime_type);
+	
 #ifdef ENABLE_PIXBUF
-	if (mime_type_supported_by_gdk_pixbuf (mime_type))
+	if (!document && mime_type_supported_by_gdk_pixbuf (mime_type))
 		document = ev_backends_manager_get_document ("image/*");
-	else
-		document = ev_backends_manager_get_document (mime_type);
-#else
-	document = ev_backends_manager_get_document (mime_type);
 #endif /* ENABLE_PIXBUF */
 
 	if (document == NULL) {
+		gchar *mime_desc;
+
+		mime_desc = g_content_type_get_description (mime_type);
 		g_set_error (error,
 			     EV_DOCUMENT_ERROR,	
 			     0,
-			     _("Unhandled MIME type: “%s”"), mime_type);
+			     _("File type %s (%s) is not supported"),
+			     mime_desc, mime_type);
+		g_free (mime_desc);
 		g_free (mime_type);
-		
+
 		return NULL;
 	}
 
@@ -224,7 +177,7 @@ ev_document_factory_get_document (const char *uri, GError **error)
 	EvCompressionType compression;
 	gchar *uri_unc = NULL;
 
-	document = get_document_from_uri (uri, FALSE, &compression, error);
+	document = get_document_from_uri (uri, TRUE, &compression, error);
 	if (*error == NULL) {
 		uri_unc = ev_file_uncompress (uri, compression, error);
 		if (uri_unc) {
@@ -264,7 +217,7 @@ ev_document_factory_get_document (const char *uri, GError **error)
 
 	uri_unc = NULL;
 
-	document = get_document_from_uri (uri, TRUE, &compression, error);
+	document = get_document_from_uri (uri, FALSE, &compression, error);
 
 	if (*error != NULL) {
 		return NULL;