summaryrefslogtreecommitdiff
path: root/gio/glib-compile-resources.c
diff options
context:
space:
mode:
Diffstat (limited to 'gio/glib-compile-resources.c')
-rw-r--r--gio/glib-compile-resources.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/gio/glib-compile-resources.c b/gio/glib-compile-resources.c
index 9c04bfafc..d7dd58014 100644
--- a/gio/glib-compile-resources.c
+++ b/gio/glib-compile-resources.c
@@ -314,20 +314,15 @@ end_element (GMarkupParseContext *context,
}
close (fd);
- proc = g_subprocess_new_simple_argl (G_SUBPROCESS_STREAM_DISPOSITION_NULL,
- G_SUBPROCESS_STREAM_DISPOSITION_INHERIT,
- error,
- xmllint,
- "--nonet", "--noblanks",
- "--output", tmp_file,
- real_file, NULL);
+ proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, error,
+ xmllint, "--nonet", "--noblanks", "--output", tmp_file, real_file, NULL);
g_free (real_file);
real_file = NULL;
if (!proc)
goto cleanup;
- if (!g_subprocess_wait_sync_check (proc, NULL, error))
+ if (!g_subprocess_wait_check (proc, NULL, error))
{
g_object_unref (proc);
goto cleanup;
@@ -365,15 +360,12 @@ end_element (GMarkupParseContext *context,
}
close (fd);
- proc = g_subprocess_new_simple_argl (G_SUBPROCESS_STREAM_DISPOSITION_NULL,
- G_SUBPROCESS_STREAM_DISPOSITION_INHERIT,
- error,
- gdk_pixbuf_pixdata, real_file, tmp_file2,
- NULL);
+ proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, error,
+ gdk_pixbuf_pixdata, real_file, tmp_file2, NULL);
g_free (real_file);
real_file = NULL;
- if (!g_subprocess_wait_sync_check (proc, NULL, error))
+ if (!g_subprocess_wait_check (proc, NULL, error))
{
g_object_unref (proc);
goto cleanup;