summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2014-03-18 12:54:10 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2014-05-12 22:14:05 +0800
commitc2a828772b30a0c10a8f4b15d7fc841f26b807b8 (patch)
treeadf7ca46ec3766ba9ef661509e0ade99ed7d3258
parent54d1751fd824ded1f1437572b5c16e2db4154db5 (diff)
gio/gtestdbus.c: Fix write_config_file() for Windows
Windows does not like g_unlink() to be called on files whose file descriptor is still open, so doing that would cause a permission denied error. Since the fd is not used in that function after acquiring the temp file, close it earlier before g_file_set_contents(), so that it can complete successfully. This fixes a number of GTK+ tests on Windows. https://bugzilla.gnome.org/show_bug.cgi?id=719344
-rw-r--r--gio/gtestdbus.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/gio/gtestdbus.c b/gio/gtestdbus.c
index 17a949675..4b51d29bb 100644
--- a/gio/gtestdbus.c
+++ b/gio/gtestdbus.c
@@ -566,13 +566,12 @@ write_config_file (GTestDBus *self)
" </policy>\n"
"</busconfig>\n");
+ close (fd);
g_file_set_contents (path, contents->str, contents->len, &error);
g_assert_no_error (error);
g_string_free (contents, TRUE);
- close (fd);
-
return path;
}