[glib] gio/test/resources.c: Fix for Windows
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gio/test/resources.c: Fix for Windows
- Date: Mon, 4 Nov 2013 02:31:59 +0000 (UTC)
commit 39a62a064b55eead4142c5585a25b86c57759ec5
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Tue Oct 29 19:17:32 2013 +0800
gio/test/resources.c: Fix for Windows
We need to use g_content_type_get_mime_type() to look up the mime type of
the file from the registry on the content type that was acquired on
Windows, as g_file_info_get_content_type() does not acquire the
file mime type (unlike on *NIX).
g_content_type_get_mime_type() on *NIX is more or less an no-op as it
simply returns the g_strdup()-ed version of the passed-in content type.
This will enable the resources test to pass on Windows.
https://bugzilla.gnome.org/show_bug.cgi?id=711047
gio/tests/resources.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gio/tests/resources.c b/gio/tests/resources.c
index 495c05b..5cad1e4 100644
--- a/gio/tests/resources.c
+++ b/gio/tests/resources.c
@@ -450,7 +450,7 @@ test_uri_query_info (void)
GBytes *data;
GFile *file;
GFileInfo *info;
- const char *content_type;
+ const char *content_type, *mime_type;
loaded_file = g_file_get_contents (g_test_get_filename (G_TEST_BUILT, "test.gresource", NULL),
&content, &content_size, NULL);
@@ -471,7 +471,9 @@ test_uri_query_info (void)
content_type = g_file_info_get_content_type (info);
g_assert (content_type);
- g_assert_cmpstr (content_type, ==, "text/plain");
+ mime_type = g_content_type_get_mime_type (content_type);
+ g_assert (mime_type);
+ g_assert_cmpstr (mime_type, ==, "text/plain");
g_object_unref (info);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]