[gnome-software/wip/async-plugin-repo-funcs: 1/30] gs-plugin-loader: Remove install queue support for repos
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/wip/async-plugin-repo-funcs: 1/30] gs-plugin-loader: Remove install queue support for repos
- Date: Wed, 29 Jun 2022 10:16:02 +0000 (UTC)
commit e144648cce3cf04aeb1cbb48a585dcdb3304ffda
Author: Philip Withnall <pwithnall endlessos org>
Date: Wed Jun 29 11:05:50 2022 +0100
gs-plugin-loader: Remove install queue support for repos
It was never tested, and was likely unnecessary: it should be possible
to add a repo locally anyway (as the `.repo` file contains all the
necessary information), and it will get refreshed soon enough after the
computer goes online anyway.
This simplifies refactoring the plugin jobs for adding/removing repos.
See https://gitlab.gnome.org/GNOME/gnome-software/-/merge_requests/1399#note_1485184
Signed-off-by: Philip Withnall <pwithnall endlessos org>
Helps: #1472
lib/gs-plugin-loader.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c
index 9b361ce9c..bb79e8e7f 100644
--- a/lib/gs-plugin-loader.c
+++ b/lib/gs-plugin-loader.c
@@ -742,7 +742,7 @@ gs_plugin_loader_call_vfunc (GsPluginLoaderHelper *helper,
}
/* add app to the pending installation queue if necessary */
- if ((action == GS_PLUGIN_ACTION_INSTALL || action == GS_PLUGIN_ACTION_INSTALL_REPO) &&
+ if (action == GS_PLUGIN_ACTION_INSTALL &&
app != NULL && gs_app_get_state (app) == GS_APP_STATE_QUEUED_FOR_INSTALL) {
add_app_to_install_queue (plugin_loader, app);
}
@@ -4046,7 +4046,7 @@ job_process_cb (GTask *task)
}
/* deal with the install queue */
- if (action == GS_PLUGIN_ACTION_REMOVE || action == GS_PLUGIN_ACTION_REMOVE_REPO) {
+ if (action == GS_PLUGIN_ACTION_REMOVE) {
if (remove_app_from_install_queue (plugin_loader, gs_plugin_job_get_app (plugin_job))) {
GsAppList *list = gs_plugin_job_get_list (plugin_job);
g_task_return_pointer (task, g_object_ref (list), (GDestroyNotify) g_object_unref);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]