diff options
author | Thiago Macieira <thiago.macieira@trolltech.com> | 2006-04-23 18:54:47 +0000 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@trolltech.com> | 2006-04-23 18:54:47 +0000 |
commit | 5a6a63b69017be37598d66945c0d744ea9723e2d (patch) | |
tree | 0b38bffcb5648c96166060bb6cd49cf47a71a68c | |
parent | 566a3fc16baad4e8a549fb682971093e0fbc0ab1 (diff) |
* dbus/dbus-connection.c: Interfaces are optional in method
calls, so don't give up if the interface parameter is NULL.
Patch reviewed by Havoc Pennington.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | dbus/dbus-connection.c | 3 |
2 files changed, 8 insertions, 3 deletions
@@ -1,4 +1,10 @@ -2006-04-23 Thiago Macieira <thiago.macieira@trolltech.com +2006-04-23 Thiago Macieira <thiago.macieira@trolltech.com> + + * dbus/dbus-connection.c: Interfaces are optional in method + calls, so don't give up if the interface parameter is NULL. + Patch reviewed by Havoc Pennington. + +2006-04-23 Thiago Macieira <thiago.macieira@trolltech.com> * qt/qdbusreply.h: Add default constructor and operator= (r532625) diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index db6723b..4a2d087 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -2257,8 +2257,7 @@ dbus_connection_send_preallocated (DBusConnection *connection, _dbus_return_if_fail (message != NULL); _dbus_return_if_fail (preallocated->connection == connection); _dbus_return_if_fail (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_METHOD_CALL || - (dbus_message_get_interface (message) != NULL && - dbus_message_get_member (message) != NULL)); + dbus_message_get_member (message) != NULL); _dbus_return_if_fail (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL || (dbus_message_get_interface (message) != NULL && dbus_message_get_member (message) != NULL)); |