summaryrefslogtreecommitdiff
path: root/src/dbus-patches/capi-dbus-send-with-reply-and-block-delete-reply-on-error.patch
blob: 51f395357ea0100d0c7a341cde5126f40480530c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 5962e77..4a4ee9b 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -3709,13 +3709,9 @@ dbus_connection_send_with_reply_and_block (DBusConnection     *connection,
    */
   _dbus_assert (reply != NULL);
   
-   if (dbus_set_error_from_message (error, reply))
-    {
-      dbus_message_unref (reply);
-      return NULL;
-    }
-  else
-    return reply;
+  dbus_set_error_from_message (error, reply);
+
+  return reply;
 }
 
 /**
@@ -6447,3 +6443,4 @@ _dbus_connection_get_address (DBusConnection *connection)
 #endif
 
 /** @} */
+