[kdbus] sync with kdbus (kdbus.h - commit: 5ae1ecac44cb)

[platform/upstream/glib.git] / gio / gsubprocess.h

diff --git a/gio/gsubprocess.h b/gio/gsubprocess.h
index febdeb8..3f3de7d 100644 (file)
--- a/gio/gsubprocess.h
+++ b/gio/gsubprocess.h
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Colin Walters <walters@verbum.org>
  */
@@ -51,76 +49,76 @@ GSubprocess *    g_subprocess_newv                      (const gchar * const  *a
                                                          GError              **error);
 
 GLIB_AVAILABLE_IN_2_40
-GOutputStream *  g_subprocess_get_stdin_pipe            (GSubprocess          *self);
+GOutputStream *  g_subprocess_get_stdin_pipe            (GSubprocess          *subprocess);
 
 GLIB_AVAILABLE_IN_2_40
-GInputStream *   g_subprocess_get_stdout_pipe           (GSubprocess          *self);
+GInputStream *   g_subprocess_get_stdout_pipe           (GSubprocess          *subprocess);
 
 GLIB_AVAILABLE_IN_2_40
-GInputStream *   g_subprocess_get_stderr_pipe           (GSubprocess          *self);
+GInputStream *   g_subprocess_get_stderr_pipe           (GSubprocess          *subprocess);
 
 GLIB_AVAILABLE_IN_2_40
-const gchar *    g_subprocess_get_identifier            (GSubprocess          *self);
+const gchar *    g_subprocess_get_identifier            (GSubprocess          *subprocess);
 
 #ifdef G_OS_UNIX
 GLIB_AVAILABLE_IN_2_40
-void             g_subprocess_send_signal               (GSubprocess          *self,
+void             g_subprocess_send_signal               (GSubprocess          *subprocess,
                                                          gint                  signal_num);
 #endif
 
 GLIB_AVAILABLE_IN_2_40
-void             g_subprocess_force_exit                (GSubprocess          *self);
+void             g_subprocess_force_exit                (GSubprocess          *subprocess);
 
 GLIB_AVAILABLE_IN_2_40
-gboolean         g_subprocess_wait                      (GSubprocess          *self,
+gboolean         g_subprocess_wait                      (GSubprocess          *subprocess,
                                                          GCancellable         *cancellable,
                                                          GError              **error);
 
 GLIB_AVAILABLE_IN_2_40
-void             g_subprocess_wait_async                (GSubprocess          *self,
+void             g_subprocess_wait_async                (GSubprocess          *subprocess,
                                                          GCancellable         *cancellable,
                                                          GAsyncReadyCallback   callback,
                                                          gpointer              user_data);
 
 GLIB_AVAILABLE_IN_2_40
-gboolean         g_subprocess_wait_finish               (GSubprocess          *self,
+gboolean         g_subprocess_wait_finish               (GSubprocess          *subprocess,
                                                          GAsyncResult         *result,
                                                          GError              **error);
 
 GLIB_AVAILABLE_IN_2_40
-gboolean         g_subprocess_wait_check                (GSubprocess          *self,
+gboolean         g_subprocess_wait_check                (GSubprocess          *subprocess,
                                                          GCancellable         *cancellable,
                                                          GError              **error);
 
 GLIB_AVAILABLE_IN_2_40
-void             g_subprocess_wait_check_async          (GSubprocess          *self,
+void             g_subprocess_wait_check_async          (GSubprocess          *subprocess,
                                                          GCancellable         *cancellable,
                                                          GAsyncReadyCallback   callback,
                                                          gpointer              user_data);
 
 GLIB_AVAILABLE_IN_2_40
-gboolean         g_subprocess_wait_check_finish         (GSubprocess          *self,
+gboolean         g_subprocess_wait_check_finish         (GSubprocess          *subprocess,
                                                          GAsyncResult         *result,
                                                          GError              **error);
 
 
 GLIB_AVAILABLE_IN_2_40
-gint             g_subprocess_get_status                (GSubprocess          *self);
+gint             g_subprocess_get_status                (GSubprocess          *subprocess);
 
 GLIB_AVAILABLE_IN_2_40
-gboolean         g_subprocess_get_successful            (GSubprocess          *self);
+gboolean         g_subprocess_get_successful            (GSubprocess          *subprocess);
 
 GLIB_AVAILABLE_IN_2_40
-gboolean         g_subprocess_get_if_exited             (GSubprocess          *self);
+gboolean         g_subprocess_get_if_exited             (GSubprocess          *subprocess);
 
 GLIB_AVAILABLE_IN_2_40
-gint             g_subprocess_get_exit_status           (GSubprocess          *self);
+gint             g_subprocess_get_exit_status           (GSubprocess          *subprocess);
 
 GLIB_AVAILABLE_IN_2_40
-gboolean         g_subprocess_get_if_signaled           (GSubprocess          *self);
+gboolean         g_subprocess_get_if_signaled           (GSubprocess          *subprocess);
 
 GLIB_AVAILABLE_IN_2_40
-gint             g_subprocess_get_term_sig              (GSubprocess          *self);
+gint             g_subprocess_get_term_sig              (GSubprocess          *subprocess);
 
 GLIB_AVAILABLE_IN_2_40
 gboolean         g_subprocess_communicate               (GSubprocess          *subprocess,
@@ -143,6 +141,27 @@ gboolean        g_subprocess_communicate_finish         (GSubprocess          *s
                                                          GBytes              **stderr_buf,
                                                          GError              **error);
 
+GLIB_AVAILABLE_IN_2_40
+gboolean         g_subprocess_communicate_utf8          (GSubprocess          *subprocess,
+                                                         const char           *stdin_buf,
+                                                         GCancellable         *cancellable,
+                                                         char                **stdout_buf,
+                                                         char                **stderr_buf,
+                                                         GError              **error);
+GLIB_AVAILABLE_IN_2_40
+void            g_subprocess_communicate_utf8_async     (GSubprocess          *subprocess,
+                                                         const char           *stdin_buf,
+                                                         GCancellable         *cancellable,
+                                                         GAsyncReadyCallback   callback,
+                                                         gpointer              user_data);
+
+GLIB_AVAILABLE_IN_2_40
+gboolean        g_subprocess_communicate_utf8_finish    (GSubprocess          *subprocess,
+                                                         GAsyncResult         *result,
+                                                         char                **stdout_buf,
+                                                         char                **stderr_buf,
+                                                         GError              **error);
+
 G_END_DECLS
 
 #endif /* __G_SUBPROCESS_H__ */