From: Hib Eris <hib@hiberis.nl>
Date: Mon, 21 Dec 2009 11:31:24 +0000 (+0100)
Subject: [windows] Do not use g_content_type_guess() on Windows
X-Git-Tag: EVINCE_2_29_5~43
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=e8587a401d8fe01cdc60b2b9fb88b14750c46a2e;p=evince.git

[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.
---

diff --git a/libdocument/ev-file-helpers.c b/libdocument/ev-file-helpers.c
index 01bf089e..87fd351c 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 */
 }
 
 /**