system-helper: Support uninstall

2 files changed, 22 insertions, 5 deletions

diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index 2ba6769..06899dd 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -232,7 +232,7 @@ flatpak_dir_get_system_helper (FlatpakDir *self)
 }
 
 gboolean
-flatpak_dir_use_child_repo (FlatpakDir *self)
+flatpak_dir_use_system_helper (FlatpakDir *self)
 {
   FlatpakSystemHelper *system_helper;
 
@@ -1085,7 +1085,7 @@ flatpak_dir_update_appstream (FlatpakDir          *self,
   if (!flatpak_dir_ensure_repo (self, cancellable, error))
     return FALSE;
 
-  if (flatpak_dir_use_child_repo (self))
+  if (flatpak_dir_use_system_helper (self))
     {
       g_autoptr(OstreeRepo) child_repo = NULL;
       g_auto(GLnxLockFile) child_repo_lock = GLNX_LOCK_FILE_INIT;
@@ -2945,7 +2945,7 @@ flatpak_dir_install (FlatpakDir          *self,
                      GCancellable        *cancellable,
                      GError             **error)
 {
-  if (flatpak_dir_use_child_repo (self))
+  if (flatpak_dir_use_system_helper (self))
     {
       g_autoptr(OstreeRepo) child_repo = NULL;
       g_auto(GLnxLockFile) child_repo_lock = GLNX_LOCK_FILE_INIT;
@@ -3018,7 +3018,7 @@ flatpak_dir_update (FlatpakDir          *self,
                     GCancellable        *cancellable,
                     GError             **error)
 {
-  if (flatpak_dir_use_child_repo (self))
+  if (flatpak_dir_use_system_helper (self))
     {
       g_autoptr(OstreeRepo) child_repo = NULL;
       g_auto(GLnxLockFile) child_repo_lock = GLNX_LOCK_FILE_INIT;
@@ -3116,6 +3116,21 @@ flatpak_dir_uninstall (FlatpakDir          *self,
     return FALSE;
   name = parts[1];
 
+  if (flatpak_dir_use_system_helper (self))
+    {
+      FlatpakSystemHelper *system_helper;
+
+      system_helper = flatpak_dir_get_system_helper (self);
+      g_assert (system_helper != NULL);
+
+      if (!flatpak_system_helper_call_uninstall_sync (system_helper,
+                                                      flags, ref,
+                                                      cancellable, error))
+        return FALSE;
+
+      return TRUE;
+    }
+
   if (!flatpak_dir_lock (self, &lock,
                          cancellable, error))
     return FALSE;
diff --git a/common/flatpak-dir.h b/common/flatpak-dir.h
index 3d6b2b8..9a102be 100644
--- a/common/flatpak-dir.h
+++ b/common/flatpak-dir.h
@@ -45,13 +45,15 @@ typedef enum {
   FLATPAK_HELPER_DEPLOY_FLAGS_UPDATE = 1 << 0,
 } FlatpakHelperDeployFlags;
 
+#define FLATPAK_HELPER_DEPLOY_FLAGS_ALL (FLATPAK_HELPER_DEPLOY_FLAGS_UPDATE)
+
 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)
+#define FLATPAK_HELPER_UNINSTALL_FLAGS_ALL (FLATPAK_HELPER_UNINSTALL_FLAGS_KEEP_REF | FLATPAK_HELPER_UNINSTALL_FLAGS_FORCE_REMOVE)
 
 GQuark       flatpak_dir_error_quark (void);