gsocketclient: Handle cancellation between CONNECTING and CONNECTED

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

diff --git a/gio/ginputstream.h b/gio/ginputstream.h
index 5f109c8..a9c269c 100644 (file)
--- a/gio/ginputstream.h
+++ b/gio/ginputstream.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: Alexander Larsson <alexl@redhat.com>
  */
@@ -111,13 +109,16 @@ struct _GInputStreamClass
   void (*_g_reserved5) (void);
 };
 
+GLIB_AVAILABLE_IN_ALL
 GType    g_input_stream_get_type      (void) G_GNUC_CONST;
 
+GLIB_AVAILABLE_IN_ALL
 gssize   g_input_stream_read          (GInputStream          *stream,
                                       void                  *buffer,
                                       gsize                  count,
                                       GCancellable          *cancellable,
                                       GError               **error);
+GLIB_AVAILABLE_IN_ALL
 gboolean g_input_stream_read_all      (GInputStream          *stream,
                                       void                  *buffer,
                                       gsize                  count,
@@ -129,13 +130,16 @@ GBytes  *g_input_stream_read_bytes    (GInputStream          *stream,
                                       gsize                  count,
                                       GCancellable          *cancellable,
                                       GError               **error);
+GLIB_AVAILABLE_IN_ALL
 gssize   g_input_stream_skip          (GInputStream          *stream,
                                       gsize                  count,
                                       GCancellable          *cancellable,
                                       GError               **error);
+GLIB_AVAILABLE_IN_ALL
 gboolean g_input_stream_close         (GInputStream          *stream,
                                       GCancellable          *cancellable,
                                       GError               **error);
+GLIB_AVAILABLE_IN_ALL
 void     g_input_stream_read_async    (GInputStream          *stream,
                                       void                  *buffer,
                                       gsize                  count,
@@ -143,6 +147,7 @@ void     g_input_stream_read_async    (GInputStream          *stream,
                                       GCancellable          *cancellable,
                                       GAsyncReadyCallback    callback,
                                       gpointer               user_data);
+GLIB_AVAILABLE_IN_ALL
 gssize   g_input_stream_read_finish   (GInputStream          *stream,
                                       GAsyncResult          *result,
                                       GError               **error);
@@ -157,30 +162,38 @@ GLIB_AVAILABLE_IN_2_34
 GBytes  *g_input_stream_read_bytes_finish (GInputStream          *stream,
                                           GAsyncResult          *result,
                                           GError               **error);
+GLIB_AVAILABLE_IN_ALL
 void     g_input_stream_skip_async    (GInputStream          *stream,
                                       gsize                  count,
                                       int                    io_priority,
                                       GCancellable          *cancellable,
                                       GAsyncReadyCallback    callback,
                                       gpointer               user_data);
+GLIB_AVAILABLE_IN_ALL
 gssize   g_input_stream_skip_finish   (GInputStream          *stream,
                                       GAsyncResult          *result,
                                       GError               **error);
+GLIB_AVAILABLE_IN_ALL
 void     g_input_stream_close_async   (GInputStream          *stream,
                                       int                    io_priority,
                                       GCancellable          *cancellable,
                                       GAsyncReadyCallback    callback,
                                       gpointer               user_data);
+GLIB_AVAILABLE_IN_ALL
 gboolean g_input_stream_close_finish  (GInputStream          *stream,
                                       GAsyncResult          *result,
                                       GError               **error);
 
 /* For implementations: */
 
+GLIB_AVAILABLE_IN_ALL
 gboolean g_input_stream_is_closed     (GInputStream          *stream);
+GLIB_AVAILABLE_IN_ALL
 gboolean g_input_stream_has_pending   (GInputStream          *stream);
+GLIB_AVAILABLE_IN_ALL
 gboolean g_input_stream_set_pending   (GInputStream          *stream,
                                       GError               **error);
+GLIB_AVAILABLE_IN_ALL
 void     g_input_stream_clear_pending (GInputStream          *stream);
 
 G_END_DECLS