dbus/dbus dbus-dataslot.c,1.12,1.13

[John Palmieri]

Update of /cvs/dbus/dbus/dbus
In directory kemper:/tmp/cvs-serv17496/dbus

Modified Files:
	dbus-dataslot.c 
Log Message:
 * 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


Index: dbus-dataslot.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-dataslot.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- dbus-dataslot.c	14 Aug 2006 19:11:35 -0000	1.12
+++ dbus-dataslot.c	14 Aug 2006 19:33:20 -0000	1.13
@@ -81,7 +81,7 @@
   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)