gio/gdbusserver: add "unix:" address support on !unix

This is another minor left-over after GNOME/glib!2445.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-04-07 23:54:24 +04:00
parent 18886d43d2
commit e34795b431

View File

@ -51,9 +51,7 @@
#include <io.h> #include <io.h>
#endif #endif
#ifdef G_OS_UNIX
#include "gunixsocketaddress.h" #include "gunixsocketaddress.h"
#endif
#include "glibintl.h" #include "glibintl.h"
@ -673,8 +671,6 @@ g_dbus_server_stop (GDBusServer *server)
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
#ifdef G_OS_UNIX
static gint static gint
random_ascii (void) random_ascii (void)
{ {
@ -823,7 +819,6 @@ try_unix (GDBusServer *server,
} }
return ret; return ret;
} }
#endif
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
@ -1142,10 +1137,8 @@ initable_init (GInitable *initable,
if (FALSE) if (FALSE)
{ {
} }
#ifdef G_OS_UNIX
else if (g_strcmp0 (transport_name, "unix") == 0) else if (g_strcmp0 (transport_name, "unix") == 0)
ret = try_unix (server, address_entry, key_value_pairs, &this_error); ret = try_unix (server, address_entry, key_value_pairs, &this_error);
#endif
else if (g_strcmp0 (transport_name, "tcp") == 0) else if (g_strcmp0 (transport_name, "tcp") == 0)
ret = try_tcp (server, address_entry, key_value_pairs, FALSE, &this_error); ret = try_tcp (server, address_entry, key_value_pairs, FALSE, &this_error);
else if (g_strcmp0 (transport_name, "nonce-tcp") == 0) else if (g_strcmp0 (transport_name, "nonce-tcp") == 0)