colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

event-dispatcher: Donot cancel the object-removed event

Browse Source 
The event is not reaching the object-removal hooks due to this.
This commit is contained in:
Ashok Sidipotu
2022-07-13 06:32:11 +05:30
committed by Julian Bouzas
parent 82a8bc5673
commit 6bdc6fb697
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/wp/event-dispatcher.c
View File

@@ -44,6 +44,20 @@ form_event_name (const gchar *type, const gchar *subject_type)
(subject_type ? subject_type : ""));
}
static void
on_proxy_destroyed (GObject* self, WpEvent* e)
{
if (e->subject == self)
{
const gchar* type = wp_properties_get (e->properties, "event.type");
/* object removal needs to be processed by hooks */
if (g_str_equal (type, "object-removed"))
wp_properties_set (e->properties, "pw-proxy-destroyed", "true");
else
g_cancellable_cancel (e->cancellable);
}
}
/*!
* \brief Creates a new event
* \ingroup wpevent
@@ -96,9 +110,8 @@ wp_event_new (const gchar * type, gint priority, WpProperties * properties,
/* watch for subject pw-proxy-destroyed and cancel event */
if (g_type_is_a (G_OBJECT_TYPE (self->subject), WP_TYPE_PROXY)) {
g_signal_connect_object (self->subject, "pw-proxy-destroyed",
(GCallback) g_cancellable_cancel, self->cancellable,
G_CONNECT_SWAPPED);
g_signal_connect (self->subject, "pw-proxy-destroyed",
(GCallback) on_proxy_destroyed, self);
}
}