Commit eb358df7 authored by Sebastien Bacher's avatar Sebastien Bacher

New upstream version 1.2.1

parents ecf006bd b9f76cad
1.2.1
=====
- Fix a deadlock when cancelling an action
- Do not call-back a cancelled action
- Fix public dependencies
Bugs fixed in this release:
- https://gitlab.gnome.org/GNOME/gupnp/issues/7
All contributors to this release:
- Jens Georg <mail@jensge.org>
1.2.0
=====
- Release 1.2.0
......
......@@ -23,7 +23,6 @@
#define GUPNP_SERVICE_INFO_H
#include <glib-object.h>
#include <libxml/tree.h>
#include <libsoup/soup-uri.h>
#include "gupnp-context.h"
......
......@@ -547,7 +547,10 @@ on_legacy_async_callback (GObject *source, GAsyncResult *res, gpointer user_data
gupnp_service_proxy_call_action_finish (GUPNP_SERVICE_PROXY (source), res, &error);
action = (GUPnPServiceProxyAction *) user_data;
if (action->callback != NULL)
/* Do not perform legacy call-back if action is cancelled, to comply with the old implementation */
if (action->callback != NULL &&
!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
action->callback (action->proxy, action, action->user_data);
}
......@@ -621,8 +624,6 @@ on_action_cancelled (GCancellable *cancellable, gpointer user_data)
soup_session_cancel_message (session,
action->msg,
SOUP_STATUS_CANCELLED);
g_cancellable_disconnect (action->cancellable,
action->cancellable_connection_id);
action->cancellable_connection_id = 0;
}
}
......
context_manager_impl = []
context_manager_args = []
system_deps = []
system_deps = [guul.get_variable('guul')]
if host_machine.system() == 'windows'
context_manager_impl += 'gupnp-windows-context-manager.c'
......@@ -110,6 +110,7 @@ pkg.generate(
libraries : libgupnp,
subdirs: 'gupnp-1.2',
name : 'gupnp-1.2',
requires : dependencies,
description : 'GObject-based UPnP library',
version : meson.project_version(),
filebase : 'gupnp-1.2'
......
project('gupnp', 'c', version : '1.2.0')
project('gupnp', 'c', version : '1.2.1')
gnome = import('gnome')
pkg = import('pkgconfig')
......@@ -25,8 +25,7 @@ dependencies = [
dependency('gobject-2.0', version : '>= 2.44'),
dependency('gssdp-1.2', version : '>= 1.1.3'),
dependency('libsoup-2.4', version : '>= 2.48.0'),
dependency('libxml-2.0'),
guul.get_variable('guul')
dependency('libxml-2.0')
]
subdir('libgupnp')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment