Remember page setup options too. Paper size is globally remembered while

[evince.git] / libdocument / ev-document-factory.c

diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c
index 76ced10848d42f8113308516b1b22a5e356d9e1d..09baef24683cf66412f633b39633db642088ba8c 100644 (file)
--- 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,115 +104,57 @@ get_compression_from_mime_type (const gchar *mime_type)
        return EV_COMPRESSION_NONE;
 }
 
-static void
-throw_unknown_mime_type_error (GError **error)
-{
-       g_set_error (error,
-                    EV_DOCUMENT_ERROR, 
-                    0,
-                    _("Unknown MIME Type"));
-}
-
-static void
-throw_failed_to_get_info_error (GError **error)
-{
-       g_set_error (error,
-                    EV_DOCUMENT_ERROR,
-                    0,
-                    _("Failed to get info for document"));
-}
-
 static EvDocument *
 get_document_from_uri (const char        *uri,
-                      gboolean           slow,
+                      gboolean           fast,
                       EvCompressionType *compression,
                       GError           **error)
 {
        EvDocument *document = NULL;
-       GFile *file;
-       GFileInfo *file_info;
-       const char *mime_type;
-       char *content_type = NULL;
+       gchar      *mime_type = NULL;
 
        *compression = EV_COMPRESSION_NONE;
 
-       file = g_file_new_for_uri (uri);
-       file_info = g_file_query_info (file,
-                                      G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
-                                      0, NULL, NULL);
-
-       if (file_info == NULL) {
-               throw_failed_to_get_info_error (error); 
-               return NULL;
-       }
-
-       mime_type = g_file_info_get_content_type (file_info);
+       mime_type = ev_file_get_mime_type (uri, fast, error);
 
        if (mime_type == NULL) {
-               throw_unknown_mime_type_error (error);
-               g_object_unref (file_info);
+               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) {
-               /* try to sniff mime type from the content */
-               guchar *buffer;
-               gssize size_read;
-               GFileInputStream *input_stream;
-               
-               input_stream = g_file_read (file, NULL, NULL);
-               buffer = g_malloc (1024);
-               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) {
-                       throw_failed_to_get_info_error (error);
-                       g_object_unref (file_info);
-                       return NULL;
-               } else  {
-                       content_type = g_content_type_guess (NULL, /* no filename */
-                                                            buffer, 1024,
-                                                            NULL);
-                       g_free (buffer);
-                       if (content_type == NULL) {
-                               throw_unknown_mime_type_error (error);
-                               g_object_unref (file_info);
-                               return NULL;
-                       } else {
-                               document = ev_backends_manager_get_document (content_type);
-                               if (document == NULL) {
-                                       g_set_error (error,
-                                                    EV_DOCUMENT_ERROR, 
-                                                    0,
-                                                    _("Unhandled MIME type: “%s”"), content_type);
-                                       g_object_unref (file_info);
-                                       g_free (content_type);
-                                       return NULL;
-                               }
-                               mime_type = content_type;
-                       }
-               }
-       } else {
-               g_object_unref (file);
+               gchar *mime_desc;
+
+               mime_desc = g_content_type_get_description (mime_type);
+               g_set_error (error,
+                            EV_DOCUMENT_ERROR, 
+                            0,
+                            _("File type %s (%s) is not supported"),
+                            mime_desc, mime_type);
+               g_free (mime_desc);
+               g_free (mime_type);
+
+               return NULL;
        }
 
        *compression = get_compression_from_mime_type (mime_type);
 
-        g_object_unref (file_info);
-       g_free (content_type);
+       g_free (mime_type);
        
         return document;
 }
@@ -234,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) {
@@ -274,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;