dbus/dbus dbus-marshal-header.c,1.10,1.11

John Palmieri johnp at freedesktop.org
Tue Apr 19 06:14:57 PDT 2005


Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv16806/dbus

Modified Files:
	dbus-marshal-header.c 
Log Message:
* 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.
		


Index: dbus-marshal-header.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-marshal-header.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dbus-marshal-header.c	17 Feb 2005 21:19:49 -0000	1.10
+++ dbus-marshal-header.c	19 Apr 2005 13:14:55 -0000	1.11
@@ -527,7 +527,7 @@
   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);



More information about the dbus-commit mailing list