Fix memory management

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

diff --git a/backend/ev-document-factory.c b/backend/ev-document-factory.c
index 251ede3fc2af00e666007f569af12f36f0443fda..a695c452f6c8b171f116292e962fe9c119acef38 100644 (file)
--- a/backend/ev-document-factory.c
+++ b/backend/ev-document-factory.c
@@ -28,13 +28,18 @@
 #include "ev-poppler.h"
 #include "pixbuf-document.h"
 #include "tiff-document.h"
+#ifdef ENABLE_PS
 #include "ps-document.h"
+#endif
 #ifdef ENABLE_DVI
 #include "dvi-document.h"
 #endif
 #ifdef ENABLE_DJVU
 #include "djvu-document.h"
 #endif
+#ifdef ENABLE_COMICS
+#include "comics-document.h"
+#endif
 
 #include <string.h>
 
@@ -50,10 +55,12 @@ const EvDocumentType document_types[] = {
        /* PDF: */
        {"application/pdf",            EV_BACKEND_PDF,  pdf_document_get_type},
 
+#ifdef ENABLE_PS
        /* Postscript: */
        {"application/postscript",     EV_BACKEND_PS,   ps_document_get_type},
        {"application/x-gzpostscript", EV_BACKEND_PS,   ps_document_get_type},
        {"image/x-eps",                EV_BACKEND_PS,   ps_document_get_type},
+#endif
 
 #ifdef ENABLE_TIFF
        /* Tiff: */
@@ -69,8 +76,15 @@ const EvDocumentType document_types[] = {
        /* dvi: */
        {"application/x-dvi",          EV_BACKEND_DVI,  dvi_document_get_type},
 #endif
+
+#ifdef ENABLE_COMICS
+       /* cbr/cbz: */
+       {"application/x-cbr",           EV_BACKEND_COMICS,  comics_document_get_type},
+       {"application/x-cbz",           EV_BACKEND_COMICS,  comics_document_get_type},
+#endif
 };
 
+#ifdef ENABLE_PIXBUF
 /* Would be nice to have this in gdk-pixbuf */
 static gboolean
 mime_type_supported_by_gdk_pixbuf (const gchar *mime_type)
@@ -108,7 +122,7 @@ mime_type_supported_by_gdk_pixbuf (const gchar *mime_type)
 
        return retval;
 }
-
+#endif
 
 static GType
 ev_document_type_get_from_mime (const char *mime_type)
@@ -123,10 +137,11 @@ ev_document_type_get_from_mime (const char *mime_type)
                        return document_types[i].document_type_factory_callback();
                }
        }
-
+#ifdef ENABLE_PIXBUF
        if (mime_type_supported_by_gdk_pixbuf (mime_type)) {
                return pixbuf_document_get_type ();
        }
+#endif
 
        return G_TYPE_INVALID;
 }
@@ -138,7 +153,7 @@ ev_document_factory_get_document (const char *mime_type)
        
        type = ev_document_type_get_from_mime (mime_type);
 
-       if (type != G_TYPE_NONE) {
+       if (type != G_TYPE_INVALID) {
                return g_object_new (type, NULL);
        }