cleanup

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

diff --git a/gio/gsocketconnection.h b/gio/gsocketconnection.h
index df37c91..8d20068 100644 (file)
--- a/gio/gsocketconnection.h
+++ b/gio/gsocketconnection.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/>.
  *
  * Authors: Christian Kellner <gicmo@gnome.org>
  *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
@@ -23,13 +21,13 @@
  *          Alexander Larsson <alexl@redhat.com>
  */
 
+#ifndef __G_SOCKET_CONNECTION_H__
+#define __G_SOCKET_CONNECTION_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_SOCKET_CONNECTION_H__
-#define __G_SOCKET_CONNECTION_H__
-
 #include <glib-object.h>
 #include <gio/gsocket.h>
 #include <gio/giostream.h>
@@ -70,21 +68,47 @@ struct _GSocketConnection
   GSocketConnectionPrivate *priv;
 };
 
+GLIB_AVAILABLE_IN_ALL
 GType              g_socket_connection_get_type                  (void) G_GNUC_CONST;
 
-GSocket           *g_socket_connection_get_socket                (GSocketConnection *connection);
-GSocketAddress    *g_socket_connection_get_local_address         (GSocketConnection *connection,
-                                                                 GError                 **error);
-GSocketAddress    *g_socket_connection_get_remote_address        (GSocketConnection *connection,
-                                                                 GError                 **error);
-void               g_socket_connection_factory_register_type     (GType          g_type,
-                                                                 GSocketFamily  family,
-                                                                 GSocketType    type,
-                                                                 gint           protocol);
-GType              g_socket_connection_factory_lookup_type       (GSocketFamily  family,
-                                                                 GSocketType    type,
-                                                                 gint           protocol);
-GSocketConnection *g_socket_connection_factory_create_connection (GSocket       *socket);
+GLIB_AVAILABLE_IN_2_32
+gboolean           g_socket_connection_is_connected              (GSocketConnection  *connection);
+GLIB_AVAILABLE_IN_2_32
+gboolean           g_socket_connection_connect                   (GSocketConnection  *connection,
+                                                                 GSocketAddress     *address,
+                                                                 GCancellable       *cancellable,
+                                                                 GError            **error);
+GLIB_AVAILABLE_IN_2_32
+void               g_socket_connection_connect_async             (GSocketConnection  *connection,
+                                                                 GSocketAddress     *address,
+                                                                 GCancellable       *cancellable,
+                                                                 GAsyncReadyCallback callback,
+                                                                 gpointer            user_data);
+GLIB_AVAILABLE_IN_2_32
+gboolean           g_socket_connection_connect_finish            (GSocketConnection  *connection,
+                                                                 GAsyncResult       *result,
+                                                                 GError            **error);
+
+GLIB_AVAILABLE_IN_ALL
+GSocket           *g_socket_connection_get_socket                (GSocketConnection  *connection);
+GLIB_AVAILABLE_IN_ALL
+GSocketAddress    *g_socket_connection_get_local_address         (GSocketConnection  *connection,
+                                                                 GError            **error);
+GLIB_AVAILABLE_IN_ALL
+GSocketAddress    *g_socket_connection_get_remote_address        (GSocketConnection  *connection,
+                                                                 GError            **error);
+
+GLIB_AVAILABLE_IN_ALL
+void               g_socket_connection_factory_register_type     (GType               g_type,
+                                                                 GSocketFamily       family,
+                                                                 GSocketType         type,
+                                                                 gint                protocol);
+GLIB_AVAILABLE_IN_ALL
+GType              g_socket_connection_factory_lookup_type       (GSocketFamily       family,
+                                                                 GSocketType         type,
+                                                                 gint                protocol_id);
+GLIB_AVAILABLE_IN_ALL
+GSocketConnection *g_socket_connection_factory_create_connection (GSocket            *socket);
 
 G_END_DECLS