[at-spi2-core: 22/47] handle_disconnection(): Put the SpiRegistry argument first
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-core: 22/47] handle_disconnection(): Put the SpiRegistry argument first
- Date: Wed, 13 Jul 2022 03:08:27 +0000 (UTC)
commit 0a6d98ab0cc5b45fa3d31901e5f26c5137db9ab7
Author: Federico Mena Quintero <federico gnome org>
Date: Fri Jul 8 18:15:53 2022 -0500
handle_disconnection(): Put the SpiRegistry argument first
It trickled down as user_data, but this is not a callback.
registryd/registry.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/registryd/registry.c b/registryd/registry.c
index 3fd8db5c..7490f5c6 100644
--- a/registryd/registry.c
+++ b/registryd/registry.c
@@ -325,10 +325,9 @@ remove_events (SpiRegistry *registry, const char *bus_name, const char *event)
}
static void
-handle_disconnection (DBusMessage *message, void *user_data)
+handle_disconnection (SpiRegistry *reg, DBusMessage *message)
{
char *name, *old, *new;
- SpiRegistry *reg = SPI_REGISTRY (user_data);
if (dbus_message_get_args (message, NULL,
DBUS_TYPE_STRING, &name,
@@ -393,7 +392,9 @@ ensure_proper_format (const char *name)
static DBusHandlerResult
signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
{
+ SpiRegistry *reg = SPI_REGISTRY (user_data);
guint res = DBUS_HANDLER_RESULT_HANDLED;
+
const gint type = dbus_message_get_type (message);
const char *iface = dbus_message_get_interface (message);
const char *member = dbus_message_get_member (message);
@@ -403,7 +404,7 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
if (!g_strcmp0(iface, DBUS_INTERFACE_DBUS) &&
!g_strcmp0(member, "NameOwnerChanged"))
- handle_disconnection (message, user_data);
+ handle_disconnection (reg, message);
else
res = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]