fix: update for latest gnome

Author: lleyton

gs-plugin-ultramarine-pkgdb-collections.c

@@ -80,9 +80,6 @@ gs_plugin_ultramarine_pkgdb_collections_init (GsPluginUltramarinePkgdbCollection
 	self->distros = g_ptr_array_new_with_free_func ((GDestroyNotify) _pkgdb_item_free);
 	self->pending_refresh_tasks = NULL;
 	self->settings = g_settings_new ("org.gnome.software");
-
-	/* old name */
-	gs_plugin_add_rule (plugin, GS_PLUGIN_RULE_CONFLICTS, "fedora-distro-upgrades");
 }
 
 static void
@@ -320,6 +317,8 @@ static void
 gs_plugin_ultramarine_pkgdb_collections_refresh_metadata_async (GsPlugin                     *plugin,
                                                            guint64                       cache_age_secs,
                                                            GsPluginRefreshMetadataFlags  flags,
+                                                           GsPluginEventCallback         event_callback,
+                                                           void                         *event_user_data,
                                                            GCancellable                 *cancellable,
                                                            GAsyncReadyCallback           callback,
                                                            gpointer                      user_data)
@@ -744,18 +743,21 @@ static void refine_cb (GObject      *source_object,
                        gpointer      user_data);
 
 static void
-gs_plugin_ultramarine_pkgdb_collections_refine_async (GsPlugin            *plugin,
-                                                 GsAppList           *list,
-                                                 GsPluginRefineFlags  flags,
-                                                 GCancellable        *cancellable,
-                                                 GAsyncReadyCallback  callback,
-                                                 gpointer             user_data)
+gs_plugin_ultramarine_pkgdb_collections_refine_async (GsPlugin                   *plugin,
+                                                 GsAppList                  *list,
+                                                 GsPluginRefineFlags         job_flags,
+                                                 GsPluginRefineRequireFlags  require_flags,
+                                                 GsPluginEventCallback       event_callback,
+                                                 void                       *event_user_data,
+                                                 GCancellable               *cancellable,
+                                                 GAsyncReadyCallback         callback,
+                                                 gpointer                    user_data)
 {
 	GsPluginUltramarinePkgdbCollections *self = GS_PLUGIN_ULTRAMARINE_PKGDB_COLLECTIONS (plugin);
 	g_autoptr(GTask) task = NULL;
 	gboolean refine_needed = FALSE;
 
-	task = gs_plugin_refine_data_new_task (plugin, list, flags, cancellable, callback, user_data);
+	task = gs_plugin_refine_data_new_task (plugin, list, job_flags, require_flags, event_callback, event_user_data, cancellable, callback, user_data);
 	g_task_set_source_tag (task, gs_plugin_ultramarine_pkgdb_collections_refine_async);
 
 	/* Check if any of the apps actually need to be refined by this plugin,
@@ -798,7 +800,7 @@ refine_cb (GObject      *source_object,
 
 	for (guint i = 0; i < gs_app_list_length (data->list); i++) {
 		GsApp *app = gs_app_list_index (data->list, i);
-		if (!refine_app (self, distros, app, data->flags, cancellable, &local_error)) {
+		if (!refine_app (self, distros, app, data->require_flags, cancellable, &local_error)) {
 			g_task_return_error (task, g_steal_pointer (&local_error));
 			return;
 		}