flatpak-builtins-enter.c (flatpak-1.8.2.tar.xz) | : | flatpak-builtins-enter.c (flatpak-1.8.3.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 274 | skipping to change at line 274 | |||
pulse_path = g_strdup_printf ("/run/user/%d/pulse/native", uid); | pulse_path = g_strdup_printf ("/run/user/%d/pulse/native", uid); | |||
if (g_file_test (pulse_path, G_FILE_TEST_EXISTS)) | if (g_file_test (pulse_path, G_FILE_TEST_EXISTS)) | |||
{ | { | |||
g_ptr_array_add (envp_array, g_strdup_printf ("PULSE_SERVER=unix:%s", puls e_path)); | g_ptr_array_add (envp_array, g_strdup_printf ("PULSE_SERVER=unix:%s", puls e_path)); | |||
g_ptr_array_add (envp_array, g_strdup_printf ("PULSE_CLIENTCONFIG=/run/use r/%d/pulse/config", uid)); | g_ptr_array_add (envp_array, g_strdup_printf ("PULSE_CLIENTCONFIG=/run/use r/%d/pulse/config", uid)); | |||
} | } | |||
session_bus_path = g_strdup_printf ("/run/user/%d/bus", uid); | session_bus_path = g_strdup_printf ("/run/user/%d/bus", uid); | |||
if (g_file_test (session_bus_path, G_FILE_TEST_EXISTS)) | if (g_file_test (session_bus_path, G_FILE_TEST_EXISTS)) | |||
g_ptr_array_add (envp_array, g_strdup_printf ("DBUS_SESSION_BUS_ADDRESS=unix :%s", session_bus_path)); | g_ptr_array_add (envp_array, g_strdup_printf ("DBUS_SESSION_BUS_ADDRESS=unix :path=%s", session_bus_path)); | |||
if (g_file_test ("/run/dbus/system_bus_socket", G_FILE_TEST_EXISTS)) | if (g_file_test ("/run/dbus/system_bus_socket", G_FILE_TEST_EXISTS)) | |||
g_ptr_array_add (envp_array, g_strdup ("DBUS_SYSTEM_BUS_ADDRESS=unix:/run/db us/system_bus_socket")); | g_ptr_array_add (envp_array, g_strdup ("DBUS_SYSTEM_BUS_ADDRESS=unix:path=/r un/dbus/system_bus_socket")); | |||
g_ptr_array_add (envp_array, NULL); | g_ptr_array_add (envp_array, NULL); | |||
argv_array = g_ptr_array_new_with_free_func (g_free); | argv_array = g_ptr_array_new_with_free_func (g_free); | |||
for (i = 1; i < rest_argc; i++) | for (i = 1; i < rest_argc; i++) | |||
g_ptr_array_add (argv_array, g_strdup (argv[rest_argv_start + i])); | g_ptr_array_add (argv_array, g_strdup (argv[rest_argv_start + i])); | |||
g_ptr_array_add (argv_array, NULL); | g_ptr_array_add (argv_array, NULL); | |||
if (!g_spawn_sync (NULL, (char **) argv_array->pdata, (char **) envp_array->pd ata, | if (!g_spawn_sync (NULL, (char **) argv_array->pdata, (char **) envp_array->pd ata, | |||
G_SPAWN_SEARCH_PATH_FROM_ENVP | G_SPAWN_CHILD_INHERITS_STDI N, | G_SPAWN_SEARCH_PATH_FROM_ENVP | G_SPAWN_CHILD_INHERITS_STDI N, | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |