From: John (J5) Palmieri <johnp@redhat.com>
Date: Tue, 19 Apr 2005 13:14:55 +0000 (+0000)
Subject: * dbus/dbus-marshal-header.c (_dbus_header_create): Fix assert
X-Git-Tag: dbus-0.33.0~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83ce7b267c5faadc869689e50115573517e823e7;p=thirdparty%2Fdbus.git

* 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 ff548d35d..7802a2e99 100644
--- 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 cd6f89503..3df19602a 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);