luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-25 21:54:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdbus: Work around a D-Bus bug with path_namespace='/' match rules

Browse Source 
D-Bus versions < 1.6.18 (i.e. all current versions) have a bug with the
path_namespace='/' match rule key. It should conceptually match everything,
but actually matches nothing. This results in no property change (or other)
signals being forwarded to the D-Bus client.

The work-around implemented in GDBusObjectManagerClient is to remove the
path_namespace match key if its value is ‘/’.

For the upstream D-Bus bug, see:
https://bugs.freedesktop.org/show_bug.cgi?id=70799

https://bugzilla.gnome.org/show_bug.cgi?id=710726
This commit is contained in:
Philip Withnall 2013-10-23 15:07:46 +01:00
parent 5a3fd63246
commit 3b28df1e00
1 changed files with 17 additions and 5 deletions

18
gio/gdbusobjectmanagerclient.c

@ -1105,12 +1105,24 @@ subscribe_signals (GDBusObjectManagerClient *manager,
if (name_owner != NULL) if (name_owner != NULL)
{ {
/* the bus daemon may not implement path_prefix so gracefully /* Only add path_namespace if it's non-'/'. This removes a no-op key from
* handle this by using a fallback * the match rule, and also works around a D-Bus bug where
*/ * path_namespace='/' matches nothing in D-Bus versions < 1.6.18.
*
* See: https://bugs.freedesktop.org/show_bug.cgi?id=70799 */
if (g_str_equal (manager->priv->object_path, "/"))
{
manager->priv->match_rule = g_strdup_printf ("type='signal',sender='%s'",
name_owner);
}
else
{
manager->priv->match_rule = g_strdup_printf ("type='signal',sender='%s',path_namespace='%s'", manager->priv->match_rule = g_strdup_printf ("type='signal',sender='%s',path_namespace='%s'",
name_owner, manager->priv->object_path); name_owner, manager->priv->object_path);
}
/* The bus daemon may not implement path_namespace so gracefully
* handle this by using a fallback triggered if @error is set. */
ret = g_dbus_connection_call_sync (manager->priv->connection, ret = g_dbus_connection_call_sync (manager->priv->connection,
"org.freedesktop.DBus", "org.freedesktop.DBus",
"/org/freedesktop/DBus", "/org/freedesktop/DBus",