summaryrefslogtreecommitdiff
path: root/libsoup/soup-connection.h
diff options
context:
space:
mode:
Diffstat (limited to 'libsoup/soup-connection.h')
-rw-r--r--libsoup/soup-connection.h38
1 files changed, 21 insertions, 17 deletions
diff --git a/libsoup/soup-connection.h b/libsoup/soup-connection.h
index ad3a1b13..b70a8a36 100644
--- a/libsoup/soup-connection.h
+++ b/libsoup/soup-connection.h
@@ -35,10 +35,7 @@ typedef struct {
GType soup_connection_get_type (void);
-typedef void (*SoupConnectionCallback) (SoupConnection *conn,
- guint status,
- gpointer data);
-
+#define SOUP_CONNECTION_LOCAL_ADDRESS "local-address"
#define SOUP_CONNECTION_REMOTE_URI "remote-uri"
#define SOUP_CONNECTION_PROXY_RESOLVER "proxy-resolver"
#define SOUP_CONNECTION_SSL "ssl"
@@ -52,18 +49,26 @@ typedef void (*SoupConnectionCallback) (SoupConnection *conn,
#define SOUP_CONNECTION_STATE "state"
#define SOUP_CONNECTION_MESSAGE "message"
-void soup_connection_connect_async (SoupConnection *conn,
- GCancellable *cancellable,
- SoupConnectionCallback callback,
- gpointer user_data);
-guint soup_connection_connect_sync (SoupConnection *conn,
- GCancellable *cancellable);
-guint soup_connection_start_ssl_sync (SoupConnection *conn,
- GCancellable *cancellable);
-void soup_connection_start_ssl_async (SoupConnection *conn,
- GCancellable *cancellable,
- SoupConnectionCallback callback,
- gpointer user_data);
+void soup_connection_connect_async (SoupConnection *conn,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean soup_connection_connect_finish (SoupConnection *conn,
+ GAsyncResult *result,
+ GError **error);
+gboolean soup_connection_connect_sync (SoupConnection *conn,
+ GCancellable *cancellable,
+ GError **error);
+gboolean soup_connection_start_ssl_sync (SoupConnection *conn,
+ GCancellable *cancellable,
+ GError **error);
+void soup_connection_start_ssl_async (SoupConnection *conn,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean soup_connection_start_ssl_finish (SoupConnection *conn,
+ GAsyncResult *result,
+ GError **error);
void soup_connection_disconnect (SoupConnection *conn);
@@ -76,7 +81,6 @@ gboolean soup_connection_is_tunnelled (SoupConnection *conn);
SoupConnectionState soup_connection_get_state (SoupConnection *conn);
void soup_connection_set_state (SoupConnection *conn,
SoupConnectionState state);
-void soup_connection_set_reusable (SoupConnection *conn);
gboolean soup_connection_get_ever_used (SoupConnection *conn);