diff options
| author | Monsta <[email protected]> | 2015-08-24 22:25:31 +0300 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-08-31 14:51:17 +0200 |
| commit | e5e2b894e070fd0509c0016e7285d78c6ff543c3 (patch) | |
| tree | 6b52f77438b32132f46da5521b3ccc693ba10123 /libdocument | |
| parent | 0f060b5170016a28cf742edbc623dea906fa7f15 (diff) | |
| download | atril-e5e2b894e070fd0509c0016e7285d78c6ff543c3.tar.bz2 atril-e5e2b894e070fd0509c0016e7285d78c6ff543c3.tar.xz | |
drop support for win32/osx/hildon, make smclient mandatory
Diffstat (limited to 'libdocument')
| -rw-r--r-- | libdocument/ev-backends-manager.c | 10 | ||||
| -rw-r--r-- | libdocument/ev-file-helpers.c | 8 | ||||
| -rw-r--r-- | libdocument/ev-init.c | 61 |
3 files changed, 0 insertions, 79 deletions
diff --git a/libdocument/ev-backends-manager.c b/libdocument/ev-backends-manager.c index 6313b5ee..d071b67a 100644 --- a/libdocument/ev-backends-manager.c +++ b/libdocument/ev-backends-manager.c @@ -47,17 +47,7 @@ static const gchar * backends_dir (void) { if (!backendsdir) { -#ifdef G_OS_WIN32 - gchar *dir; - - dir = g_win32_get_package_installation_directory_of_module (NULL); - backendsdir = g_build_filename (dir, "lib", "atril", - EV_BACKENDSBINARYVERSION, - "backends", NULL); - g_free (dir); -#else backendsdir = g_strdup (EV_BACKENDSDIR); -#endif } return backendsdir; diff --git a/libdocument/ev-file-helpers.c b/libdocument/ev-file-helpers.c index ce998b2a..1206db63 100644 --- a/libdocument/ev-file-helpers.c +++ b/libdocument/ev-file-helpers.c @@ -455,7 +455,6 @@ get_mime_type_from_uri (const gchar *uri, GError **error) static gchar * get_mime_type_from_data (const gchar *uri, GError **error) { -#ifndef G_OS_WIN32 GFile *file; GFileInputStream *input_stream; gssize size_read; @@ -495,13 +494,6 @@ get_mime_type_from_data (const gchar *uri, GError **error) mime_type = g_content_type_get_mime_type (content_type); g_free (content_type); return mime_type; -#else - /* - * On Windows, the implementation of g_content_type_guess() is too limited at the moment, so we do not - * use it and fall back to get_mime_type_from_uri() - */ - return get_mime_type_from_uri (uri, error); -#endif /* G_OS_WIN32 */ } /** diff --git a/libdocument/ev-init.c b/libdocument/ev-init.c index bb92ad13..15cb555e 100644 --- a/libdocument/ev-init.c +++ b/libdocument/ev-init.c @@ -21,9 +21,6 @@ #include <glib.h> #include <glib/gi18n-lib.h> -#ifdef G_OS_WIN32 -#include <windows.h> -#endif #include "ev-init.h" #include "ev-backends-manager.h" @@ -32,63 +29,10 @@ static int ev_init_count; -#ifdef G_OS_WIN32 - -static HMODULE evdocument_dll = NULL; -static gchar *locale_dir = NULL; - -#ifdef DLL_EXPORT -BOOL WINAPI -DllMain (HINSTANCE hinstDLL, - DWORD fdwReason, - LPVOID lpvReserved) -{ - if (fdwReason == DLL_PROCESS_ATTACH) - evdocument_dll = hinstDLL; - - return TRUE; -} -#endif - -static const gchar * -_ev_win32_get_locale_dir (HMODULE module) -{ - if (locale_dir) - return locale_dir; - - gchar *install_dir = NULL, *utf8_locale_dir; - gchar *retval = NULL; - - if (evdocument_dll != NULL) - install_dir = - g_win32_get_package_installation_directory_of_module (module); - - if (install_dir) { - utf8_locale_dir = g_build_filename (install_dir, - "share", "locale", NULL); - - locale_dir = g_win32_locale_filename_from_utf8 (utf8_locale_dir); - - g_free (install_dir); - g_free (utf8_locale_dir); - } - - if (!locale_dir) - locale_dir = g_strdup (""); - - return locale_dir; -} - -#endif - const gchar * ev_get_locale_dir (void) { -#ifdef G_OS_WIN32 - return _ev_win32_get_locale_dir (evdocument_dll); -#else return MATELOCALEDIR; -#endif } /** @@ -134,11 +78,6 @@ ev_shutdown (void) if (--ev_init_count > 0) return; -#ifdef G_OS_WIN32 - if (locale_dir != NULL) - g_free(locale_dir); -#endif - _ev_backends_manager_shutdown (); _ev_file_helpers_shutdown (); _ev_debug_shutdown (); |