diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-22 18:50:02 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-25 18:16:53 +0000 |
| commit | 8db220cbf24026277e283ec51fe2c136c4100d6e (patch) | |
| tree | 41591dc79281daee81285d8977ae8b6a7cfdfc4a | |
| parent | 15e114b6989d474f12e1e64d74467916392b6977 (diff) | |
_dbus_connection_message_sent: rename to _unlocked
It's called with the connection's lock held.
| -rw-r--r-- | dbus/dbus-connection-internal.h | 2 | ||||
| -rw-r--r-- | dbus/dbus-connection.c | 6 | ||||
| -rw-r--r-- | dbus/dbus-transport-socket.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h index cdf3f59d..7e315db9 100644 --- a/dbus/dbus-connection-internal.h +++ b/dbus/dbus-connection-internal.h @@ -54,7 +54,7 @@ void _dbus_connection_queue_received_message_link (DBusConnection DBusList *link); dbus_bool_t _dbus_connection_has_messages_to_send_unlocked (DBusConnection *connection); DBusMessage* _dbus_connection_get_message_to_send (DBusConnection *connection); -void _dbus_connection_message_sent (DBusConnection *connection, +void _dbus_connection_message_sent_unlocked (DBusConnection *connection, DBusMessage *message); dbus_bool_t _dbus_connection_add_watch_unlocked (DBusConnection *connection, DBusWatch *watch); diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index 6779b6ae..3538ee3e 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -599,8 +599,8 @@ _dbus_connection_get_message_to_send (DBusConnection *connection) * @param message the message that was sent. */ void -_dbus_connection_message_sent (DBusConnection *connection, - DBusMessage *message) +_dbus_connection_message_sent_unlocked (DBusConnection *connection, + DBusMessage *message) { DBusList *link; @@ -4181,7 +4181,7 @@ notify_disconnected_unlocked (DBusConnection *connection) while ((link = _dbus_list_get_last_link (&connection->outgoing_messages))) { - _dbus_connection_message_sent (connection, link->data); + _dbus_connection_message_sent_unlocked (connection, link->data); } } } diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c index 1d4c2bf7..779505ae 100644 --- a/dbus/dbus-transport-socket.c +++ b/dbus/dbus-transport-socket.c @@ -677,8 +677,8 @@ do_writing (DBusTransport *transport) _dbus_string_set_length (&socket_transport->encoded_outgoing, 0); _dbus_string_compact (&socket_transport->encoded_outgoing, 2048); - _dbus_connection_message_sent (transport->connection, - message); + _dbus_connection_message_sent_unlocked (transport->connection, + message); } } } |