Updated Japanese translation.

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

diff --git a/backend/ev-document-factory.c b/backend/ev-document-factory.c
index c7314ecffe28af832cc38305e10db6690117e3b0..23364a2db1f5cdddc1a980a8104fba09bf1ad06b 100644 (file)
--- a/backend/ev-document-factory.c
+++ b/backend/ev-document-factory.c
@@ -28,6 +28,8 @@
 #include "ev-poppler.h"
 #include "pixbuf-document.h"
 #include "tiff-document.h"
+#include "impress-document.h"
+
 #ifdef ENABLE_PS
 #include "ps-document.h"
 #endif
@@ -67,6 +69,11 @@ const EvDocumentType document_types[] = {
        {"image/x-eps",                EV_BACKEND_PS,   ps_document_get_type},
 #endif
 
+#ifdef ENABLE_IMPRESS
+       /* Impress slides: */
+       {"application/vnd.sun.xml.impress", EV_BACKEND_IMPRESS, impress_document_get_type},
+#endif
+
 #ifdef ENABLE_TIFF
        /* Tiff: */
        {"image/tiff",                 EV_BACKEND_TIFF, tiff_document_get_type},
@@ -142,7 +149,7 @@ mime_type_supported_by_gdk_pixbuf (const gchar *mime_type)
 }
 #endif
 
-EvDocument*
+static EvDocument*
 ev_document_factory_get_from_mime (const char *mime_type)
 {
        int i;
@@ -230,7 +237,7 @@ ev_document_factory_get_all_mime_types (void)
 }
 
 static EvDocument *
-get_document_from_uri (const char *uri, gboolean slow, gchar **mime_type, GError **error)
+get_document_from_uri (const char *uri, gboolean slow, GError **error)
 {
        EvDocument *document = NULL;
 
@@ -259,44 +266,48 @@ get_document_from_uri (const char *uri, gboolean slow, gchar **mime_type, GError
                gnome_vfs_file_info_unref (info);
                return NULL;
        }
-       
+
        document = ev_document_factory_get_from_mime (info->mime_type);
                
        if (document == NULL) {
                g_set_error (error,
                             EV_DOCUMENT_ERROR, 
                             0,
-                            _("Unhandled MIME type: '%s'"), info->mime_type);
+                            _("Unhandled MIME type: “%s”"), info->mime_type);
                gnome_vfs_file_info_unref (info);
                return NULL;
        }                       
 
-       if (mime_type != NULL) {
-                   *mime_type = g_strdup (info->mime_type);
-       }
-
         gnome_vfs_file_info_unref (info);
        
         return document;
 }
 
 EvDocument *
-ev_document_factory_get_document (const char *uri, gchar **mime_type, GError **error)
+ev_document_factory_get_document (const char *uri, GError **error)
 {
        EvDocument *document;
-       
-       document = get_document_from_uri (uri, FALSE, mime_type, error);
 
-       if (document != NULL) {
-               return document;
+       document = get_document_from_uri (uri, FALSE, error);
+
+       if (*error == NULL) {
+               ev_document_load (document, uri, error);
        }
-               
-       if (error) {
+       
+       if (*error) {
                g_error_free (*error);
                *error = NULL;
+       } else {
+               return document;
+       }
+
+       document = get_document_from_uri (uri, TRUE, error);
+
+       if (*error != NULL) {
+               return NULL;
        }
 
-       document = get_document_from_uri (uri, TRUE, mime_type, error);
+       ev_document_load (document, uri, error);
 
        return document;
 }
@@ -391,6 +402,16 @@ ev_document_factory_add_filters (GtkWidget *chooser, EvDocument *document)
        }
 #endif 
 
+#ifdef ENABLE_IMPRESS
+       if (document == NULL || backend == EV_BACKEND_IMPRESS) {
+               default_filter = filter = gtk_file_filter_new ();
+               gtk_file_filter_set_name (filter, _("Impress Slides"));
+               mime_types = ev_document_factory_get_mime_types (EV_BACKEND_IMPRESS);
+               file_filter_add_mime_list_and_free (filter, mime_types);
+               gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
+       }
+#endif 
+
        filter = gtk_file_filter_new ();
        gtk_file_filter_set_name (filter, _("All Files"));
        gtk_file_filter_add_pattern (filter, "*");