[glib/wip/le-gsubprocess: 766/767] gsubprocess: Update since to 2.40
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/le-gsubprocess: 766/767] gsubprocess: Update since to 2.40
- Date: Sun, 13 Oct 2013 19:39:52 +0000 (UTC)
commit 83650db2f8298d888a4fa68980a0e90a5bfd3b36
Author: Colin Walters <walters verbum org>
Date: Sun Oct 13 17:23:05 2013 +0100
gsubprocess: Update since to 2.40
gio/gsubprocess.h | 54 ++++++++++++++++++++++----------------------
gio/gsubprocesslauncher.c | 55 ++++++++++++++++++++++++++++++++------------
gio/gsubprocesslauncher.h | 38 +++++++++++++++---------------
3 files changed, 86 insertions(+), 61 deletions(-)
---
diff --git a/gio/gsubprocess.h b/gio/gsubprocess.h
index 8ae002b..607424f 100644
--- a/gio/gsubprocess.h
+++ b/gio/gsubprocess.h
@@ -35,94 +35,94 @@ G_BEGIN_DECLS
#define G_SUBPROCESS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SUBPROCESS, GSubprocess))
#define G_IS_SUBPROCESS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SUBPROCESS))
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
GType g_subprocess_get_type (void) G_GNUC_CONST;
/**** Core API ****/
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
GSubprocess * g_subprocess_new (GSubprocessFlags flags,
GError **error,
const gchar *argv0,
...) G_GNUC_NULL_TERMINATED;
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
GSubprocess * g_subprocess_newv (const gchar * const *argv,
GSubprocessFlags flags,
GError **error);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
GOutputStream * g_subprocess_get_stdin_pipe (GSubprocess *self);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
GInputStream * g_subprocess_get_stdout_pipe (GSubprocess *self);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
GInputStream * g_subprocess_get_stderr_pipe (GSubprocess *self);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
const gchar * g_subprocess_get_identifier (GSubprocess *self);
#ifdef G_OS_UNIX
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_send_signal (GSubprocess *self,
gint signal_num);
#endif
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_force_exit (GSubprocess *self);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
gboolean g_subprocess_wait (GSubprocess *self,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_wait_async (GSubprocess *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
gboolean g_subprocess_wait_finish (GSubprocess *self,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
gboolean g_subprocess_wait_check (GSubprocess *self,
GCancellable *cancellable,
GError **error);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_wait_check_async (GSubprocess *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
gboolean g_subprocess_wait_check_finish (GSubprocess *self,
GAsyncResult *result,
GError **error);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
gint g_subprocess_get_status (GSubprocess *self);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
gboolean g_subprocess_get_successful (GSubprocess *self);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
gboolean g_subprocess_get_if_exited (GSubprocess *self);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
gint g_subprocess_get_exit_status (GSubprocess *self);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
gboolean g_subprocess_get_if_signaled (GSubprocess *self);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
gint g_subprocess_get_term_sig (GSubprocess *self);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
gboolean g_subprocess_communicate (GSubprocess *subprocess,
const gchar *stdin_data,
gssize stdin_length,
@@ -132,7 +132,7 @@ gboolean g_subprocess_communicate (GSubprocess *s
gchar **stderr_data,
gsize *stderr_length,
GError **error);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_communicate_async (GSubprocess *subprocess,
const gchar *stdin_data,
gssize stdin_length,
@@ -140,7 +140,7 @@ void g_subprocess_communicate_async (GSubprocess *s
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
gboolean g_subprocess_communicate_finish (GSubprocess *subprocess,
GAsyncResult *result,
gchar **stdout_data,
@@ -149,20 +149,20 @@ gboolean g_subprocess_communicate_finish (GSubprocess *s
gsize *stderr_length,
GError **error);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
gboolean g_subprocess_communicate_bytes (GSubprocess *subprocess,
GBytes *stdin_bytes,
GCancellable *cancellable,
GBytes **stdout_bytes,
GBytes **stderr_bytes,
GError **error);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_communicate_bytes_async (GSubprocess *subprocess,
GBytes *stdin_bytes,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
gboolean g_subprocess_communicate_bytes_finish (GSubprocess *subprocess,
GAsyncResult *result,
GBytes **stdout_bytes,
diff --git a/gio/gsubprocesslauncher.c b/gio/gsubprocesslauncher.c
index d0ecd93..af12578 100644
--- a/gio/gsubprocesslauncher.c
+++ b/gio/gsubprocesslauncher.c
@@ -28,7 +28,7 @@
* options. It can also be used to launch multiple subprocesses with
* a similar configuration.
*
- * Since: 2.36
+ * Since: 2.40
*/
#define ALL_STDIN_FLAGS (G_SUBPROCESS_FLAGS_STDIN_PIPE | \
@@ -188,7 +188,7 @@ g_subprocess_launcher_class_init (GSubprocessLauncherClass *class)
* environment of the calling process is made at the time of this call
* and will be used as the environment that the process is launched in.
*
- * Since: 2.36
+ * Since: 2.40
**/
GSubprocessLauncher *
g_subprocess_launcher_new (GSubprocessFlags flags)
@@ -220,7 +220,7 @@ g_subprocess_launcher_new (GSubprocessFlags flags)
* encoding. On UNIX, this means that they can be arbitrary byte
* strings. On Windows, they should be in UTF-8.
*
- * Since: 2.36
+ * Since: 2.40
**/
void
g_subprocess_launcher_set_environ (GSubprocessLauncher *self,
@@ -245,7 +245,7 @@ g_subprocess_launcher_set_environ (GSubprocessLauncher *self,
* strings. On Windows, they should be in UTF-8.
*
*
- * Since: 2.36
+ * Since: 2.40
**/
void
g_subprocess_launcher_setenv (GSubprocessLauncher *self,
@@ -268,7 +268,7 @@ g_subprocess_launcher_setenv (GSubprocessLauncher *self,
* this means that they can be arbitrary byte strings. On Windows, they
* should be in UTF-8.
*
- * Since: 2.36
+ * Since: 2.40
**/
void
g_subprocess_launcher_unsetenv (GSubprocessLauncher *self,
@@ -291,7 +291,7 @@ g_subprocess_launcher_unsetenv (GSubprocessLauncher *self,
*
* Returns: the value of the environment variable, %NULL if unset
*
- * Since: 2.36
+ * Since: 2.40
**/
const gchar *
g_subprocess_launcher_getenv (GSubprocessLauncher *self,
@@ -311,7 +311,7 @@ g_subprocess_launcher_getenv (GSubprocessLauncher *self,
* By default processes are launched with the current working directory
* of the launching process at the time of launch.
*
- * Since: 2.36
+ * Since: 2.40
**/
void
g_subprocess_launcher_set_cwd (GSubprocessLauncher *self,
@@ -339,7 +339,7 @@ g_subprocess_launcher_set_cwd (GSubprocessLauncher *self,
* function like g_subprocess_launcher_set_stdin_file_path() or
* g_subprocess_launcher_take_stdout_fd().
*
- * Since: 2.36
+ * Since: 2.40
**/
void
g_subprocess_launcher_set_flags (GSubprocessLauncher *self,
@@ -387,7 +387,7 @@ assign_fd (gint *fd_ptr, gint fd)
*
* This feature is only available on UNIX.
*
- * Since: 2.36
+ * Since: 2.40
**/
void
g_subprocess_launcher_set_stdin_file_path (GSubprocessLauncher *self,
@@ -424,7 +424,7 @@ g_subprocess_launcher_set_stdin_file_path (GSubprocessLauncher *self,
*
* This feature is only available on UNIX.
*
- * Since: 2.36
+ * Since: 2.40
**/
void
g_subprocess_launcher_take_stdin_fd (GSubprocessLauncher *self,
@@ -451,7 +451,7 @@ g_subprocess_launcher_take_stdin_fd (GSubprocessLauncher *self,
*
* This feature is only available on UNIX.
*
- * Since: 2.36
+ * Since: 2.40
**/
void
g_subprocess_launcher_set_stdout_file_path (GSubprocessLauncher *self,
@@ -487,7 +487,7 @@ g_subprocess_launcher_set_stdout_file_path (GSubprocessLauncher *self,
*
* This feature is only available on UNIX.
*
- * Since: 2.36
+ * Since: 2.40
**/
void
g_subprocess_launcher_take_stdout_fd (GSubprocessLauncher *self,
@@ -517,7 +517,7 @@ g_subprocess_launcher_take_stdout_fd (GSubprocessLauncher *self,
*
* This feature is only available on UNIX.
*
- * Since: 2.36
+ * Since: 2.40
**/
void
g_subprocess_launcher_set_stderr_file_path (GSubprocessLauncher *self,
@@ -552,7 +552,7 @@ g_subprocess_launcher_set_stderr_file_path (GSubprocessLauncher *self,
*
* This feature is only available on UNIX.
*
- * Since: 2.36
+ * Since: 2.40
**/
void
g_subprocess_launcher_take_stderr_fd (GSubprocessLauncher *self,
@@ -583,7 +583,7 @@ g_subprocess_launcher_take_stderr_fd (GSubprocessLauncher *self,
*
* Child setup functions are only available on UNIX.
*
- * Since: 2.36
+ * Since: 2.40
**/
void
g_subprocess_launcher_set_child_setup (GSubprocessLauncher *self,
@@ -600,6 +600,19 @@ g_subprocess_launcher_set_child_setup (GSubprocessLauncher *self,
}
#endif
+/**
+ * g_subprocess_launcher_spawn:
+ * @self: a #GSubprocessLauncher
+ * @error: Error
+ * @argv0: Command line arguments
+ * @...: Continued arguments, %NULL terminated
+ *
+ * A convenience helper for creating a #GSubprocess given a provided
+ * varargs list of arguments.
+ *
+ * Since: 2.40
+ * Returns: (transfer full): A new #GSubprocess, or %NULL on error (and @error will be set)
+ **/
GSubprocess *
g_subprocess_launcher_spawn (GSubprocessLauncher *launcher,
GError **error,
@@ -629,6 +642,18 @@ g_subprocess_launcher_spawn (GSubprocessLauncher *launcher,
}
+/**
+ * g_subprocess_launcher_spawnv:
+ * @self: a #GSubprocessLauncher
+ * @argv: Command line arguments
+ * @error: Error
+ *
+ * A convenience helper for creating a #GSubprocess given a provided
+ * array of arguments.
+ *
+ * Since: 2.40
+ * Returns: (transfer full): A new #GSubprocess, or %NULL on error (and @error will be set)
+ **/
GSubprocess *
g_subprocess_launcher_spawnv (GSubprocessLauncher *launcher,
const gchar * const *argv,
diff --git a/gio/gsubprocesslauncher.h b/gio/gsubprocesslauncher.h
index 41b0652..2ba878c 100644
--- a/gio/gsubprocesslauncher.h
+++ b/gio/gsubprocesslauncher.h
@@ -1,7 +1,7 @@
/* GIO - GLib Input, Output and Streaming Library
*
- * Copyright © 2012 Colin Walters <walters verbum org>
- * Copyright © 2012 Canonical Limited
+ * Copyright © 2012,2013 Colin Walters <walters verbum org>
+ * Copyright © 2012,2013 Canonical Limited
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -37,71 +37,71 @@ G_BEGIN_DECLS
#define G_SUBPROCESS_LAUNCHER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_SUBPROCESS_LAUNCHER,
GSubprocessLauncher))
#define G_IS_SUBPROCESS_LAUNCHER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_SUBPROCESS_LAUNCHER))
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
GType g_subprocess_launcher_get_type (void) G_GNUC_CONST;
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
GSubprocessLauncher * g_subprocess_launcher_new (GSubprocessFlags flags);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
GSubprocess * g_subprocess_launcher_spawn (GSubprocessLauncher *self,
GError **error,
const gchar *argv0,
...);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
GSubprocess * g_subprocess_launcher_spawnv (GSubprocessLauncher *self,
const gchar * const *argv,
GError **error);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_environ (GSubprocessLauncher *self,
gchar **environ);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_launcher_setenv (GSubprocessLauncher *self,
const gchar *variable,
const gchar *value,
gboolean overwrite);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_launcher_unsetenv (GSubprocessLauncher *self,
const gchar *variable);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
const gchar * g_subprocess_launcher_getenv (GSubprocessLauncher *self,
const gchar *variable);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_cwd (GSubprocessLauncher *self,
const gchar *cwd);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_flags (GSubprocessLauncher *self,
GSubprocessFlags flags);
/* Extended I/O control, only available on UNIX */
#ifdef G_OS_UNIX
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_stdin_file_path (GSubprocessLauncher *self,
const gchar *path);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_launcher_take_stdin_fd (GSubprocessLauncher *self,
gint fd);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_stdout_file_path (GSubprocessLauncher *self,
const gchar *path);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_launcher_take_stdout_fd (GSubprocessLauncher *self,
gint fd);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_stderr_file_path (GSubprocessLauncher *self,
const gchar *path);
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_launcher_take_stderr_fd (GSubprocessLauncher *self,
gint fd);
/* Child setup, only available on UNIX */
-GLIB_AVAILABLE_IN_2_36
+GLIB_AVAILABLE_IN_2_40
void g_subprocess_launcher_set_child_setup (GSubprocessLauncher *self,
GSpawnChildSetupFunc child_setup,
gpointer user_data,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
