diff options
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/connection.c | 9 | ||||
| -rw-r--r-- | bus/connection.h | 3 | ||||
| -rw-r--r-- | bus/dispatch.c | 11 |
3 files changed, 14 insertions, 9 deletions
diff --git a/bus/connection.c b/bus/connection.c index 2119ed9a..40bbc325 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -38,9 +38,8 @@ typedef struct #define BUS_CONNECTION_DATA(connection) (dbus_connection_get_data ((connection), connection_data_slot)) -static void -connection_disconnect_handler (DBusConnection *connection, - void *data) +void +bus_connection_disconnect (DBusConnection *connection) { BusConnectionData *d; BusService *service; @@ -157,10 +156,6 @@ bus_connection_setup (DBusConnection *connection) connection, NULL); - dbus_connection_set_disconnect_function (connection, - connection_disconnect_handler, - NULL, NULL); - /* Setup the connection with the dispatcher */ if (!bus_dispatch_add_connection (connection)) return FALSE; diff --git a/bus/connection.h b/bus/connection.h index 8a6b6641..04ab1f08 100644 --- a/bus/connection.h +++ b/bus/connection.h @@ -47,5 +47,8 @@ const char *bus_connection_get_name (DBusConnection *connection); void bus_connection_foreach (BusConnectionForeachFunction function, void *data); +/* called by dispatch.c */ +void bus_connection_disconnect (DBusConnection *connection); + #endif /* BUS_CONNECTION_H */ 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); } |