diff options
| author | Dan Winship <danw@src.gnome.org> | 2007-12-14 20:45:18 +0000 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2007-12-14 20:45:18 +0000 |
| commit | d1ed346eb7ddd024407370ae63c7a7735b5b8a0d (patch) | |
| tree | 8b47192d9c8180cf3d89518500fe29d164f071a0 /libsoup/soup-connection.c | |
| parent | 68b8129ab0b18be4e74e111c1e7d961d1a6a3446 (diff) | |
| download | libsoup-d1ed346eb7ddd024407370ae63c7a7735b5b8a0d.tar.gz | |
Rename from SoupUri to SoupURI. Use the slice allocator and register as a
* libsoup/soup-uri.c: Rename from SoupUri to SoupURI. Use the
slice allocator and register as a boxed type.
(SoupURI): Rename "protocol" field to "scheme" and "passwd" to
"password". Make scheme an interned string. Replace
SOUP_PROTOCOL_HTTPS with soup_uri_is_https().
* *.c: update
svn path=/branches/libsoup-2.4/; revision=983
Diffstat (limited to 'libsoup/soup-connection.c')
| -rw-r--r-- | libsoup/soup-connection.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libsoup/soup-connection.c b/libsoup/soup-connection.c index b9069281..377b35d0 100644 --- a/libsoup/soup-connection.c +++ b/libsoup/soup-connection.c @@ -42,7 +42,7 @@ typedef struct { * connected to, which will be proxy_uri if there's a proxy * and origin_uri if not. */ - SoupUri *proxy_uri, *origin_uri, *conn_uri; + SoupURI *proxy_uri, *origin_uri, *conn_uri; gpointer ssl_creds; SoupConnectionMode mode; @@ -281,7 +281,7 @@ set_property (GObject *object, guint prop_id, if (priv->proxy_uri) { priv->conn_uri = priv->proxy_uri; if (priv->origin_uri && - priv->origin_uri->protocol == SOUP_PROTOCOL_HTTPS) + soup_uri_is_https (priv->origin_uri)) priv->mode = SOUP_CONNECTION_MODE_TUNNEL; else priv->mode = SOUP_CONNECTION_MODE_PROXY; @@ -455,7 +455,7 @@ socket_connect_result (SoupSocket *sock, guint status, gpointer user_data) if (!SOUP_STATUS_IS_SUCCESSFUL (status)) goto done; - if (priv->conn_uri->protocol == SOUP_PROTOCOL_HTTPS) { + if (soup_uri_is_https (priv->conn_uri)) { if (!soup_socket_start_ssl (sock)) { status = SOUP_STATUS_SSL_FAILED; goto done; @@ -562,7 +562,7 @@ soup_connection_connect_sync (SoupConnection *conn) g_signal_connect (priv->socket, "disconnected", G_CALLBACK (socket_disconnected), conn); - if (priv->conn_uri->protocol == SOUP_PROTOCOL_HTTPS) { + if (soup_uri_is_https (priv->conn_uri)) { if (!soup_socket_start_ssl (priv->socket)) { status = SOUP_STATUS_SSL_FAILED; goto fail; |