[gnome-software: 6/8] gs-plugin-job: Combine set_sort_func() and set_sort_func_data()
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software: 6/8] gs-plugin-job: Combine set_sort_func() and set_sort_func_data()
- Date: Mon, 26 Apr 2021 14:50:02 +0000 (UTC)
commit 7b9176e8543ad386211c88fa818c8eefd710c451
Author: Philip Withnall <pwithnall endlessos org>
Date: Wed Apr 21 15:02:33 2021 +0100
gs-plugin-job: Combine set_sort_func() and set_sort_func_data()
Having them separate just encourages developers to accidentally set one
without the other.
Signed-off-by: Philip Withnall <pwithnall endlessos org>
lib/gs-plugin-job.c | 10 ++--------
lib/gs-plugin-job.h | 5 ++---
src/gs-category-page.c | 2 +-
src/gs-search-page.c | 3 +--
src/gs-shell-search-provider.c | 3 +--
5 files changed, 7 insertions(+), 16 deletions(-)
---
diff --git a/lib/gs-plugin-job.c b/lib/gs-plugin-job.c
index dc389f83f..2702f1a54 100644
--- a/lib/gs-plugin-job.c
+++ b/lib/gs-plugin-job.c
@@ -269,10 +269,11 @@ gs_plugin_job_get_action (GsPluginJob *self)
}
void
-gs_plugin_job_set_sort_func (GsPluginJob *self, GsAppListSortFunc sort_func)
+gs_plugin_job_set_sort_func (GsPluginJob *self, GsAppListSortFunc sort_func, gpointer user_data)
{
g_return_if_fail (GS_IS_PLUGIN_JOB (self));
self->sort_func = sort_func;
+ self->sort_func_data = user_data;
}
GsAppListSortFunc
@@ -282,13 +283,6 @@ gs_plugin_job_get_sort_func (GsPluginJob *self)
return self->sort_func;
}
-void
-gs_plugin_job_set_sort_func_data (GsPluginJob *self, gpointer sort_func_data)
-{
- g_return_if_fail (GS_IS_PLUGIN_JOB (self));
- self->sort_func_data = sort_func_data;
-}
-
gpointer
gs_plugin_job_get_sort_func_data (GsPluginJob *self)
{
diff --git a/lib/gs-plugin-job.h b/lib/gs-plugin-job.h
index 885be1c8c..7b3eed705 100644
--- a/lib/gs-plugin-job.h
+++ b/lib/gs-plugin-job.h
@@ -35,9 +35,8 @@ void gs_plugin_job_set_timeout (GsPluginJob *self,
void gs_plugin_job_set_age (GsPluginJob *self,
guint64 age);
void gs_plugin_job_set_sort_func (GsPluginJob *self,
- GsAppListSortFunc sort_func);
-void gs_plugin_job_set_sort_func_data (GsPluginJob *self,
- gpointer sort_func_data);
+ GsAppListSortFunc sort_func,
+ gpointer user_data);
void gs_plugin_job_set_search (GsPluginJob *self,
const gchar *search);
void gs_plugin_job_set_app (GsPluginJob *self,
diff --git a/src/gs-category-page.c b/src/gs-category-page.c
index 230591a6d..42f9489d9 100644
--- a/src/gs-category-page.c
+++ b/src/gs-category-page.c
@@ -319,7 +319,7 @@ gs_category_page_reload (GsPage *page)
"dedupe-flags", GS_APP_LIST_FILTER_FLAG_PREFER_INSTALLED |
GS_APP_LIST_FILTER_FLAG_KEY_ID_PROVIDES,
NULL);
- gs_plugin_job_set_sort_func (plugin_job, _max_results_sort_cb);
+ gs_plugin_job_set_sort_func (plugin_job, _max_results_sort_cb, NULL);
gs_plugin_loader_job_process_async (self->plugin_loader,
plugin_job,
self->cancellable,
diff --git a/src/gs-search-page.c b/src/gs-search-page.c
index 17b399a1a..ec028b30c 100644
--- a/src/gs-search-page.c
+++ b/src/gs-search-page.c
@@ -274,8 +274,7 @@ gs_search_page_load (GsSearchPage *self)
"dedupe-flags", GS_APP_LIST_FILTER_FLAG_PREFER_INSTALLED |
GS_APP_LIST_FILTER_FLAG_KEY_ID_PROVIDES,
NULL);
- gs_plugin_job_set_sort_func (plugin_job, gs_search_page_sort_cb);
- gs_plugin_job_set_sort_func_data (plugin_job, self);
+ gs_plugin_job_set_sort_func (plugin_job, gs_search_page_sort_cb, self);
gs_plugin_loader_job_process_async (self->plugin_loader, plugin_job,
self->search_cancellable,
gs_search_page_get_search_cb,
diff --git a/src/gs-shell-search-provider.c b/src/gs-shell-search-provider.c
index 9acde4cbc..2493a870c 100644
--- a/src/gs-shell-search-provider.c
+++ b/src/gs-shell-search-provider.c
@@ -180,8 +180,7 @@ execute_search (GsShellSearchProvider *self,
"dedupe-flags", GS_APP_LIST_FILTER_FLAG_PREFER_INSTALLED |
GS_APP_LIST_FILTER_FLAG_KEY_ID_PROVIDES,
NULL);
- gs_plugin_job_set_sort_func (plugin_job, gs_shell_search_provider_sort_cb);
- gs_plugin_job_set_sort_func_data (plugin_job, self);
+ gs_plugin_job_set_sort_func (plugin_job, gs_shell_search_provider_sort_cb, self);
gs_plugin_loader_job_process_async (self->plugin_loader, plugin_job,
self->cancellable,
search_done_cb,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]