Merge branch 'win32-autolaunch' into 'main'

dbus/win: use a Unix socket if possible for autolaunch:

See merge request dbus/dbus!327
This commit is contained in:
Marc-André Lureau 2025-09-09 10:20:21 +00:00
commit e4ddf34d65

View file

@ -66,12 +66,17 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry,
const char *port = "0";
const char *family = "ipv4";
const char *scope = dbus_address_entry_get_value (entry, "scope");
const char *tmp = _dbus_get_tmpdir ();
if (_dbus_daemon_is_session_bus_address_published (scope))
return DBUS_SERVER_LISTEN_ADDRESS_ALREADY_USED;
*server_p = _dbus_server_new_for_tcp_socket (host, bind, port,
family, error, FALSE);
*server_p = _dbus_server_new_for_dir (tmp, FALSE, NULL);
if (!*server_p)
*server_p = _dbus_server_new_for_tcp_socket (host, bind, port,
family, error, FALSE);
if (*server_p)
{
_DBUS_ASSERT_ERROR_IS_CLEAR(error);