summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2016-06-02 16:11:53 +0200
committerraveit65 <[email protected]>2016-06-02 16:11:53 +0200
commit6bccceb6b8573f9967331dde0a70cabeaccb6f44 (patch)
treee6cb07dd3d4241482f9598bc9686541de05557a9
parent3551d1c5e7fff4665b12b607f87529995307338c (diff)
parent3a2ccdaa3d399971c8b67df271646860a4327f27 (diff)
downloadatril-6bccceb6b8573f9967331dde0a70cabeaccb6f44.tar.bz2
atril-6bccceb6b8573f9967331dde0a70cabeaccb6f44.tar.xz
Merge branch 'master' of github.com:mate-desktop/atril
Diffstat
-rw-r--r--backend/comics/comics-document.c15
-rw-r--r--backend/dvi/Makefile.am2
-rw-r--r--backend/dvi/dvi-document.c13
-rw-r--r--backend/dvi/texmfcnf.c64
-rw-r--r--backend/dvi/texmfcnf.h34
-rw-r--r--backend/tiff/tiff-document.c13
-rw-r--r--libdocument/ev-file-helpers.c3
7 files changed, 5 insertions, 139 deletions
diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
index 2601d356..e3e461ae 100644
--- a/backend/comics/comics-document.c
+++ b/backend/comics/comics-document.c
@@ -30,27 +30,14 @@
#include <glib/gstdio.h>
#include <gio/gio.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 "comics-document.h"
#include "ev-document-misc.h"
#include "ev-document-thumbnails.h"
#include "ev-file-helpers.h"
-#ifdef G_OS_WIN32
-/* On windows g_spawn_command_line_sync reads stdout in O_BINARY mode, not in O_TEXT mode.
- * As a consequence, newlines are in a platform dependent representation (\r\n). This
- * might be considered a bug in glib.
- */
-#define EV_EOL "\r\n"
-#else
#define EV_EOL "\n"
-#endif
typedef enum
{
diff --git a/backend/dvi/Makefile.am b/backend/dvi/Makefile.am
index f88bfbae..b090f47a 100644
--- a/backend/dvi/Makefile.am
+++ b/backend/dvi/Makefile.am
@@ -18,8 +18,6 @@ libdvidocument_la_SOURCES = \
dvi-document.h \
cairo-device.c \
cairo-device.h \
- texmfcnf.c \
- texmfcnf.h \
fonts.c \
fonts.h
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 ();
diff --git a/backend/dvi/texmfcnf.c b/backend/dvi/texmfcnf.c
deleted file mode 100644
index 9ca3125f..00000000
--- a/backend/dvi/texmfcnf.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2010, Hib Eris <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#include "texmfcnf.h"
-
-#include <glib.h>
-#include <stdlib.h>
-#ifdef G_OS_WIN32
-#include <windows.h>
-#endif
-
-gchar *
-get_texmfcnf(void)
-{
- char *env = getenv("TEXMFCNF");
- if (env)
- return g_strdup(env);
-
-#ifdef G_OS_WIN32
- gchar *texmfcnf = NULL;
- TCHAR path[_MAX_PATH];
-
- if (SearchPath(NULL, "mktexpk", ".exe", _MAX_PATH, path, NULL))
- {
- gchar *sdir, *sdir_parent, *sdir_grandparent;
- const gchar *texmfcnf_fmt = "{%s,%s,%s}{,{/share,}/texmf{-local,}/web2c}";
-
- sdir = g_path_get_dirname(path);
- sdir_parent = g_path_get_dirname(sdir);
- sdir_grandparent = g_path_get_dirname(sdir_parent);
-
- texmfcnf = g_strdup_printf(texmfcnf_fmt,
- sdir, sdir_parent, sdir_grandparent);
-
- g_free(sdir);
- g_free(sdir_parent);
- g_free(sdir_grandparent);
- }
- return texmfcnf;
-#else
- return NULL;
-#endif
-}
-
-
-
-
diff --git a/backend/dvi/texmfcnf.h b/backend/dvi/texmfcnf.h
deleted file mode 100644
index 11cb9b3d..00000000
--- a/backend/dvi/texmfcnf.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2010, Hib Eris <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef TEXMFCNF_H
-#define TEXMFCNF_H
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-gchar *get_texmfcnf(void);
-
-G_END_DECLS
-
-#endif /* TEXMFCNF_H */
-
-
-
-
diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c
index 1341900e..854051de 100644
--- a/backend/tiff/tiff-document.c
+++ b/backend/tiff/tiff-document.c
@@ -96,20 +96,7 @@ tiff_document_load (EvDocument *document,
push_handlers ();
-#ifdef G_OS_WIN32
-{
- wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, error);
- if (wfilename == NULL) {
- return FALSE;
- }
-
- tiff = TIFFOpenW (wfilename, "r");
-
- g_free (wfilename);
-}
-#else
tiff = TIFFOpen (filename, "r");
-#endif
if (tiff) {
guint32 w, h;
diff --git a/libdocument/ev-file-helpers.c b/libdocument/ev-file-helpers.c
index 1206db63..1826f8c3 100644
--- a/libdocument/ev-file-helpers.c
+++ b/libdocument/ev-file-helpers.c
@@ -84,7 +84,8 @@ _ev_tmp_dir (GError **error)
{
if (tmp_dir == NULL) {
- gchar *dirname, *prgname;
+ const gchar *prgname;
+ gchar *dirname;
prgname = g_get_prgname ();
dirname = g_strdup_printf ("%s-%u", prgname ? prgname : "unknown", getpid ());
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-28 04:50:38 +0000