[windows] Guess texmf.cnf location from mktexpk executable

[evince.git] / backend / dvi / dvi-document.c

diff --git a/backend/dvi/dvi-document.c b/backend/dvi/dvi-document.c
index a1097c94563d4b775db61b9a1108bb6149e94813..d1411a8e6cc21f95dbdd5ab28e329a4ed19d378b 100644 (file)
--- a/backend/dvi/dvi-document.c
+++ b/backend/dvi/dvi-document.c
@@ -20,6 +20,7 @@
 #include "config.h"
 
 #include "dvi-document.h"
+#include "texmfcnf.h"
 #include "ev-document-thumbnails.h"
 #include "ev-document-misc.h"
 #include "ev-file-exporter.h"
@@ -32,7 +33,12 @@
 
 #include <glib/gi18n-lib.h>
 #include <ctype.h>
-#include <sys/wait.h>
+#ifdef G_OS_WIN32
+# define WIFEXITED(x) ((x) != 3)
+# define WEXITSTATUS(x) (x)
+#else
+# include <sys/wait.h>
+#endif
 #include <stdlib.h>
 
 GMutex *dvi_context_mutex = NULL;
@@ -44,12 +50,12 @@ enum {
 
 struct _DviDocumentClass
 {
-       GObjectClass parent_class;
+       EvDocumentClass parent_class;
 };
 
 struct _DviDocument
 {
-       GObject parent_instance;
+       EvDocument parent_instance;
 
        DviContext *context;
        DviPageSpec *spec;
@@ -68,7 +74,6 @@ struct _DviDocument
 
 typedef struct _DviDocumentClass DviDocumentClass;
 
-static void dvi_document_document_iface_init            (EvDocumentIface           *iface);
 static void dvi_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
 static void dvi_document_file_exporter_iface_init      (EvFileExporterIface       *iface);
 static void dvi_document_do_color_special               (DviContext                *dvi,
@@ -230,40 +235,29 @@ dvi_document_finalize (GObject *object)
        G_OBJECT_CLASS (dvi_document_parent_class)->finalize (object);
 }
 
-
 static void
 dvi_document_class_init (DviDocumentClass *klass)
 {
-       GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+       GObjectClass    *gobject_class = G_OBJECT_CLASS (klass);
+       EvDocumentClass *ev_document_class = EV_DOCUMENT_CLASS (klass);
+       gchar *texmfcnf;
 
        gobject_class->finalize = dvi_document_finalize;
 
-       mdvi_init_kpathsea ("evince", MDVI_MFMODE, MDVI_FALLBACK_FONT, MDVI_DPI);
+       texmfcnf = get_texmfcnf();
+       mdvi_init_kpathsea ("evince", MDVI_MFMODE, MDVI_FALLBACK_FONT, MDVI_DPI, texmfcnf);
+       g_free(texmfcnf);
+
        mdvi_register_special ("Color", "color", NULL, dvi_document_do_color_special, 1);
        mdvi_register_fonts ();
 
        dvi_context_mutex = g_mutex_new ();
-}
-
-static EvDocumentInfo *
-dvi_document_get_info (EvDocument *document)
-{
-       EvDocumentInfo *info;
 
-       info = g_new0 (EvDocumentInfo, 1);
-
-       return info;
-}
-
-static void
-dvi_document_document_iface_init (EvDocumentIface *iface)
-{
-       iface->load = dvi_document_load;
-       iface->save = dvi_document_save;
-       iface->get_n_pages = dvi_document_get_n_pages;
-       iface->get_page_size = dvi_document_get_page_size;
-       iface->render = dvi_document_render;
-       iface->get_info = dvi_document_get_info;
+       ev_document_class->load = dvi_document_load;
+       ev_document_class->save = dvi_document_save;
+       ev_document_class->get_n_pages = dvi_document_get_n_pages;
+       ev_document_class->get_page_size = dvi_document_get_page_size;
+       ev_document_class->render = dvi_document_render;
 }
 
 static void