summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDebarshi Ray <debarshir@gnome.org>2019-08-13 18:01:30 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2019-08-16 09:13:43 +0000
commit61d4316043ffbce60d358b5b35c466ddc0594c06 (patch)
treed147db24ef286a54507be3f3e2b108fdfe323f04
parentcde7934041dcff7dea93b03a70a71a0259a9fc13 (diff)
downloadflatpak-61d4316043ffbce60d358b5b35c466ddc0594c06.tar.gz
common, session-helper: Make the session helper more self-contained
... by moving the definition of FlatpakHostCommandFlags from the 'common' sub-directory to 'session-helper'. It hasn't been used by anything else ever since flatpak-builder was moved to a separate repository in commit 52bd14656151fe63. Closes: #3052 Approved by: alexlarsson
-rw-r--r--common/flatpak-utils-private.h5
-rw-r--r--session-helper/flatpak-session-helper.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/common/flatpak-utils-private.h b/common/flatpak-utils-private.h
index a5c03ceb..0151b525 100644
--- a/common/flatpak-utils-private.h
+++ b/common/flatpak-utils-private.h
@@ -37,11 +37,6 @@
#define AUTOFS_SUPER_MAGIC 0x0187
-typedef enum {
- FLATPAK_HOST_COMMAND_FLAGS_CLEAR_ENV = 1 << 0,
- FLATPAK_HOST_COMMAND_FLAGS_WATCH_BUS = 1 << 1,
-} FlatpakHostCommandFlags;
-
#define FLATPAK_ANSI_ALT_SCREEN_ON "\x1b[?1049h"
#define FLATPAK_ANSI_ALT_SCREEN_OFF "\x1b[?1049l"
#define FLATPAK_ANSI_HIDE_CURSOR "\x1b[?25l"
diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c
index 5dd7629e..0fbac666 100644
--- a/session-helper/flatpak-session-helper.c
+++ b/session-helper/flatpak-session-helper.c
@@ -30,6 +30,11 @@
#include "flatpak-dbus-generated.h"
#include "flatpak-utils-private.h"
+typedef enum {
+ FLATPAK_HOST_COMMAND_FLAGS_CLEAR_ENV = 1 << 0,
+ FLATPAK_HOST_COMMAND_FLAGS_WATCH_BUS = 1 << 1,
+} FlatpakHostCommandFlags;
+
static char *monitor_dir;
static char *p11_kit_server_socket_path;
static int p11_kit_server_pid = 0;