2003-01-29 Havoc Pennington <hp@pobox.com>

	* dbus/dbus-message.c (check_message_handling): fix assertion
	failure on set_client_serial

diff --git a/ChangeLog b/ChangeLog
index 04709c6..7e0f9cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-29  Havoc Pennington  <hp@pobox.com>
+
+       * dbus/dbus-message.c (check_message_handling): fix assertion
+       failure on set_client_serial
+
 2003-01-28  Havoc Pennington  <hp@pobox.com>
 
        * dbus/dbus-server-debug.c: Add doc section comments

diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 95baa7b..b1dd856 100644 (file)
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -2097,7 +2097,10 @@ check_message_handling (DBusMessage *message)
   iter = NULL;
   
   client_serial = _dbus_message_get_client_serial (message);
-  _dbus_message_set_client_serial (message, client_serial);
+
+  /* can't use set_client_serial due to the assertions at the start of it */
+  set_int_field (message, FIELD_CLIENT_SERIAL,
+                 client_serial);
 
   if (client_serial != _dbus_message_get_client_serial (message))
     {