From 83ce7b267c5faadc869689e50115573517e823e7 Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Tue, 19 Apr 2005 13:14:55 +0000 Subject: [PATCH] * dbus/dbus-marshal-header.c (_dbus_header_create): Fix assert so that it allows messages that are not signals to pass in NULL as the interface. --- ChangeLog | 6 ++++++ dbus/dbus-marshal-header.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ff548d35..7802a2e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-04-19 John (J5) Palmieri + + * dbus/dbus-marshal-header.c (_dbus_header_create): Fix assert + so that it allows messages that are not signals to pass in + NULL as the interface. + 2005-04-18 David Zeuthen * glib/dbus-gmain.c (io_handler_destroy_source): diff --git a/dbus/dbus-marshal-header.c b/dbus/dbus-marshal-header.c index cd6f8950..3df19602 100644 --- a/dbus/dbus-marshal-header.c +++ b/dbus/dbus-marshal-header.c @@ -527,7 +527,7 @@ _dbus_header_create (DBusHeader *header, DBusTypeWriter writer; DBusTypeWriter array; - _dbus_assert ((interface && member) || + _dbus_assert (((interface || message_type != DBUS_MESSAGE_TYPE_SIGNAL) && member) || (error_name) || !(interface || member || error_name)); _dbus_assert (_dbus_string_get_length (&header->data) == 0); -- 2.34.1