dbus proxy: Don't store the temporary sockets in $XDG_RUN_DIR/bus-proxy

This just causes us to leave this empty directory around. Instead we
use hidden files directly in $XDG_RUN_DIR/.
tingping/wmclass
Alexander Larsson 2016-06-16 22:29:16 +02:00
parent cbe35fedbc
commit 6cbc9a7932
1 changed files with 3 additions and 7 deletions

View File

@ -1534,13 +1534,9 @@ flatpak_run_add_pulseaudio_args (GPtrArray *argv_array,
static char *
create_proxy_socket (char *template)
{
g_autofree char *dir = g_build_filename (g_get_user_runtime_dir (), "bus-proxy", NULL);
g_autofree char *proxy_socket = g_build_filename (dir, template, NULL);
g_autofree char *proxy_socket = g_build_filename (g_get_user_runtime_dir (), template, NULL);
int fd;
if (mkdir (dir, 0700) == -1 && errno != EEXIST)
return NULL;
fd = g_mkstemp (proxy_socket);
if (fd == -1)
return NULL;
@ -1578,7 +1574,7 @@ flatpak_run_add_system_dbus_args (FlatpakContext *context,
else if (dbus_proxy_argv &&
g_hash_table_size (context->system_bus_policy) > 0)
{
g_autofree char *proxy_socket = create_proxy_socket ("system-bus-proxy-XXXXXX");
g_autofree char *proxy_socket = create_proxy_socket (".system-bus-proxy-XXXXXX");
if (proxy_socket == NULL)
return FALSE;
@ -1629,7 +1625,7 @@ flatpak_run_add_session_dbus_args (GPtrArray *argv_array,
}
else if (dbus_proxy_argv && dbus_address != NULL)
{
g_autofree char *proxy_socket = create_proxy_socket ("session-bus-proxy-XXXXXX");
g_autofree char *proxy_socket = create_proxy_socket (".session-bus-proxy-XXXXXX");
if (proxy_socket == NULL)
return FALSE;