]> www.fi.muni.cz Git - evince.git/blobdiff - libdocument/ev-document-factory.c
[dualscreen] fix crash on ctrl+w and fix control window closing
[evince.git] / libdocument / ev-document-factory.c
index b500fdfb6dbe365a5803b5b4ad84db7260ea1b31..1f1eb0dbcfb080e5ca34af58fa51384b9e47d240 100644 (file)
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
 #include "config.h"
 #endif
 
-#include "ev-document-factory.h"
-
-/* The various document type backends: */
-#ifdef ENABLE_PDF
-#include "ev-poppler.h"
-#endif
-#ifdef ENABLE_PS
-#include "ps-document.h"
-#endif
-#ifdef ENABLE_TIFF
-#include "tiff-document.h"
-#endif
-#ifdef ENABLE_DVI
-#include "dvi-document.h"
-#endif
-#ifdef ENABLE_PIXBUF
-#include "pixbuf-document.h"
-#endif
-#ifdef ENABLE_DJVU
-#include "djvu-document.h"
-#endif
-#ifdef ENABLE_COMICS
-#include "comics-document.h"
-#endif
-#ifdef ENABLE_IMPRESS
-#include "impress-document.h"
-#endif
-
 #include <string.h>
+
+#include <gio/gio.h>
 #include <glib/gstdio.h>
-#include <glib/gi18n.h>
-#include <libgnomevfs/gnome-vfs-mime-utils.h>
-#include <libgnomevfs/gnome-vfs-file-info.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <gtk/gtkfilechooserdialog.h>
+#include <glib/gi18n-lib.h>
+#include <gtk/gtk.h>
 
+#include "ev-backends-manager.h"
+#include "ev-document-factory.h"
 #include "ev-file-helpers.h"
 
