From: Thiago Macieira <thiago@kde.org>
Date: Sun, 23 Apr 2006 18:54:47 +0000 (+0000)
Subject: 	* dbus/dbus-connection.c: Interfaces are optional in method
X-Git-Tag: dbus-0.62~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bed69341bb0e0e087bd7429413c32185916feef4;p=thirdparty%2Fdbus.git

	* 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 baf1390f3..9b52b8b87 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 db6723b3d..4a2d087be 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));