summaryrefslogtreecommitdiffstats
path: root/bus/dispatch.c
diff options
context:
space:
mode:
Diffstat (limited to 'bus/dispatch.c')
-rw-r--r--bus/dispatch.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/bus/dispatch.c b/bus/dispatch.c
index 5b069593..4e42f9a0 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -51,16 +51,23 @@ bus_dispatch_message_handler (DBusMessageHandler *handler,
DBusMessage *message,
void *user_data)
{
- const char *sender, *service_name;
+ const char *sender, *service_name, *message_name;
/* Assign a sender to the message */
sender = bus_connection_get_name (connection);
BUS_HANDLE_OOM (dbus_message_set_sender (message, sender));
service_name = dbus_message_get_service (message);
+ message_name = dbus_message_get_name (message);
+
+ /* TODO: Crashes if service_name == NULL */
/* See if the message is to the driver */
- if (strcmp (service_name, DBUS_SERVICE_DBUS) == 0)
+ if (message_name && strcmp (message_name, DBUS_MESSAGE_LOCAL_DISCONNECT) == 0)
+ {
+ bus_connection_disconnect (connection);
+ }
+ else if (strcmp (service_name, DBUS_SERVICE_DBUS) == 0)
{
bus_driver_handle_message (connection, message);
}