luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'form-default-gdbusaddress' into 'main'

Browse Source 
gdbusaddress: Form default system dbus path using meson definitions

See merge request GNOME/glib!3095
This commit is contained in:
Philip Withnall 2022-11-28 18:36:47 +00:00
commit 5218765de2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gio/gdbusaddress.c
View File

@ -1337,7 +1337,10 @@ g_dbus_address_get_for_bus_sync (GBusType bus_type,
if (ret == NULL) if (ret == NULL)
{ {
ret = g_strdup ("unix:path=/var/run/dbus/system_bus_socket"); /* While the D-Bus specification says this must be `/var/run/dbus/system_bus_socket`,
* a footnote allows it to use localstatedir:
* https://dbus.freedesktop.org/doc/dbus-specification.html#ftn.id-1.13.6.4.3.3 */
ret = g_strdup ("unix:path=" GLIB_LOCALSTATEDIR "/run/dbus/system_bus_socket");
} }
break; break;

2
meson.build
View File

@ -2109,6 +2109,8 @@ glib_conf.set('HAVE_GETTEXT', 1)
glib_conf.set_quoted('GLIB_LOCALE_DIR', join_paths(glib_datadir, 'locale')) glib_conf.set_quoted('GLIB_LOCALE_DIR', join_paths(glib_datadir, 'locale'))
glib_conf.set_quoted('GLIB_LOCALSTATEDIR', glib_localstatedir)
# libmount is only used by gio, but we need to fetch the libs to generate the # libmount is only used by gio, but we need to fetch the libs to generate the
# pkg-config file below # pkg-config file below
libmount_dep = [] libmount_dep = []