Merge branch 'dbus-1.4'

This commit is contained in:
Lennart Poettering 2011-07-28 21:45:35 +02:00
commit 7953ca2f81

View file

@ -819,8 +819,6 @@ _dbus_connect_unix_socket (const char *path,
path, _dbus_strerror (errno));
_dbus_close (fd, NULL);
fd = -1;
return -1;
}
@ -829,8 +827,6 @@ _dbus_connect_unix_socket (const char *path,
_DBUS_ASSERT_ERROR_IS_SET (error);
_dbus_close (fd, NULL);
fd = -1;
return -1;
}