diff options
| author | Dan Winship <danw@gnome.org> | 2010-05-29 15:05:55 +0200 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2010-06-09 11:23:00 -0400 |
| commit | f3f1e3822459a8b1f38661177069a3a9e617bdc5 (patch) | |
| tree | 43f63478407de0aecb5e9a14d265b4874718939b /libsoup/soup-connection.h | |
| parent | f15ddd3eb4822e4ee08e536e42cd4844d614cba9 (diff) | |
| download | libsoup-f3f1e3822459a8b1f38661177069a3a9e617bdc5.tar.gz | |
Misc SoupConnection API improvements
Use GCancellables in connect_async/connect_sync (plus updates needed
for behavior changes caused by that). Make
soup_connection_disconnect() always emit the signal if the connection
state wasn't already DISCONNECTED, even if it wasn't yet connected
before. Remove some dead code in clear_current_request. Remove some
more-or-less redundant arguments in soup_message_send_request().
Diffstat (limited to 'libsoup/soup-connection.h')
| -rw-r--r-- | libsoup/soup-connection.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libsoup/soup-connection.h b/libsoup/soup-connection.h index 17b9f7b6..558a4655 100644 --- a/libsoup/soup-connection.h +++ b/libsoup/soup-connection.h @@ -6,7 +6,7 @@ #ifndef SOUP_CONNECTION_H #define SOUP_CONNECTION_H 1 -#include <time.h> +#include <gio/gio.h> #include "soup-types.h" #include "soup-misc.h" @@ -55,9 +55,11 @@ SoupConnection *soup_connection_new (const char *propname1, ...) G_GNUC_NULL_TERMINATED; void soup_connection_connect_async (SoupConnection *conn, + GCancellable *cancellable, SoupConnectionCallback callback, gpointer user_data); -guint soup_connection_connect_sync (SoupConnection *conn); +guint soup_connection_connect_sync (SoupConnection *conn, + GCancellable *cancellable); SoupAddress *soup_connection_get_tunnel_addr(SoupConnection *conn); gboolean soup_connection_start_ssl (SoupConnection *conn); @@ -65,6 +67,7 @@ void soup_connection_disconnect (SoupConnection *conn); SoupSocket *soup_connection_get_socket (SoupConnection *conn); SoupURI *soup_connection_get_proxy_uri (SoupConnection *conn); +gboolean soup_connection_is_via_proxy (SoupConnection *conn); SoupConnectionState soup_connection_get_state (SoupConnection *conn); void soup_connection_set_state (SoupConnection *conn, |