diff options
author | Alexander Larsson <alexl@redhat.com> | 2003-02-15 16:25:08 +0000 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2003-02-15 16:25:08 +0000 |
commit | fe4018941190f8bf020e4a8ed2999c212e0e113d (patch) | |
tree | 37f34a8405a5d1bc765a72b4457e47c212c0ca5f /bus/dispatch.c | |
parent | ece62d7c14aab02ee0b3d3d6e15a22b663ef8da2 (diff) |
2003-02-15 Alexander Larsson <alexl@redhat.com>
* dbus/dbus-threads.c:
* dbus/dbus-threads.h:
Add condvars. Remove static mutext from API.
Implement static mutexes by initializing them from threads_init.
* glib/dbus-gthread.c:
* qt/dbus-qthread.cpp:
Update with the thread api changes.
* dbus/dbus-list.c:
* dbus/dbus-list.h:
Turn StaticMutex into normal mutex + init function.
Export new functions _dbus_list_alloc_link, _dbus_list_free_link,
_dbus_list_append_link, _dbus_list_prepend_link
* dbus/dbus-sysdeps.c:
* dbus/dbus-sysdeps.h:
New type dbus_atomic_t, and new functions _dbus_atomic_inc,
_dbus_atomic_dec. Only slow fallback implementation at the moment.
* dbus/dbus-protocol.h:
Add DBUS_MESSAGE_LOCAL_DISCONNECT define
* dbus/dbus-message.c:
Make ref/unref atomic.
Fix some docs.
* dbus/dbus-connection-internal.h:
* dbus/dbus-connection.c:
* dbus/dbus-connection.h:
Make threadsafe.
Change _peek to _borrow,_return & _steal_borrowed.
Change disconnect callback to event.
Make dbus_connection_dispatch_messages reentrant.
* dbus/dbus-transport.c:
Don't ref the connection on calls to the transport
implementation.
* dbus/dbus-message-handler.c:
Make threadsafe.
* glib/dbus-gmain.c:
Don't use peek_message anymore
* test/Makefile.am:
* test/debug-thread.c:
* test/debug-thread.h:
Simple thread implementation that asserts() on deadlocks in
single-threaded code.
* test/bus-test.c:
(main) Call debug_threads_init.
* test/watch.c:
Use disconnect message instead of disconnect callback.
* bus/connection.c:
* bus/connection.h:
Don't call dbus_connection_set_disconnect_function. Instead export
bus_connection_disconnect.
* bus/dispatch.c:
Call bus_connection_disconnect when we get a disconnected message.
Diffstat (limited to 'bus/dispatch.c')
-rw-r--r-- | bus/dispatch.c | 11 |
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); } |