diff options
| author | Patrick Griffis <pgriffis@igalia.com> | 2020-07-27 18:07:37 +0400 |
|---|---|---|
| committer | Patrick Griffis <tingping@tingping.se> | 2020-11-14 19:07:24 +0000 |
| commit | 737eef099ca1e34d18245c54b6ed3ba54faf1f9c (patch) | |
| tree | 9e35180cd68cefa2f515f7b38c28fc2000d7cf37 /libsoup/websocket | |
| parent | 0f471888b8ad4ab97283023109bcbde714f2ed48 (diff) | |
| download | libsoup-737eef099ca1e34d18245c54b6ed3ba54faf1f9c.tar.gz | |
Replace SoupURI with GUri
Diffstat (limited to 'libsoup/websocket')
| -rw-r--r-- | libsoup/websocket/soup-websocket-connection.c | 14 | ||||
| -rw-r--r-- | libsoup/websocket/soup-websocket-connection.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libsoup/websocket/soup-websocket-connection.c b/libsoup/websocket/soup-websocket-connection.c index 325a0b96..1262f290 100644 --- a/libsoup/websocket/soup-websocket-connection.c +++ b/libsoup/websocket/soup-websocket-connection.c @@ -25,7 +25,7 @@ #include "soup-websocket-connection.h" #include "soup-enum-types.h" #include "soup-io-stream.h" -#include "soup-uri.h" +#include "soup-uri-utils-private.h" #include "soup-websocket-extension.h" /* @@ -120,7 +120,7 @@ struct _SoupWebsocketConnection { typedef struct { GIOStream *io_stream; SoupWebsocketConnectionType connection_type; - SoupURI *uri; + GUri *uri; char *origin; char *protocol; guint64 max_incoming_payload_size; @@ -1391,7 +1391,7 @@ soup_websocket_connection_set_property (GObject *object, case PROP_URI: g_return_if_fail (priv->uri == NULL); - priv->uri = g_value_dup_boxed (value); + priv->uri = soup_uri_copy_with_normalized_flags (g_value_get_boxed (value)); break; case PROP_ORIGIN: @@ -1462,7 +1462,7 @@ soup_websocket_connection_finalize (GObject *object) g_byte_array_free (priv->message_data, TRUE); if (priv->uri) - soup_uri_free (priv->uri); + g_uri_unref (priv->uri); g_free (priv->origin); g_free (priv->protocol); @@ -1532,7 +1532,7 @@ soup_websocket_connection_class_init (SoupWebsocketConnectionClass *klass) g_param_spec_boxed ("uri", "URI", "The WebSocket URI", - SOUP_TYPE_URI, + G_TYPE_URI, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); @@ -1753,7 +1753,7 @@ soup_websocket_connection_class_init (SoupWebsocketConnectionClass *klass) */ SoupWebsocketConnection * soup_websocket_connection_new (GIOStream *stream, - SoupURI *uri, + GUri *uri, SoupWebsocketConnectionType type, const char *origin, const char *protocol, @@ -1826,7 +1826,7 @@ soup_websocket_connection_get_connection_type (SoupWebsocketConnection *self) * * Since: 2.50 */ -SoupURI * +GUri * soup_websocket_connection_get_uri (SoupWebsocketConnection *self) { SoupWebsocketConnectionPrivate *priv = soup_websocket_connection_get_instance_private (self); diff --git a/libsoup/websocket/soup-websocket-connection.h b/libsoup/websocket/soup-websocket-connection.h index 6bd11bbd..d537168d 100644 --- a/libsoup/websocket/soup-websocket-connection.h +++ b/libsoup/websocket/soup-websocket-connection.h @@ -31,7 +31,7 @@ G_DECLARE_FINAL_TYPE (SoupWebsocketConnection, soup_websocket_connection, SOUP, SOUP_AVAILABLE_IN_ALL SoupWebsocketConnection *soup_websocket_connection_new (GIOStream *stream, - SoupURI *uri, + GUri *uri, SoupWebsocketConnectionType type, const char *origin, const char *protocol, @@ -44,7 +44,7 @@ SOUP_AVAILABLE_IN_2_50 SoupWebsocketConnectionType soup_websocket_connection_get_connection_type (SoupWebsocketConnection *self); SOUP_AVAILABLE_IN_2_50 -SoupURI * soup_websocket_connection_get_uri (SoupWebsocketConnection *self); +GUri * soup_websocket_connection_get_uri (SoupWebsocketConnection *self); SOUP_AVAILABLE_IN_2_50 const char * soup_websocket_connection_get_origin (SoupWebsocketConnection *self); |