[evince] [windows] Do not use g_content_type_guess() on Windows
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evince] [windows] Do not use g_content_type_guess() on Windows
- Date: Tue, 22 Dec 2009 16:31:57 +0000 (UTC)
commit e8587a401d8fe01cdc60b2b9fb88b14750c46a2e
Author: Hib Eris <hib hiberis nl>
Date: Mon Dec 21 12:31:24 2009 +0100
[windows] Do not use g_content_type_guess() on Windows
At the moment, the g_content_type_guess() implementation in glib for
Windows is too limited to be useful.
libdocument/ev-file-helpers.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/libdocument/ev-file-helpers.c b/libdocument/ev-file-helpers.c
index 01bf089..87fd351 100644
--- a/libdocument/ev-file-helpers.c
+++ b/libdocument/ev-file-helpers.c
@@ -438,6 +438,7 @@ 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;
@@ -477,6 +478,13 @@ 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 */
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]