summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-01-30 01:49:54 +0000
committerHavoc Pennington <hp@redhat.com>2003-01-30 01:49:54 +0000
commit8fdd8915bd7424cdf90bf59a018838a1290ac0c4 (patch)
treefcf11af981ced7a4d38a1cad93832583f5f29ffa
parent5147583541706d4d67e735175fc5cdf6ece59a51 (diff)
2003-01-29 Havoc Pennington <hp@pobox.com>
* dbus/dbus-message.c (check_message_handling): fix assertion failure on set_client_serial
-rw-r--r--ChangeLog5
-rw-r--r--dbus/dbus-message.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 04709c6f..7e0f9cdd 100644
--- 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 95baa7b2..b1dd8564 100644
--- 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))
{