diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2013-01-21 16:22:25 -0500 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2013-01-21 16:22:25 -0500 |
| commit | 61156955e688e0350ed48da6c3dc199e0f52d2e2 (patch) | |
| tree | a9425aa5d7e17cbc668b8a2b13086a2b07092eb5 /gio/glib-compile-resources.c | |
| parent | 4dd79e266b4e4b5110bced71ab51ca2afc709a81 (diff) | |
| download | glib-wip/subprocess-2013.tar.gz | |
more changeswip/subprocess-2013
Diffstat (limited to 'gio/glib-compile-resources.c')
| -rw-r--r-- | gio/glib-compile-resources.c | 20 |
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; |