[gnome-software/jrocha/fix-install-queue: 3/4] fixup! Do not use queued apps (for installations) internally as GsApps

[Joaquim Rocha <jrocha src gnome org>]

commit e2e358af90fae6652c02d22ae7b1aea02397907e
Author: Joaquim Rocha <jrocha endlessm com>
Date:   Fri Feb 16 16:50:14 2018 +0100

    fixup! Do not use queued apps (for installations) internally as GsApps

 lib/gs-plugin-loader.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)
---
diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c
index 36bbf02c..c04d9b9f 100644
--- a/lib/gs-plugin-loader.c
+++ b/lib/gs-plugin-loader.c
@@ -1696,6 +1696,21 @@ gs_plugin_loader_pending_apps_add (GsPluginLoader *plugin_loader,
        g_idle_add (emit_pending_apps_idle, g_object_ref (plugin_loader));
 }
 
+static gboolean
+remove_pending_app (GsPluginLoader *plugin_loader,
+                   const gchar *app_id)
+{
+       for (guint i = 0; i < priv->pending_apps->len; ++i) {
+               if (g_strcmp0 (gs_app_get_unique_id (app), app_id) == 0)
+                       break;
+       }
+       if (i != priv->pending_apps->len) {
+               g_ptr_array_remove_index (priv->pending_apps, index);
+               return TRUE;
+       }
+       return FALSE;
+}
+
 static void
 gs_plugin_loader_pending_apps_remove (GsPluginLoader *plugin_loader,
                                      GsPluginLoaderHelper *helper)
@@ -1707,11 +1722,7 @@ gs_plugin_loader_pending_apps_remove (GsPluginLoader *plugin_loader,
        g_assert (gs_app_list_length (list) > 0);
        for (guint i = 0; i < gs_app_list_length (list); i++) {
                GsApp *app = gs_app_list_index (list, i);
-               const gchar *id = gs_app_get_unique_id (app);
-               guint index = -1;
-               if (g_ptr_array_find_with_equal_func (priv->pending_apps, id,
-                                                     g_str_equal, &index))
-                       g_ptr_array_remove_index (priv->pending_apps, index);
+               remove_pending_app (plugin_loader, gs_app_get_unique_id (app));
 
                /* check the app is not still in an action helper */
                switch (gs_app_get_state (app)) {
@@ -1855,11 +1866,7 @@ remove_app_from_install_queue (GsPluginLoader *plugin_loader, GsApp *app)
        guint index = -1;
 
        g_mutex_lock (&priv->pending_apps_mutex);
-       ret = g_ptr_array_find_with_equal_func (priv->pending_apps,
-                                               gs_app_get_unique_id (app),
-                                               g_str_equal, &index);
-       if (ret)
-               g_ptr_array_remove_index (priv->pending_apps, index);
+       ret = remove_pending_app (plugin_loader, gs_app_get_unique_id (app));
        g_mutex_unlock (&priv->pending_apps_mutex);
 
        if (ret) {