diff options
author | John (J5) Palmieri <johnp@redhat.com> | 2005-04-19 13:14:55 +0000 |
---|---|---|
committer | John (J5) Palmieri <johnp@redhat.com> | 2005-04-19 13:14:55 +0000 |
commit | 83ce7b267c5faadc869689e50115573517e823e7 (patch) | |
tree | 5837f5fad062f88fa612582165a979a6dc616c59 | |
parent | 087140dfc4fef43a29e502e073f19d0c07c97fce (diff) |
* 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.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | dbus/dbus-marshal-header.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2005-04-19 John (J5) Palmieri <johnp@redhat.com> + + * 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 <davidz@redhat.com> * 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); |