diff options
| author | Alexander Larsson <alexl@redhat.com> | 2016-05-12 19:52:48 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2016-05-12 19:52:48 +0200 |
| commit | fe0a1be5f811525ae135588395ec08f87c268555 (patch) | |
| tree | c714b8e9102289658102675b054bb6c6d20e890a /common | |
| parent | 9d6bc9964988842aea8226a3d3320da452bb58ea (diff) | |
| download | xdg-app-fe0a1be5f811525ae135588395ec08f87c268555.tar.gz | |
common: Add flags for flatpak_dir_uninstall
This is better than a list of booleans.
Diffstat (limited to 'common')
| -rw-r--r-- | common/flatpak-dir.c | 5 | ||||
| -rw-r--r-- | common/flatpak-dir.h | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c index 482d19b..7676cc4 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c @@ -3091,8 +3091,7 @@ flatpak_dir_update (FlatpakDir *self, gboolean flatpak_dir_uninstall (FlatpakDir *self, const char *ref, - gboolean keep_ref, - gboolean force_remove, + FlatpakHelperUninstallFlags flags, GCancellable *cancellable, GError **error) { @@ -3104,6 +3103,8 @@ flatpak_dir_uninstall (FlatpakDir *self, g_auto(GStrv) parts = NULL; g_auto(GLnxLockFile) lock = GLNX_LOCK_FILE_INIT; g_autoptr(GVariant) deploy_data = NULL; + gboolean keep_ref = flags & FLATPAK_HELPER_UNINSTALL_FLAGS_KEEP_REF; + gboolean force_remove = flags & FLATPAK_HELPER_UNINSTALL_FLAGS_FORCE_REMOVE; parts = flatpak_decompose_ref (ref, error); if (parts == NULL) diff --git a/common/flatpak-dir.h b/common/flatpak-dir.h index 2755b3b..3d6b2b8 100644 --- a/common/flatpak-dir.h +++ b/common/flatpak-dir.h @@ -45,6 +45,12 @@ typedef enum { FLATPAK_HELPER_DEPLOY_FLAGS_UPDATE = 1 << 0, } FlatpakHelperDeployFlags; +typedef enum { + FLATPAK_HELPER_UNINSTALL_FLAGS_NONE = 0, + FLATPAK_HELPER_UNINSTALL_FLAGS_KEEP_REF = 1 << 0, + FLATPAK_HELPER_UNINSTALL_FLAGS_FORCE_REMOVE = 1 << 1, +} FlatpakHelperUninstallFlags; + #define FLATPAK_HELPER_DEPLOY_FLAGS_ALL (FLATPAK_HELPER_DEPLOY_FLAGS_UPDATE) GQuark flatpak_dir_error_quark (void); @@ -271,8 +277,7 @@ gboolean flatpak_dir_update (FlatpakDir *self, GError **error); gboolean flatpak_dir_uninstall (FlatpakDir *self, const char *ref, - gboolean keep_ref, - gboolean force_remove, + FlatpakHelperUninstallFlags flags, GCancellable *cancellable, GError **error); gboolean flatpak_dir_undeploy (FlatpakDir *self, |