mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-13 11:30:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #185 from cosimoc/fixes

Browse Source 
Fixes
This commit is contained in:
matthiasclasen
2016-07-14 21:16:54 -04:00
committed by GitHub
parent 5fc174be4e 692125c115
commit b337f5f74e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/flatpak-dir.c
View File

@@ -122,8 +122,8 @@ flatpak_deploy_finalize (GObject *object)
g_clear_object (&self->dir);
g_clear_pointer (&self->metadata, g_key_file_unref);
g_clear_pointer (&self->system_overrides, g_key_file_unref);
g_clear_pointer (&self->user_overrides, g_key_file_unref);
g_clear_pointer (&self->system_overrides, flatpak_context_free);
g_clear_pointer (&self->user_overrides, flatpak_context_free);
G_OBJECT_CLASS (flatpak_deploy_parent_class)->finalize (object);
}

8
common/flatpak-run.c
View File

@@ -1403,7 +1403,7 @@ flatpak_run_add_x11_args (GPtrArray *argv_array,
char ***envp_p,
gboolean allowed)
{
char *x11_socket = NULL;
g_autofree char *x11_socket = NULL;
const char *display;
/* Always cover /tmp/.X11-unix, that way we never see the host one in case
@@ -1503,7 +1503,7 @@ flatpak_run_add_pulseaudio_args (GPtrArray *argv_array,
GArray *fd_array,
char ***envp_p)
{
char *pulseaudio_socket = g_build_filename (g_get_user_runtime_dir (), "pulse/native", NULL);
g_autofree char *pulseaudio_socket = g_build_filename (g_get_user_runtime_dir (), "pulse/native", NULL);
*envp_p = g_environ_unsetenv (*envp_p, "PULSE_SERVER");
if (g_file_test (pulseaudio_socket, G_FILE_TEST_EXISTS))
@@ -1537,8 +1537,8 @@ flatpak_run_add_pulseaudio_args (GPtrArray *argv_array,
static void
flatpak_run_add_journal_args (GPtrArray *argv_array)
{
const char *journal_socket_socket = g_strdup ("/run/systemd/journal/socket");
const char *journal_stdout_socket = g_strdup ("/run/systemd/journal/stdout");
g_autofree char *journal_socket_socket = g_strdup ("/run/systemd/journal/socket");
g_autofree char *journal_stdout_socket = g_strdup ("/run/systemd/journal/stdout");
if (g_file_test (journal_socket_socket, G_FILE_TEST_EXISTS))
{