diff options
| author | Sven Neumann <neumann@teufel.de> | 2014-11-14 15:31:50 +0100 |
|---|---|---|
| committer | Jens Georg <mail@jensge.org> | 2015-01-03 10:50:46 +0100 |
| commit | 62eb328449e956fb146f1fe024ff798e5191e4f4 (patch) | |
| tree | af51b3b262307ad77f031ccfe871c72e342c0ff5 /libgupnp/gupnp-root-device.c | |
| parent | 20eed980f64a0042e6bfc340c80d982ddf04ff1c (diff) | |
| download | gupnp-62eb328449e956fb146f1fe024ff798e5191e4f4.tar.gz | |
gupnp-context: port to new libsoup API (requires libsoup 2.48)
Signed-off-by: Sven Neumann <neumann@teufel.de>
https://bugzilla.gnome.org/show_bug.cgi?id=740267
Diffstat (limited to 'libgupnp/gupnp-root-device.c')
| -rw-r--r-- | libgupnp/gupnp-root-device.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libgupnp/gupnp-root-device.c b/libgupnp/gupnp-root-device.c index fe6affc..cf207fc 100644 --- a/libgupnp/gupnp-root-device.c +++ b/libgupnp/gupnp-root-device.c @@ -272,6 +272,7 @@ gupnp_root_device_constructor (GType type, GUPnPRootDevice *device; GUPnPContext *context; const char *description_path, *description_dir, *udn; + SoupURI *uri; char *desc_path, *location, *usn, *relative_location; unsigned int i; GUPnPXMLDoc *description_doc; @@ -420,10 +421,11 @@ gupnp_root_device_constructor (GType type, gupnp_context_host_path (context, device->priv->description_dir, ""); /* Generate full location */ - location = g_strjoin (NULL, - _gupnp_context_get_server_url (context), - relative_location, - NULL); + uri = _gupnp_context_get_server_uri (context); + soup_uri_set_path (uri, relative_location); + location = soup_uri_to_string (uri, FALSE); + soup_uri_free (uri); + g_free (relative_location); /* Save the URL base, if any */ |