From bed69341bb0e0e087bd7429413c32185916feef4 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 23 Apr 2006 18:54:47 +0000 Subject: [PATCH] * 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. --- ChangeLog | 8 +++++++- dbus/dbus-connection.c | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index baf1390..9b52b8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -2006-04-23 Thiago Macieira + + * 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 * 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)); -- 2.7.4