Merge branch 'backport-1584-search-cancellation-gnome-43' into 'gnome-43'

Backport !1584 “Resolve "Searching for an app through Shell makes Software to open the app page and, after 1~2 seconds, it refreshes the page"” to gnome-43 See merge request GNOME/gnome-software!1585

Merge branch 'backport-1584-search-cancellation-gnome-43' into 'gnome-43'
5f743a03 · Milan Crha · 0b5595b9 · 0c572a9f · 5f743a03 · 5f743a03
Commit 5f743a03 authored Jan 10, 2023 by Milan Crha
--- a/lib/gs-appstream.c
+++ b/lib/gs-appstream.c
@@ -1530,6 +1530,9 @@ gs_appstream_do_search (GsPlugin *plugin,
 				}
 			}
 		}
+
+		if (g_cancellable_set_error_if_cancelled (cancellable, error))
+			return FALSE;
 	}
 	g_debug ("search took %fms", g_timer_elapsed (timer, NULL) * 1000);
 	return TRUE;

--- a/lib/gs-plugin.c
+++ b/lib/gs-plugin.c
@@ -1092,7 +1092,7 @@ gs_plugin_reload_cb (gpointer user_data)
 void
 gs_plugin_reload (GsPlugin *plugin)
 {
-	g_debug ("emitting ::reload in idle");
+	g_debug ("emitting %s::reload in idle", gs_plugin_get_name (plugin));
 	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, gs_plugin_reload_cb,
 			 weak_ref_new (plugin), (GDestroyNotify) weak_ref_free);
 }