summaryrefslogtreecommitdiff
path: root/registryd
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnome.org>2022-07-08 18:11:23 -0500
committerFederico Mena Quintero <federico@gnome.org>2022-07-12 21:46:29 -0500
commitdda404a0fe6acc6b91cc511a18cd7ffad01a240d (patch)
treeb6b2fb31394a5edbfcac4b70ed7cd84c670121a4 /registryd
parentd38d69b0507b738be818f0cc3976c968032528ae (diff)
downloadat-spi2-core-dda404a0fe6acc6b91cc511a18cd7ffad01a240d.tar.gz
remove_application(): Use the implied bus connection
Diffstat (limited to 'registryd')
-rw-r--r--registryd/registry.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/registryd/registry.c b/registryd/registry.c
index ea88e6c2..341f7e92 100644
--- a/registryd/registry.c
+++ b/registryd/registry.c
@@ -243,12 +243,12 @@ set_id (SpiRegistry *reg, const gchar *name, const gchar *path)
}
static void
-remove_application (SpiRegistry *reg, DBusConnection *bus, guint index)
+remove_application (SpiRegistry *reg, guint index)
{
SpiReference *ref = g_ptr_array_index (reg->apps, index);
spi_remove_device_listeners (reg->dec, ref->name);
- emit_event (bus, SPI_DBUS_INTERFACE_EVENT_OBJECT, "ChildrenChanged", "remove", index, 0, ref->name, ref->path);
+ emit_event (reg->bus, SPI_DBUS_INTERFACE_EVENT_OBJECT, "ChildrenChanged", "remove", index, 0, ref->name, ref->path);
g_ptr_array_remove_index (reg->apps, index);
}
@@ -345,10 +345,10 @@ handle_disconnection (DBusConnection *bus, DBusMessage *message, void *user_data
SpiReference *ref = g_ptr_array_index (reg->apps, i);
if (!g_strcmp0 (old, ref->name))
{
- remove_application (reg, bus, i);
+ remove_application (reg, i);
i--;
}
- }
+ }
remove_events (reg, old, "");
}
@@ -471,7 +471,7 @@ impl_Unembed (DBusMessage *message, void *user_data)
dbus_message_iter_get_basic (&iter_struct, &obj_path);
if (find_index_of_reference (reg->apps, app_name, obj_path, &index))
- remove_application (reg, reg->bus, index);
+ remove_application (reg, index);
return NULL;
error: