[continued from previous message] 
  
 +@@ -1370,7 +1372,7 @@ 
 +     } 
 + 
 +   if (headers == NULL) 
 +-    soup_message_headers_free (_headers); 
 ++    soup_message_headers_unref (_headers); 
 + 
 +   return result; 
 + } 
 +@@ -1460,7 +1462,7 @@ 
 +                                         TRUE, 
 +                                         error); 
 + 
 +-  soup_message_headers_free (headers); 
 ++  soup_message_headers_unref (headers); 
 + 
 +   return result; 
 + } 
 +--- eventdance.orig/evd/evd-longpolling-server.c 
 ++++ eventdance/evd/evd-longpolling-server.c 
 +@@ -256,14 +256,14 @@ 
 + evd_longpolling_server_resolve_action (EvdLongpollingServer *self, 
 +                                        EvdHttpRequest       *request) 
 + { 
 +-  SoupURI *uri; 
 ++  GUri *uri; 
 +   const gchar *path; 
 +   gchar **tokens; 
 +   gint i; 
 +   gchar *action = NULL; 
 + 
 +   uri = evd_http_request_get_uri (request); 
 +-  path = uri->path; 
 ++  path = g_uri_get_path (uri); 
 + 
 +   tokens = g_strsplit (path, "/", 32); 
 + 
 +@@ -295,15 +295,17 @@ 
 +   EvdLongpollingServer *self = EVD_LONGPOLLING_SERVER (web_service); 
 +   gchar *action; 
 +   EvdPeer *peer; 
 +-  SoupURI *uri; 
 ++  GUri *uri; 
 ++  const gchar *query; 
 + 
 +   uri = evd_http_request_get_uri (request); 
 + 
 +-  self->priv->current_peer_id = uri->query; 
 ++  query = g_uri_get_query (uri); 
 ++  self->priv->current_peer_id = query; 
 + 
 +-  if (uri->query == NULL || 
 ++  if (query == NULL || 
 +       (peer = evd_transport_lookup_peer (EVD_TRANSPORT (self), 
 +-                                         uri->query)) == NULL) 
 ++                                         query)) == NULL) 
 +     { 
 +       EVD_WEB_SERVICE_GET_CLASS (self)->respond (EVD_WEB_SERVICE (self), 
 +                                                  conn, 
 +@@ -534,7 +536,7 @@ 
 +         flush_and_return_connection (EVD_WEB_SERVICE (self), conn); 
 +     } 
 + 
 +-  soup_message_headers_free (headers); 
 ++  soup_message_headers_unref (headers); 
 + 
 +   return result; 
 + } 
 +--- eventdance.orig/evd/evd-web-service.c 
 ++++ eventdance/evd/evd-web-service.c 
 +@@ -215,7 +215,7 @@ 
 +                   0, 
 +                   NULL); 
 + 
 +-  soup_message_headers_free (res_headers); 
 ++  soup_message_headers_unref (res_headers); 
 + } 
 + 
 + static gboolean 
 +@@ -514,7 +514,7 @@ 
 +     } 
 + 
 +   if (headers == NULL) 
 +-    soup_message_headers_free (_headers); 
 ++    soup_message_headers_unref (_headers); 
 + 
 +   return result; 
 + } 
 +@@ -818,7 +818,7 @@ 
 +                                                        error); 
 + 
 +   if (headers == NULL) 
 +-    soup_message_headers_free (headers); 
 ++    soup_message_headers_unref (headers); 
 + 
 +   return result; 
 + } 
 +--- eventdance.orig/evd/evd-websocket-protocol.c 
 ++++ eventdance/evd/evd-websocket-protocol.c 
 +@@ -829,7 +829,7 @@ 
 +  finish: 
 + 
 +   if (res_headers != NULL) 
 +-    soup_message_headers_free (res_headers); 
 ++    soup_message_headers_unref (res_headers); 
 + 
 +   return result; 
 + } 
 +--- eventdance.orig/evd/evd-websocket-server.c 
 ++++ eventdance/evd/evd-websocket-server.c 
 +@@ -306,7 +306,7 @@ 
 + { 
 +   EvdWebsocketServer *self = EVD_WEBSOCKET_SERVER (web_service); 
 +   EvdPeer *peer = NULL; 
 +-  SoupURI *uri; 
 ++  GUri *uri; 
 +   guint validate_result; 
 +   EvdTransportInterface *iface; 
 +   GError *error = NULL; 
 +@@ -315,7 +315,8 @@ 
 +   uri = evd_http_request_get_uri (request); 
 + 
 +   /* resolve peer */ 
 +-  peer = evd_transport_lookup_peer (EVD_TRANSPORT (self), uri->query); 
 ++  peer = evd_transport_lookup_peer (EVD_TRANSPORT (self), 
 ++                                    g_uri_get_query (uri)); 
 +   if (peer == NULL) 
 +     { 
 +       if (! self->priv->standalone) 
 +--- eventdance.orig/evd/evd-websocket-client.c 
 ++++ eventdance/evd/evd-websocket-client.c 
 +@@ -21,6 +21,7 @@ 
 +  */ 
 + 
 + #include  
 ++#include  
 + 
 + #include "evd-websocket-client.h" 
 + 
 +@@ -460,7 +461,7 @@ 
 +   g_free (data->handshake_key); 
 + 
 +   if (data->res_headers != NULL) 
 +-    soup_message_headers_free (data->res_headers); 
 ++    soup_message_headers_unref (data->res_headers); 
 + 
 +   g_slice_free (ConnectionData, data); 
 + } 
 +@@ -679,12 +680,14 @@ 
 +                 GSimpleAsyncResult *async_result, 
 +                 GCancellable       *cancellable) 
 + { 
 +-  SoupURI *uri; 
 ++  GUri *uri; 
 +   EvdWebsocketClient *self = EVD_WEBSOCKET_CLIENT (transport); 
 +   gchar *addr; 
 ++  const gchar *scheme; 
 +   ConnectionData *data; 
 + 
 +-  uri = soup_uri_new (address); 
 ++  uri = g_uri_parse (address, SOUP_HTTP_URI_FLAGS | G_URI_FLAG 
 _PARSE_RELAXED, 
 ++                     NULL); 
 +   if (uri == NULL) 
 +     { 
 +       g_simple_async_result_set_error (async_result, 
 +@@ -698,7 +701,8 @@ 
 +     } 
 + 
 +   /* validate URI scheme */ 
 +-  if (g_strcmp0 (uri->scheme, "ws") != 0 && g_strcmp0 (uri->scheme, "wss") 
 != 0) 
 ++  scheme = g_uri_get_scheme (uri); 
 ++  if (g_strcmp0 (scheme, "ws") != 0 && g_strcmp0 (scheme, "wss") != 0) 
 +     { 
 +       g_simple_async_result_set_error (async_result, 
 +                                        G_IO_ERROR, 
 +@@ -720,13 +724,13 @@ 
 + 
 +   /* connection pool */ 
 +   addr = g_strdup_printf ("%s:%d", 
 +-                          soup_uri_get_host (uri), 
 +-                          soup_uri_get_port (uri)); 
 ++                          g_uri_get_host (uri), 
 ++                          g_uri_get_port (uri)); 
 + 
 +   data->pool = evd_connection_pool_new (addr, EVD_TYPE_HTTP_CONNECTION); 
 + 
 +   /* if scheme is WSS (secure WebSocket), set connection pool to auto 
 start 
 TLS */ 
 +-  if (g_strcmp0 (uri->scheme, "wss") == 0) 
 ++  if (g_strcmp0 (scheme, "wss") == 0) 
 +     evd_connection_pool_set_tls_autostart (data->pool, TRUE); 
 + 
 +   g_free (addr); 
 +@@ -735,7 +739,7 @@ 
 +   get_connection (data->pool, cancellable, data); 
 + 
 +  out: 
 +-  soup_uri_free (uri); 
 ++  g_uri_unref (uri); 
 + } 
 + 
 + /* public methods */ 
 +--- eventdance.orig/evd/evd-web-selector.c 
 ++++ eventdance/evd/evd-web-selector.c 
 +@@ -158,7 +158,7 @@ 
 +   EvdWebSelector *self = EVD_WEB_SELECTOR (web_service); 
 +   EvdService *service; 
 + 
 +-  SoupURI *uri; 
 ++  GUri *uri; 
 +   SoupMessageHeaders *headers; 
 +   const gchar *domain; 
 + 
 +@@ -169,7 +169,8 @@ 
 + 
 +   domain = soup_message_headers_get_one (headers, "host"); 
 + 
 +-  if ( (service = evd_web_selector_find_match (self, domain, uri->path)) 
 == 
 NULL) 
 ++  if ((service = evd_web_selector_find_match (self, domain, 
 ++                                              g_uri_get_path (uri))) == 
 NULL) 
 +     service = self->priv->default_service; 
 + 
 +   if (service != NULL) 
 +--- eventdance.orig/evd/evd-http-message.c 
 ++++ eventdance/evd/evd-http-message.c 
 +@@ -113,7 +113,7 @@ 
 +   EvdHttpMessage *self = EVD_HTTP_MESSAGE (obj); 
 + 
 +   if (self->priv->headers != NULL) 
 +-    soup_message_headers_free (self->priv->headers); 
 ++    soup_message_headers_unref (self->priv->headers); 
 + 
 +   G_OBJECT_CLASS (evd_http_message_parent_class)->finalize (obj); 
 + } 
 +@@ -136,7 +136,7 @@ 
 + 
 +     case PROP_HEADERS: 
 +       if (self->priv->headers != NULL) 
 +-        soup_message_headers_free (self->priv->headers); 
 ++        soup_message_headers_unref (self->priv->headers); 
 +       self->priv->headers = g_value_get_boxed (value); 
 +       break; 
 + 
 +--- eventdance.orig/evd/evd-web-transport-server.c 
 ++++ eventdance/evd/evd-web-transport-server.c 
 +@@ -21,6 +21,7 @@ 
 +  */ 
 + 
 + #include  
 ++#include  
 + #include  
 + 
 + #include "evd-web-transport-server.h" 
 +@@ -392,7 +393,7 @@ 
 +   EvdWebTransportServer *self; 
 +   gchar *mechanism_url; 
 +   GError *error = NULL; 
 +-  SoupURI *uri = NULL; 
 ++  GUri *uri = NULL; 
 + 
  
 [continued in next message] 
  
 --- SoupGate-Win32 v1.05 
  * Origin: you cannot sedate... all the things you hate (1:229/2)