diff options
| author | raveit65 <[email protected]> | 2016-06-02 16:11:53 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2016-06-02 16:11:53 +0200 |
| commit | 6bccceb6b8573f9967331dde0a70cabeaccb6f44 (patch) | |
| tree | e6cb07dd3d4241482f9598bc9686541de05557a9 /backend/dvi/dvi-document.c | |
| parent | 3551d1c5e7fff4665b12b607f87529995307338c (diff) | |
| parent | 3a2ccdaa3d399971c8b67df271646860a4327f27 (diff) | |
| download | atril-6bccceb6b8573f9967331dde0a70cabeaccb6f44.tar.bz2 atril-6bccceb6b8573f9967331dde0a70cabeaccb6f44.tar.xz | |
Merge branch 'master' of github.com:mate-desktop/atril
Diffstat (limited to 'backend/dvi/dvi-document.c')
| -rw-r--r-- | backend/dvi/dvi-document.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/backend/dvi/dvi-document.c b/backend/dvi/dvi-document.c index 304283d7..6ffa2514 100644 --- a/backend/dvi/dvi-document.c +++ b/backend/dvi/dvi-document.c @@ -20,7 +20,6 @@ #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" @@ -33,12 +32,7 @@ #include <glib/gi18n-lib.h> #include <ctype.h> -#ifdef G_OS_WIN32 -# define WIFEXITED(x) ((x) != 3) -# define WEXITSTATUS(x) (x) -#else -# include <sys/wait.h> -#endif +#include <sys/wait.h> #include <stdlib.h> GMutex dvi_context_mutex; @@ -246,13 +240,10 @@ dvi_document_class_init (DviDocumentClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); EvDocumentClass *ev_document_class = EV_DOCUMENT_CLASS (klass); - gchar *texmfcnf; gobject_class->finalize = dvi_document_finalize; - texmfcnf = get_texmfcnf(); - mdvi_init_kpathsea ("atril", MDVI_MFMODE, MDVI_FALLBACK_FONT, MDVI_DPI, texmfcnf); - g_free(texmfcnf); + mdvi_init_kpathsea ("atril", MDVI_MFMODE, MDVI_FALLBACK_FONT, MDVI_DPI, getenv("TEXMFCNF")); mdvi_register_special ("Color", "color", NULL, dvi_document_do_color_special, 1); mdvi_register_fonts (); |