summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2021-09-23 10:24:26 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2021-09-23 10:24:26 +0000
commitd099ac6ceb10224385dbc4ba869127df1ad5141a (patch)
tree7a4a32cda1c2f96e6fe4233cf590972beed75b97
parent1176835ce3c7b15eae0b98c39dca92b477086095 (diff)
parent3b4a34c29a1d6dcda611be8433e0b3b2266c055d (diff)
downloadglib-d099ac6ceb10224385dbc4ba869127df1ad5141a.tar.gz
Merge branch '2401-object-manager-warning' into 'main'
gdbusobjectmanagerclient: Don’t warn if removing an interface fails Closes #2401 See merge request GNOME/glib!2263
-rw-r--r--gio/gdbusobjectmanagerclient.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c
index 04c55995d..0d6f5e65c 100644
--- a/gio/gdbusobjectmanagerclient.c
+++ b/gio/gdbusobjectmanagerclient.c
@@ -1689,11 +1689,11 @@ remove_interfaces (GDBusObjectManagerClient *manager,
op = g_hash_table_lookup (manager->priv->map_object_path_to_object_proxy, object_path);
if (op == NULL)
{
- g_warning ("%s: Processing InterfaceRemoved signal for path %s but no object proxy exists",
- G_STRLOC,
- object_path);
+ g_debug ("%s: Processing InterfaceRemoved signal for path %s but no object proxy exists",
+ G_STRLOC,
+ object_path);
g_mutex_unlock (&manager->priv->lock);
- goto out;
+ return;
}
interfaces = g_dbus_object_get_interfaces (G_DBUS_OBJECT (op));
@@ -1730,8 +1730,6 @@ remove_interfaces (GDBusObjectManagerClient *manager,
g_object_unref (op);
}
g_object_unref (manager);
- out:
- ;
}
static void