marko10_000
/
flatpak-builder
forked from Mirrors/flatpak-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add --socket=fallback-x11 support 

This requires a recent flatpak to actually work.
tingping/wmclass
Alexander Larsson 2018-02-14 11:49:33 +01:00
parent dce8981162
commit 1f15907893
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/builder-flatpak-utils.c
View File

@ -1294,6 +1294,7 @@ typedef enum {
FLATPAK_CONTEXT_SOCKET_PULSEAUDIO = 1 << 2,
FLATPAK_CONTEXT_SOCKET_SESSION_BUS = 1 << 3,
FLATPAK_CONTEXT_SOCKET_SYSTEM_BUS = 1 << 4,
FLATPAK_CONTEXT_SOCKET_FALLBACK_X11 = 1 << 5, /* For backwards compat, also set SOCKET_X11 */
} FlatpakContextSockets;
/* Same order as enum */
@ -1303,6 +1304,7 @@ const char *flatpak_context_sockets[] = {
"pulseaudio",
"session-bus",
"system-bus",
"fallback-x11",
NULL
};
@ -1941,6 +1943,9 @@ option_socket_cb (const gchar *option_name,
if (socket == 0)
return FALSE;
if (socket == FLATPAK_CONTEXT_SOCKET_FALLBACK_X11)
socket |= FLATPAK_CONTEXT_SOCKET_X11;
flatpak_context_add_sockets (context, socket);
return TRUE;
@ -1959,6 +1964,9 @@ option_nosocket_cb (const gchar *option_name,
if (socket == 0)
return FALSE;
if (socket == FLATPAK_CONTEXT_SOCKET_FALLBACK_X11)
socket |= FLATPAK_CONTEXT_SOCKET_X11;
flatpak_context_remove_sockets (context, socket);
return TRUE;