* 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.

diff --git a/ChangeLog b/ChangeLog
index ff548d35d484f6586768832834d0e505be97ac6e..7802a2e99cc393cf4207b7b5d80bcffa8fcc2e77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 cd6f8950386daca70a4e0d0a5318cb999948f9c6..3df19602a1b8f3a10a0f68a7ce63a120de30f831 100644 (file)
--- 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);