From fd5cf0ecc5b812111f09d23f244aa646bea1173e Mon Sep 17 00:00:00 2001 From: Mark Doffman Date: Wed, 3 Feb 2010 17:09:30 -0800 Subject: [PATCH] Move the application argument to the end of the event structure to allow matching on the minor string. --- registryd/deviceeventcontroller.c | 12 ++++++------ registryd/registry.c | 13 ++++++++++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c index 8e0b856..20d5ea2 100644 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@ -405,12 +405,6 @@ static void emit(SpiDEController *controller, const char *interface, const char dbus_message_iter_init_append (signal, &iter); - dbus_message_iter_open_container (&iter, DBUS_TYPE_STRUCT, NULL, - &iter_struct); - dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &bus_name); - dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path); - dbus_message_iter_close_container (&iter, &iter_struct); - dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &minor); dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &a1); dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &a2); @@ -418,6 +412,12 @@ static void emit(SpiDEController *controller, const char *interface, const char dbus_message_iter_append_basic (&iter_variant, DBUS_TYPE_INT32, &nil); dbus_message_iter_close_container (&iter, &iter_variant); + dbus_message_iter_open_container (&iter, DBUS_TYPE_STRUCT, NULL, + &iter_struct); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &bus_name); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path); + dbus_message_iter_close_container (&iter, &iter_struct); + dbus_connection_send (controller->bus, signal, NULL); } diff --git a/registryd/registry.c b/registryd/registry.c index 8f016bb..16b72d0 100644 --- a/registryd/registry.c +++ b/registryd/registry.c @@ -676,9 +676,6 @@ emit_event (DBusConnection *bus, dbus_message_iter_init_append(sig, &iter); - append_reference (&iter, - dbus_bus_get_unique_name (bus), - SPI_DBUS_PATH_ROOT); dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &minor); dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail1); dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail2); @@ -688,6 +685,10 @@ emit_event (DBusConnection *bus, append_reference (&iter_variant, name, path); dbus_message_iter_close_container (&iter, &iter_variant); + append_reference (&iter, + dbus_bus_get_unique_name (bus), + SPI_DBUS_PATH_ROOT); + dbus_connection_send(bus, sig, NULL); dbus_message_unref(sig); } @@ -871,6 +872,12 @@ handle_method (DBusConnection *bus, DBusMessage *message, void *user_data) dbus_connection_send (bus, reply, NULL); dbus_message_unref (reply); } +#if 0 + else + { + g_print ("Registry | Unhandled message : %s|%s\n", iface, member); + } +#endif return result; } -- 2.7.4