diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-02-26 06:42:57 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-02-26 06:42:57 +0000 |
| commit | 7265423411609c14ddb9e6643463b840afcaa09b (patch) | |
| tree | 199b4d4bee1531333292518bf83425eb01ad2fd3 /dbus/dbus-threads.c | |
| parent | 3781f063a6dfbdeafea6d1c6c8ac10c8b22f8586 (diff) | |
2003-02-26 Havoc Pennington <hp@pobox.com>
* dbus/dbus-connection.c
(dbus_connection_send_message_with_reply_and_block): fix crash
where we ref'd the outgoing message instead of the returned reply
* dbus/dbus-transport-unix.c (do_authentication): check read watch
at the end of this function, so if we didn't need to read for
authentication, we reinstall it for receiving messages
* dbus/dbus-message.c (dbus_message_new_reply): allow replies to
a NULL sender for peer-to-peer case
* dbus/dbus-transport-unix.c (check_read_watch): handle
!authenticated case correctly
* glib/dbus-gmain.c: add support for DBusServer
* dbus/dbus-server.c: add data slot support
* glib/dbus-gmain.c (dbus_connection_setup_with_g_main): check
return values and handle errors
* dbus/dbus-dataslot.c: factor out the data slot stuff from
DBusConnection
* Doxyfile.in (INPUT): add glib subdir
* glib/dbus-gmain.c (dbus_connection_setup_with_g_main): rename
setup_with_g_main instead of hookup_with_g_main; write docs
Diffstat (limited to 'dbus/dbus-threads.c')
| -rw-r--r-- | dbus/dbus-threads.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dbus/dbus-threads.c b/dbus/dbus-threads.c index 2a903a27..08cebf50 100644 --- a/dbus/dbus-threads.c +++ b/dbus/dbus-threads.c @@ -205,7 +205,8 @@ init_static_locks(void) DBusMutex *mutex; } static_locks[] = { {&_dbus_list_init_lock}, - {&_dbus_allocated_slots_init_lock}, + {&_dbus_server_slots_init_lock}, + {&_dbus_connection_slots_init_lock}, {&_dbus_atomic_init_lock}, {&_dbus_message_handler_init_lock}, {&_dbus_user_info_init_lock} |