-typedef struct _EvDocumentType EvDocumentType;
-struct _EvDocumentType {
-       const char *mime_type;
-       EvCompressionType compression;
-       EvBackend backend;
-       GType (*document_type_factory_callback)();
-};
-
-const EvDocumentType document_types[] = {
-#ifdef ENABLE_PDF
-       /* PDF: */
-       {"application/pdf",            EV_COMPRESSION_NONE,  EV_BACKEND_PDF,  pdf_document_get_type},
-       {"application/x-bzpdf",        EV_COMPRESSION_BZIP2, EV_BACKEND_PDF,  pdf_document_get_type},
-       {"application/x-gzpdf",        EV_COMPRESSION_GZIP,  EV_BACKEND_PDF,  pdf_document_get_type},
-#endif
-
-#ifdef ENABLE_PS
-       /* Postscript: */
-       {"application/postscript",     EV_COMPRESSION_NONE,  EV_BACKEND_PS,   ps_document_get_type},
-       {"application/x-bzpostscript", EV_COMPRESSION_BZIP2, EV_BACKEND_PS,   ps_document_get_type},
-       {"application/x-gzpostscript", EV_COMPRESSION_GZIP,  EV_BACKEND_PS,   ps_document_get_type},
-       {"image/x-eps",                EV_COMPRESSION_NONE,  EV_BACKEND_PS,   ps_document_get_type},
-       {"image/x-bzeps",              EV_COMPRESSION_BZIP2, EV_BACKEND_PS,   ps_document_get_type},
-       {"image/x-gzeps",              EV_COMPRESSION_GZIP,  EV_BACKEND_PS,   ps_document_get_type},
-#endif
-
-#ifdef ENABLE_TIFF
-       /* Tiff: */
-       {"image/tiff",                 EV_COMPRESSION_NONE, EV_BACKEND_TIFF, tiff_document_get_type},
-#endif
-
-#ifdef ENABLE_DJVU
-       /* djvu: */
-       {"image/vnd.djvu",             EV_COMPRESSION_NONE, EV_BACKEND_DJVU, djvu_document_get_type},
-#endif         
-
-#ifdef ENABLE_DVI
-       /* dvi: */
-       {"application/x-dvi",          EV_COMPRESSION_NONE, EV_BACKEND_DVI,  dvi_document_get_type},
-#endif
-
-#ifdef ENABLE_COMICS
-       /* cbr/cbz: */
-       {"application/x-cbr",          EV_COMPRESSION_NONE, EV_BACKEND_COMICS,  comics_document_get_type},
-       {"application/x-cbz",          EV_COMPRESSION_NONE, EV_BACKEND_COMICS,  comics_document_get_type},
-#endif
-
-#ifdef ENABLE_IMPRESS
-       /* Impress slides: */
-       {"application/vnd.sun.xml.impress", EV_COMPRESSION_NONE, EV_BACKEND_IMPRESS, impress_document_get_type},
-       {"application/vnd.oasis.opendocument.presentation", EV_COMPRESSION_NONE, EV_BACKEND_IMPRESS, impress_document_get_type},
-#endif
-
-};
-
-#ifdef ENABLE_PIXBUF
-
-static GList*
-gdk_pixbuf_mime_type_list ()
+static EvCompressionType
+get_compression_from_mime_type (const gchar *mime_type)
 {
-       GSList *formats, *list;
-       GList *result;
-
-       formats = gdk_pixbuf_get_formats ();
-       result = NULL;
-
-       for (list = formats; list != NULL; list = list->next) {
-               GdkPixbufFormat *format = list->data;
-               int i;
-               gchar **mime_types;
-
-               if (gdk_pixbuf_format_is_disabled (format))
-                       continue;
-
-               mime_types = gdk_pixbuf_format_get_mime_types (format);
-
-               for (i = 0; mime_types[i] != NULL; i++) {
-                       result = g_list_append (result, mime_types[i]);
-               }
+       gchar type[3];
+       gchar *p;
+
+       if (!(p = g_strrstr (mime_type, "/")))
+               return EV_COMPRESSION_NONE;
+
+       if (sscanf (++p, "x-%2s%*s", type) == 1) {
+               if (g_ascii_strcasecmp (type, "gz") == 0)
+                       return EV_COMPRESSION_GZIP;
+               else if (g_ascii_strcasecmp (type, "bz") == 0)
+                       return EV_COMPRESSION_BZIP2;
+                else if (g_ascii_strcasecmp (type, "xz") == 0)
+                        return EV_COMPRESSION_LZMA;
        }
-       g_slist_free (formats);
 
-       return result;
+       return EV_COMPRESSION_NONE;
 }
 
-/* Would be nice to have this in gdk-pixbuf */
-static gboolean
-mime_type_supported_by_gdk_pixbuf (const gchar *mime_type)
-{
-       GList *mime_types;
-       GList *list;
-       gboolean retval = FALSE;
-       
-       mime_types = gdk_pixbuf_mime_type_list ();
-       for (list = mime_types; list; list = list->next) {
-               if (strcmp ((char *)list->data, mime_type) == 0) {
-                       retval = TRUE;
-                       break;
-               }
-       }
-       
-       g_list_foreach (mime_types, (GFunc)g_free, NULL);
-       g_list_free (mime_types);
-
-       return retval;
-}
-#endif
 
+/*
+ * get_document_from_uri:
+ * @uri: the document URI
+ * @fast: whether to use fast MIME type detection
+ * @compression: a location to store the document's compression type
+ * @error: a #GError location to store an error, or %NULL
+ *
+ * Creates a #EvDocument instance for the document at @uri, using either
+ * fast or slow MIME type detection. If a document could be created,
+ * @compression is filled in with the document's compression type.
+ * On error, %NULL is returned and @error filled in.
+ * 
+ * Returns: a new #EvDocument instance, or %NULL on error with @error filled in
+ */
 static EvDocument *
-ev_document_factory_get_from_mime (const gchar       *mime_type,
-                                  EvCompressionType *compression)
+get_document_from_uri (const char        *uri,
+                      gboolean           fast,
+                      EvCompressionType *compression,
+                      GError           **error)
 {
-       int i;
-       GType type = G_TYPE_INVALID;
        EvDocument *document = NULL;
+       gchar      *mime_type = NULL;
+       GError     *err = NULL;
 
        *compression = EV_COMPRESSION_NONE;
-       
-       for (i = 0; i < G_N_ELEMENTS (document_types); i++) {
-               if (strcmp (mime_type, document_types[i].mime_type) == 0) {
-                       g_assert (document_types[i].document_type_factory_callback != NULL);
-                       type = document_types[i].document_type_factory_callback ();
-                       *compression = document_types[i].compression;
-                       break;
-               }
-       }
-#ifdef ENABLE_PIXBUF
-       if (type == G_TYPE_INVALID && mime_type_supported_by_gdk_pixbuf (mime_type)) {
-               type = pixbuf_document_get_type ();
-       }
-#endif
-
-       if (type != G_TYPE_INVALID) {
-               document = g_object_new (type, NULL);
-       } 
-
-       return document;
-}
-
-EvBackend
-ev_document_factory_get_backend (EvDocument *document)
-{
-       int i;
 
-       for (i = 0; i < G_N_ELEMENTS (document_types); i++) {
-               GType type = document_types[i].document_type_factory_callback ();
-               if (type == G_TYPE_FROM_INSTANCE (document)) {
-                       return  document_types[i].backend;
-               }
-       }
+       mime_type = ev_file_get_mime_type (uri, fast, &err);
 
-#ifdef ENABLE_PIXBUF
-       if (G_TYPE_FROM_INSTANCE (document) == pixbuf_document_get_type ())
-               return EV_BACKEND_PIXBUF;
-#endif
-       g_assert_not_reached ();
-       
-       return 0;
-}
+       if (mime_type == NULL) {
+               g_free (mime_type);
 
-static GList *
-ev_document_factory_get_mime_types (EvBackend backend)
-{
-       GList *types = NULL;
-       int i;
-       
-#ifdef ENABLE_PIXBUF
-       if (backend == EV_BACKEND_PIXBUF) {
-               return gdk_pixbuf_mime_type_list ();
-       }
-#endif
-       
-       for (i = 0; i < G_N_ELEMENTS (document_types); i++) {
-               if (document_types[i].backend == backend) {
-                       types = g_list_append (types, g_strdup (document_types[i].mime_type));
+               if (err == NULL) {
+                       g_set_error_literal (error,
+                                             EV_DOCUMENT_ERROR,
+                                             EV_DOCUMENT_ERROR_INVALID,
+                                             _("Unknown MIME Type"));
+               } else {
+                       g_propagate_error (error, err);
                }
+               
+               return NULL;
        }
 
-       return types;
-}
-
-static GList *
-ev_document_factory_get_all_mime_types (void)
-{
-       GList *types = NULL;
-       int i;
-       
-       for (i = 0; i < G_N_ELEMENTS (document_types); i++) {
-               types = g_list_append (types, g_strdup (document_types[i].mime_type));
-       }
-       
-#ifdef ENABLE_PIXBUF
-       types = g_list_concat (types, gdk_pixbuf_mime_type_list ());
-#endif
-
-       return types;
-}
-
-static EvDocument *
-get_document_from_uri (const char        *uri,
-                      gboolean           slow,
-                      EvCompressionType *compression,
-                      GError           **error)
-{
-       EvDocument *document = NULL;
-        GnomeVFSFileInfo *info;
-        GnomeVFSResult result;
+       document = ev_backends_manager_get_document (mime_type);
+       if (document == NULL) {
+               gchar *content_type, *mime_desc = NULL;
 
-       *compression = EV_COMPRESSION_NONE;
+               content_type = g_content_type_from_mime_type (mime_type);
+               if (content_type)
+                       mime_desc = g_content_type_get_description (content_type);
 
-        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) {
-               g_set_error (error,
-                            EV_DOCUMENT_ERROR,
-                            0,
-                            gnome_vfs_result_to_string (result));                      
-               gnome_vfs_file_info_unref (info);
-               return NULL;
-        } 
-       
-       if (info->mime_type == NULL) {
                g_set_error (error,
                             EV_DOCUMENT_ERROR, 
-                            0,
-                            _("Unknown MIME Type"));
-               gnome_vfs_file_info_unref (info);
-               return NULL;
-       }
+                            EV_DOCUMENT_ERROR_INVALID,
+                            _("File type %s (%s) is not supported"),
+                            mime_desc ? mime_desc : "-", mime_type);
+               g_free (mime_desc);
+               g_free (content_type);
+               g_free (mime_type);
 
-       document = ev_document_factory_get_from_mime (info->mime_type, compression);
-               
-       if (document == NULL) {
-               g_set_error (error,
-                            EV_DOCUMENT_ERROR, 
-                            0,
-                            _("Unhandled MIME type: ā€œ%sā€"), info->mime_type);
-               gnome_vfs_file_info_unref (info);
                return NULL;
        }
 
-        gnome_vfs_file_info_unref (info);
+       *compression = get_compression_from_mime_type (mime_type);
+
+       g_free (mime_type);
        
         return document;
 }
@@ -319,6 +135,19 @@ free_uncompressed_uri (gchar *uri_unc)
        g_free (uri_unc);
 }
 
+/**
+ * ev_document_factory_get_document:
+ * @uri: an URI
+ * @error: a #GError location to store an error, or %NULL
+ *
+ * Creates a #EvDocument for the document at @uri; or, if no backend handling
+ * the document's type is found, or an error occurred on opening the document,
+ * returns %NULL and fills in @error.
+ * If the document is encrypted, it is returned but also @error is set to
+ * %EV_DOCUMENT_ERROR_ENCRYPTED.
+ *
+ * Returns: a new #EvDocument, or %NULL.
+ */
 EvDocument *
 ev_document_factory_get_document (const char *uri, GError **error)
 {
@@ -326,190 +155,161 @@ ev_document_factory_get_document (const char *uri, GError **error)
        int result;
        EvCompressionType compression;
        gchar *uri_unc = NULL;
+       GError *err = NULL;
+
+       g_return_val_if_fail (uri != NULL, NULL);
 
-       document = get_document_from_uri (uri, FALSE, &compression, error);
-       if (*error == NULL) {
-               uri_unc = ev_file_uncompress (uri, compression, error);
+       document = get_document_from_uri (uri, TRUE, &compression, &err);
+       g_assert (document != NULL || err != NULL);
+
+       if (document != NULL) {
+               uri_unc = ev_file_uncompress (uri, compression, &err);
                if (uri_unc) {
                        g_object_set_data_full (G_OBJECT (document),
                                                "uri-uncompressed",
                                                uri_unc,
                                                (GDestroyNotify) free_uncompressed_uri);
-               }
-
-               if (*error != NULL) {
+               } else if (err != NULL) {
                        /* Error uncompressing file */
-                       if (document)
-                               g_object_unref (document);
+                       g_object_unref (document);
+                       g_propagate_error (error, err);
                        return NULL;
                }
 
-               result = ev_document_load (document, uri_unc ? uri_unc : uri, error);
+               result = ev_document_load (document, uri_unc ? uri_unc : uri, &err);
 
-               if (result == FALSE || *error) {
-                       if (*error &&
-                           (*error)->domain == EV_DOCUMENT_ERROR &&
-                           (*error)->code == EV_DOCUMENT_ERROR_ENCRYPTED)
+               if (result == FALSE || err) {
+                       if (err &&
+                           g_error_matches (err, EV_DOCUMENT_ERROR, EV_DOCUMENT_ERROR_ENCRYPTED)) {
+                               g_propagate_error (error, err);
                                return document;
+                           }
+                       /* else fall through to slow mime code section below */
                } else {
                        return document;
                }
+
+               g_object_unref (document);
+               document = NULL;
        }
        
        /* Try again with slow mime detection */
-       if (document)
-               g_object_unref (document);
-       document = NULL;
-
-       if (*error)
-               g_error_free (*error);
-       *error = NULL;
-
+       g_clear_error (&err);
        uri_unc = NULL;
 
-       document = get_document_from_uri (uri, TRUE, &compression, error);
-
-       if (*error != NULL) {
+       document = get_document_from_uri (uri, FALSE, &compression, &err);
+       if (document == NULL) {
+               g_assert (err != NULL);
+               g_propagate_error (error, err);
                return NULL;
        }
 
-       uri_unc = ev_file_uncompress (uri, compression, error);
+       uri_unc = ev_file_uncompress (uri, compression, &err);
        if (uri_unc) {
                g_object_set_data_full (G_OBJECT (document),
                                        "uri-uncompressed",
                                        uri_unc,
                                        (GDestroyNotify) free_uncompressed_uri);
-       }
-
-       if (*error != NULL) {
+       } else if (err != NULL) {
                /* Error uncompressing file */
-               if (document)
-                       g_object_unref (document);
+               g_propagate_error (error, err);
+
+               g_object_unref (document);
                return NULL;
        }
        
-       result = ev_document_load (document, uri_unc ? uri_unc : uri, error);
-
+       result = ev_document_load (document, uri_unc ? uri_unc : uri, &err);
        if (result == FALSE) {
-               if (*error == NULL) {
-                       g_set_error (error,
-                                    EV_DOCUMENT_ERROR,
-                                    0,
-                                    _("Unknown MIME Type"));
-               } else if ((*error)->domain == EV_DOCUMENT_ERROR &&
-                          (*error)->code == EV_DOCUMENT_ERROR_ENCRYPTED) {
+               if (err == NULL) {
+                       /* FIXME: this really should not happen; the backend should
+                        * always return a meaningful error.
+                        */
+                       g_set_error_literal (&err,
+                                             EV_DOCUMENT_ERROR,
+                                             EV_DOCUMENT_ERROR_INVALID,
+                                             _("Unknown MIME Type"));
+               } else if (g_error_matches (err, EV_DOCUMENT_ERROR, EV_DOCUMENT_ERROR_ENCRYPTED)) {
+                       g_propagate_error (error, err);
                        return document;
                }
 
-               if (document)
-                       g_object_unref (document);
+               g_object_unref (document);
                document = NULL;
+
+               g_propagate_error (error, err);
        }
        
        return document;
 }
 
 static void
-file_filter_add_mime_list_and_free (GtkFileFilter *filter, GList *mime_types)
+file_filter_add_mime_types (EvTypeInfo *info, GtkFileFilter *filter)
 {
-       GList *l;
+       const gchar *mime_type;
+       gint         i = 0;
 
-       for (l = mime_types; l != NULL; l = l->next) {
-               gtk_file_filter_add_mime_type (filter, l->data);
-       }
-
-       g_list_foreach (mime_types, (GFunc)g_free, NULL);
-       g_list_free (mime_types);
+       while ((mime_type = info->mime_types[i++]))
+               gtk_file_filter_add_mime_type (filter, mime_type);
 }
 
-void 
+/**
+ * ev_document_factory_add_filters:
+ * @chooser: a #GtkFileChooser
+ * @document: a #EvDocument, or %NULL
+ *
+ * Adds some file filters to @chooser.
+ * Always add a "All documents" format.
+ * 
+ * If @document is not %NULL, adds a #GtkFileFilter for @document's MIME type.
+ *
+ * If @document is %NULL, adds a #GtkFileFilter for each document type that evince
+ * can handle.
+ */
+void
 ev_document_factory_add_filters (GtkWidget *chooser, EvDocument *document)
 {
-       EvBackend backend = 0;
-       GList *mime_types;
+       GList         *all_types;
        GtkFileFilter *filter;
        GtkFileFilter *default_filter;
        GtkFileFilter *document_filter;
 
-       if (document != NULL) {
-               backend = ev_document_factory_get_backend (document);
-       }
+        g_return_if_fail (GTK_IS_FILE_CHOOSER (chooser));
+        g_return_if_fail (document == NULL || EV_IS_DOCUMENT (document));
 
+       all_types = ev_backends_manager_get_all_types_info ();
+       
        default_filter = document_filter = filter = gtk_file_filter_new ();
        gtk_file_filter_set_name (filter, _("All Documents"));
-       mime_types = ev_document_factory_get_all_mime_types ();
-       file_filter_add_mime_list_and_free (filter, mime_types);
+       g_list_foreach (all_types, (GFunc)file_filter_add_mime_types, filter);
        gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
 
-#ifdef ENABLE_PS
-       if (document == NULL || backend == EV_BACKEND_PS) {
-               default_filter = filter = gtk_file_filter_new ();
-               gtk_file_filter_set_name (filter, _("PostScript Documents"));
-               mime_types = ev_document_factory_get_mime_types (EV_BACKEND_PS);
-               file_filter_add_mime_list_and_free (filter, mime_types);
-               gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
-       }
-#endif
+       if (document) {
+               EvTypeInfo *info;
 
-#ifdef ENABLE_PDF
-       if (document == NULL || backend == EV_BACKEND_PDF) {
+               info = ev_backends_manager_get_document_type_info (document);
                default_filter = filter = gtk_file_filter_new ();
-               gtk_file_filter_set_name (filter, _("PDF Documents"));
-               mime_types = ev_document_factory_get_mime_types (EV_BACKEND_PDF);
-               file_filter_add_mime_list_and_free (filter, mime_types);
+               gtk_file_filter_set_name (filter, info->desc);
+               file_filter_add_mime_types (info, filter);
+               g_free (info);
                gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
-       }
-#endif
+       } else {
+               GList *l;
 
-#ifdef ENABLE_PIXBUF
-       if (document == NULL || backend == EV_BACKEND_PIXBUF) {
-               default_filter = filter = gtk_file_filter_new ();
-               gtk_file_filter_set_name (filter, _("Images"));
-               mime_types = ev_document_factory_get_mime_types (EV_BACKEND_PIXBUF);
-               file_filter_add_mime_list_and_free (filter, mime_types);
-               gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
-       }
-#endif
+               for (l = all_types; l; l = g_list_next (l)){
+                       EvTypeInfo *info;
 
-#ifdef ENABLE_DVI
-       if (document == NULL || backend == EV_BACKEND_DVI) {
-               default_filter = filter = gtk_file_filter_new ();
-               gtk_file_filter_set_name (filter, _("DVI Documents"));
-               mime_types = ev_document_factory_get_mime_types (EV_BACKEND_DVI);
-               file_filter_add_mime_list_and_free (filter, mime_types);
-               gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
-       }
-#endif
+                       info = (EvTypeInfo *)l->data;
 
-#ifdef ENABLE_DJVU
-       if (document == NULL || backend == EV_BACKEND_DJVU) {
-               default_filter = filter = gtk_file_filter_new ();
-               gtk_file_filter_set_name (filter, _("Djvu Documents"));
-               mime_types = ev_document_factory_get_mime_types (EV_BACKEND_DJVU);
-               file_filter_add_mime_list_and_free (filter, mime_types);
-               gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
-       }
-#endif 
-
-#ifdef ENABLE_COMICS
-       if (document == NULL || backend == EV_BACKEND_COMICS) {
-               default_filter = filter = gtk_file_filter_new ();
-               gtk_file_filter_set_name (filter, _("Comic Books"));
-               mime_types = ev_document_factory_get_mime_types (EV_BACKEND_COMICS);
-               file_filter_add_mime_list_and_free (filter, mime_types);
-               gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
+                       default_filter = filter = gtk_file_filter_new ();
+                       gtk_file_filter_set_name (filter, info->desc);
+                       file_filter_add_mime_types (info, filter);
+                       gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
+               }
        }
-#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 
+       g_list_foreach (all_types, (GFunc)g_free, NULL);
+       g_list_free (all_types);
 
        filter = gtk_file_filter_new ();
        gtk_file_filter_set_name (filter, _("All Files"));