diff options
Diffstat (limited to 'previewer')
| -rw-r--r-- | previewer/Makefile.am | 4 | ||||
| -rw-r--r-- | previewer/ev-previewer-window.c | 13 | ||||
| -rw-r--r-- | previewer/ev-previewer.c | 33 |
3 files changed, 1 insertions, 49 deletions
diff --git a/previewer/Makefile.am b/previewer/Makefile.am index 5ac0d110..462665ac 100644 --- a/previewer/Makefile.am +++ b/previewer/Makefile.am @@ -26,10 +26,6 @@ atril_previewer_CFLAGS = \ atril_previewer_LDFLAGS = $(AM_LDFLAGS) -if PLATFORM_WIN32 -atril_previewer_LDFLAGS += -mwindows -endif - atril_previewer_LDADD = \ $(top_builddir)/libdocument/libatrildocument.la \ $(top_builddir)/libview/libatrilview.la \ diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c index 444d8e79..8c7249d5 100644 --- a/previewer/ev-previewer-window.c +++ b/previewer/ev-previewer-window.c @@ -479,18 +479,7 @@ ev_previewer_window_dispose (GObject *object) static gchar* data_dir (void) { - gchar *datadir; -#ifdef G_OS_WIN32 - gchar *dir; - - dir = g_win32_get_package_installation_directory_of_module (NULL); - datadir = g_build_filename (dir, "share", "atril", NULL); - g_free (dir); -#else - datadir = g_strdup (ATRILDATADIR); -#endif - - return datadir; + return g_strdup (ATRILDATADIR); } static void diff --git a/previewer/ev-previewer.c b/previewer/ev-previewer.c index b19fc08f..53cb2e22 100644 --- a/previewer/ev-previewer.c +++ b/previewer/ev-previewer.c @@ -27,15 +27,6 @@ #include "ev-previewer-window.h" -#ifdef G_OS_WIN32 -#include <io.h> -#include <conio.h> -#if !(_WIN32_WINNT >= 0x0500) -#error "_WIN32_WINNT must be defined >= 0x0500" -#endif -#include <windows.h> -#endif - static gboolean unlink_temp_file = FALSE; static const gchar *print_settings; static const gchar **filenames; @@ -106,30 +97,6 @@ main (gint argc, gchar **argv) EvDocumentModel *model; GError *error = NULL; -#ifdef G_OS_WIN32 - if (fileno (stdout) != -1 && - _get_osfhandle (fileno (stdout)) != -1) - { - /* stdout is fine, presumably redirected to a file or pipe */ - } - else - { - typedef BOOL (* WINAPI AttachConsole_t) (DWORD); - - AttachConsole_t p_AttachConsole = - (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole"); - - if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS)) - { - freopen ("CONOUT$", "w", stdout); - dup2 (fileno (stdout), 1); - freopen ("CONOUT$", "w", stderr); - dup2 (fileno (stderr), 2); - - } - } -#endif - #ifdef ENABLE_NLS /* Initialize the i18n stuff */ bindtextdomain (GETTEXT_PACKAGE, ev_get_locale_dir()); |