[gnome-software: 13/14] gs-plugin-job-list-installed-apps: Combine app list filters

[Philip Withnall <pwithnall src gnome org>]

commit eef7bf7d40e580a290451f2267b59034a62a449b
Author: Philip Withnall <pwithnall endlessos org>
Date:   Thu Jan 27 17:56:50 2022 +0000

    gs-plugin-job-list-installed-apps: Combine app list filters
    
    No point in iterating over the app list twice to filter it in two
    different ways. Combine the filter functions to improve performance
    slightly.
    
    Suggested by Georges Basile Stavracas Neto.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 lib/gs-plugin-job-list-installed-apps.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/lib/gs-plugin-job-list-installed-apps.c b/lib/gs-plugin-job-list-installed-apps.c
index 4c4a07d9c..7e214b250 100644
--- a/lib/gs-plugin-job-list-installed-apps.c
+++ b/lib/gs-plugin-job-list-installed-apps.c
@@ -147,18 +147,14 @@ gs_plugin_job_list_installed_apps_set_property (GObject      *object,
 }
 
 static gboolean
-app_is_valid_filter (GsApp    *app,
-                     gpointer  user_data)
+app_is_valid_filter_installed (GsApp    *app,
+                               gpointer  user_data)
 {
        GsPluginJobListInstalledApps *self = GS_PLUGIN_JOB_LIST_INSTALLED_APPS (user_data);
 
-       return gs_plugin_loader_app_is_valid (app, self->refine_flags);
-}
+       if (!gs_plugin_loader_app_is_valid (app, self->refine_flags))
+               return FALSE;
 
-static gboolean
-app_is_valid_installed (GsApp    *app,
-                        gpointer  user_data)
-{
        /* even without AppData, show things in progress */
        switch (gs_app_get_state (app)) {
        case GS_APP_STATE_INSTALLING:
@@ -403,8 +399,7 @@ finish_task (GTask     *task,
        g_autofree gchar *job_debug = NULL;
 
        /* filter package list */
-       gs_app_list_filter (merged_list, app_is_valid_filter, self);
-       gs_app_list_filter (merged_list, app_is_valid_installed, self);
+       gs_app_list_filter (merged_list, app_is_valid_filter_installed, self);
 
        /* filter duplicates with priority, taking into account the source name
         * & version, so we combine available updates with the installed app */