diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | dbus/dbus-dataslot.c | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -1,5 +1,14 @@ 2006-08-14 John (J5) Palmieri <johnp@redhat.com> + * dbus/dbus-dataslot.c (_dbus_data_slot_allocator_alloc): + Change _dbus_abort to _dbus_assert_not_reached because _dbus_abort + causes compile problems when asserts are turned off + Keeping _dbus_warn for printing out the message so even if + asserts are turned off the user gets the messages that something is + wrong + +2006-08-14 John (J5) Palmieri <johnp@redhat.com> + Patches by Kjartan Maraas <kmaraas at gnome dot org> * bus/services.c (bus_service_list_queued_owners): diff --git a/dbus/dbus-dataslot.c b/dbus/dbus-dataslot.c index 83e25865..78e94c37 100644 --- a/dbus/dbus-dataslot.c +++ b/dbus/dbus-dataslot.c @@ -81,7 +81,7 @@ _dbus_data_slot_allocator_alloc (DBusDataSlotAllocator *allocator, 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 (); + _dbus_assert_not_reached ("exiting"); } if (*slot_id_p >= 0) |