summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago@kde.org>2006-04-23 18:54:47 +0000
committerThiago Macieira <thiago@kde.org>2006-04-23 18:54:47 +0000
commitbed69341bb0e0e087bd7429413c32185916feef4 (patch)
tree848e6e0b128a763dcf783789756ff80349f593cc
parent02b7fc2df397960e85e13cd1d67a285a22daef22 (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--ChangeLog8
-rw-r--r--dbus/dbus-connection.c3
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index baf1390f..9b52b8b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 db6723b3..4a2d087b 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));