diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | dbus/dbus-dataslot.c | 7 |
2 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2006-08-09 John (J5) Palmieri <johnp@redhat.com> + + * dbus/dbus-dataslot.c (_dbus_data_slot_allocator_alloc): + Change an assert to a detailed warning and abort. + When allocator->lock != mutex it indicates that the user has failed + to initalize threads before using the D-Bus library. This warning + helps the user identify the issue and fix their app. + 2006-08-08 John (J5) Palmieri <johnp@redhat.com> These are all patches from Kjartan Maraas <kmaraas at gnome dot org> diff --git a/dbus/dbus-dataslot.c b/dbus/dbus-dataslot.c index 8a2937de..8b1bbb87 100644 --- a/dbus/dbus-dataslot.c +++ b/dbus/dbus-dataslot.c @@ -78,8 +78,11 @@ _dbus_data_slot_allocator_alloc (DBusDataSlotAllocator *allocator, _dbus_assert (allocator->lock == NULL); allocator->lock = mutex; } - else - _dbus_assert (allocator->lock == mutex); + else if (allocator->lock != mutex) + { + _dbus_warn ("D-Bus threads were initialized after first using the D-Bus library. If your application does not directly initialize threads or use D-Bus, keep in mind that some library or plugin may have used D-Bus or initialized threads behind your back. You can often fix this problem by calling dbus_init_threads() or dbus_g_threads_init() early in your main() method, before D-Bus is used."); + _dbus_abort (); + } if (*slot_id_p >= 0) { |