* 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.

diff --git a/ChangeLog b/ChangeLog
index baf1390f386785ba088d52d0b152f52917448f74..9b52b8b8767cefceba8f1e9646e52ccc3d720137 100644 (file)
--- 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 db6723b3d9ccbb8020af47196ed0cc3d31d9a165..4a2d087be269f694ee78b5300e3bca7ca113ace5 100644 (file)
--- 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));