[gnome-builder] flatpak: provide SDK when finding extension



commit 7d0b4e33ec4d32a6d3ccdcd5ff6689a8391566f5
Author: Christian Hergert <chergert redhat com>
Date:   Tue Mar 2 15:39:32 2021 -0800

    flatpak: provide SDK when finding extension
    
    This isn't being used today, but I'd like to have that information
    available for later on.

 src/plugins/flatpak/gbp-flatpak-application-addin.c | 2 ++
 src/plugins/flatpak/gbp-flatpak-application-addin.h | 1 +
 src/plugins/flatpak/gbp-flatpak-manifest.c          | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/src/plugins/flatpak/gbp-flatpak-application-addin.c 
b/src/plugins/flatpak/gbp-flatpak-application-addin.c
index 6c967a352..f2196f17b 100644
--- a/src/plugins/flatpak/gbp-flatpak-application-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-application-addin.c
@@ -1478,6 +1478,7 @@ gbp_flatpak_application_addin_check_sysdeps_finish (GbpFlatpakApplicationAddin
 
 FlatpakInstalledRef *
 gbp_flatpak_application_addin_find_extension (GbpFlatpakApplicationAddin *self,
+                                              const gchar                *sdk,
                                               const gchar                *name)
 {
   g_autofree gchar *pname = NULL;
@@ -1485,6 +1486,7 @@ gbp_flatpak_application_addin_find_extension (GbpFlatpakApplicationAddin *self,
   g_autofree gchar *pversion = NULL;
 
   g_return_val_if_fail (GBP_IS_FLATPAK_APPLICATION_ADDIN (self), NULL);
+  g_return_val_if_fail (sdk != NULL, NULL);
   g_return_val_if_fail (name != NULL, NULL);
 
   if (strchr (name, '/') != NULL)
diff --git a/src/plugins/flatpak/gbp-flatpak-application-addin.h 
b/src/plugins/flatpak/gbp-flatpak-application-addin.h
index b01d13952..f99a131a1 100644
--- a/src/plugins/flatpak/gbp-flatpak-application-addin.h
+++ b/src/plugins/flatpak/gbp-flatpak-application-addin.h
@@ -31,6 +31,7 @@ G_DECLARE_FINAL_TYPE (GbpFlatpakApplicationAddin, gbp_flatpak_application_addin,
 
 GbpFlatpakApplicationAddin *gbp_flatpak_application_addin_get_default            (void);
 FlatpakInstalledRef        *gbp_flatpak_application_addin_find_extension         (GbpFlatpakApplicationAddin 
 *self,
+                                                                                  const gchar                
 *sdk,
                                                                                   const gchar                
 *name);
 GPtrArray                  *gbp_flatpak_application_addin_get_runtimes           (GbpFlatpakApplicationAddin 
 *self);
 GPtrArray                  *gbp_flatpak_application_addin_get_installations      (GbpFlatpakApplicationAddin 
 *self);
diff --git a/src/plugins/flatpak/gbp-flatpak-manifest.c b/src/plugins/flatpak/gbp-flatpak-manifest.c
index 8ab336a6b..556351742 100644
--- a/src/plugins/flatpak/gbp-flatpak-manifest.c
+++ b/src/plugins/flatpak/gbp-flatpak-manifest.c
@@ -562,7 +562,7 @@ find_extension (GbpFlatpakManifest *self,
    * version of the extension.
    */
   addin = gbp_flatpak_application_addin_get_default ();
-  ref = gbp_flatpak_application_addin_find_extension (addin, name);
+  ref = gbp_flatpak_application_addin_find_extension (addin, self->sdk, name);
 
   if (ref != NULL)
     ret = gbp_flatpak_runtime_new (ref, TRUE, NULL, NULL);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]