[gnome-software/gnome-3-10] trivial: Fix up some internal method names
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software/gnome-3-10] trivial: Fix up some internal method names
- Date: Mon, 14 Oct 2013 12:31:27 +0000 (UTC)
commit 00dd73d98c09111c5c1b597f7b2995351e1bd493
Author: Richard Hughes <richard hughsie com>
Date: Thu Sep 26 13:56:45 2013 +0100
trivial: Fix up some internal method names
src/gs-plugin-loader.c | 114 ++++++++++++++++++++++++------------------------
1 files changed, 57 insertions(+), 57 deletions(-)
---
diff --git a/src/gs-plugin-loader.c b/src/gs-plugin-loader.c
index 349ba25..03b0056 100644
--- a/src/gs-plugin-loader.c
+++ b/src/gs-plugin-loader.c
@@ -427,10 +427,10 @@ typedef struct {
/******************************************************************************/
/**
- * cd_plugin_loader_get_all_state_finish:
+ * gs_plugin_loader_get_all_state_finish:
**/
static void
-cd_plugin_loader_get_all_state_finish (GsPluginLoaderAsyncState *state,
+gs_plugin_loader_get_all_state_finish (GsPluginLoaderAsyncState *state,
const GError *error)
{
if (state->ret) {
@@ -457,10 +457,10 @@ cd_plugin_loader_get_all_state_finish (GsPluginLoaderAsyncState *state,
/******************************************************************************/
/**
- * cd_plugin_loader_add_os_update_item:
+ * gs_plugin_loader_add_os_update_item:
**/
static GList *
-cd_plugin_loader_add_os_update_item (GList *list)
+gs_plugin_loader_add_os_update_item (GList *list)
{
gboolean has_os_update = FALSE;
GError *error = NULL;
@@ -519,10 +519,10 @@ out:
}
/**
- * cd_plugin_loader_get_updates_thread_cb:
+ * gs_plugin_loader_get_updates_thread_cb:
**/
static void
-cd_plugin_loader_get_updates_thread_cb (GSimpleAsyncResult *res,
+gs_plugin_loader_get_updates_thread_cb (GSimpleAsyncResult *res,
GObject *object,
GCancellable *cancellable)
{
@@ -540,7 +540,7 @@ cd_plugin_loader_get_updates_thread_cb (GSimpleAsyncResult *res,
cancellable,
&error);
if (state->list == NULL) {
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
@@ -552,7 +552,7 @@ cd_plugin_loader_get_updates_thread_cb (GSimpleAsyncResult *res,
gs_plugin_loader_list_dedupe (plugin_loader, state->list);
/* coalesce all packages down into one os-update */
- state->list = cd_plugin_loader_add_os_update_item (state->list);
+ state->list = gs_plugin_loader_add_os_update_item (state->list);
/* remove any packages that are not proper applications or
* OS updates */
@@ -562,14 +562,14 @@ cd_plugin_loader_get_updates_thread_cb (GSimpleAsyncResult *res,
GS_PLUGIN_LOADER_ERROR,
GS_PLUGIN_LOADER_ERROR_FAILED,
"no updates to show after invalid");
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
/* success */
state->ret = TRUE;
- cd_plugin_loader_get_all_state_finish (state, NULL);
+ gs_plugin_loader_get_all_state_finish (state, NULL);
out:
return;
}
@@ -624,7 +624,7 @@ gs_plugin_loader_get_updates_async (GsPluginLoader *plugin_loader,
tmp = g_cancellable_new ();
g_object_set_data (G_OBJECT (tmp), "state", state);
g_simple_async_result_run_in_thread (G_SIMPLE_ASYNC_RESULT (state->res),
- cd_plugin_loader_get_updates_thread_cb,
+ gs_plugin_loader_get_updates_thread_cb,
0,
(GCancellable *) tmp);
g_object_unref (tmp);
@@ -652,16 +652,16 @@ gs_plugin_loader_get_updates_finish (GsPluginLoader *plugin_loader,
return NULL;
/* grab detail */
- return g_list_copy (g_simple_async_result_get_op_res_gpointer (simple));
+ return gs_plugin_list_copy (g_simple_async_result_get_op_res_gpointer (simple));
}
/******************************************************************************/
/**
- * cd_plugin_loader_get_installed_thread_cb:
+ * gs_plugin_loader_get_installed_thread_cb:
**/
static void
-cd_plugin_loader_get_installed_thread_cb (GSimpleAsyncResult *res,
+gs_plugin_loader_get_installed_thread_cb (GSimpleAsyncResult *res,
GObject *object,
GCancellable *cancellable)
{
@@ -675,7 +675,7 @@ cd_plugin_loader_get_installed_thread_cb (GSimpleAsyncResult *res,
cancellable,
&error);
if (state->list == NULL) {
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
@@ -686,14 +686,14 @@ cd_plugin_loader_get_installed_thread_cb (GSimpleAsyncResult *res,
GS_PLUGIN_LOADER_ERROR,
GS_PLUGIN_LOADER_ERROR_FAILED,
"no installed applications to show after invalid");
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
/* success */
state->ret = TRUE;
- cd_plugin_loader_get_all_state_finish (state, NULL);
+ gs_plugin_loader_get_all_state_finish (state, NULL);
out:
return;
}
@@ -746,7 +746,7 @@ gs_plugin_loader_get_installed_async (GsPluginLoader *plugin_loader,
tmp = g_cancellable_new ();
g_object_set_data (G_OBJECT (tmp), "state", state);
g_simple_async_result_run_in_thread (G_SIMPLE_ASYNC_RESULT (state->res),
- cd_plugin_loader_get_installed_thread_cb,
+ gs_plugin_loader_get_installed_thread_cb,
0,
(GCancellable *) tmp);
g_object_unref (tmp);
@@ -774,16 +774,16 @@ gs_plugin_loader_get_installed_finish (GsPluginLoader *plugin_loader,
return NULL;
/* grab detail */
- return g_list_copy (g_simple_async_result_get_op_res_gpointer (simple));
+ return gs_plugin_list_copy (g_simple_async_result_get_op_res_gpointer (simple));
}
/******************************************************************************/
/**
- * cd_plugin_loader_get_popular_thread_cb:
+ * gs_plugin_loader_get_popular_thread_cb:
**/
static void
-cd_plugin_loader_get_popular_thread_cb (GSimpleAsyncResult *res,
+gs_plugin_loader_get_popular_thread_cb (GSimpleAsyncResult *res,
GObject *object,
GCancellable *cancellable)
{
@@ -797,7 +797,7 @@ cd_plugin_loader_get_popular_thread_cb (GSimpleAsyncResult *res,
cancellable,
&error);
if (state->list == NULL) {
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
@@ -807,14 +807,14 @@ cd_plugin_loader_get_popular_thread_cb (GSimpleAsyncResult *res,
GS_PLUGIN_LOADER_ERROR,
GS_PLUGIN_LOADER_ERROR_FAILED,
"no popular apps to show");
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
/* success */
state->ret = TRUE;
- cd_plugin_loader_get_all_state_finish (state, NULL);
+ gs_plugin_loader_get_all_state_finish (state, NULL);
out:
return;
}
@@ -850,7 +850,7 @@ gs_plugin_loader_get_popular_async (GsPluginLoader *plugin_loader,
tmp = g_cancellable_new ();
g_object_set_data (G_OBJECT (tmp), "state", state);
g_simple_async_result_run_in_thread (G_SIMPLE_ASYNC_RESULT (state->res),
- cd_plugin_loader_get_popular_thread_cb,
+ gs_plugin_loader_get_popular_thread_cb,
0,
(GCancellable *) tmp);
g_object_unref (tmp);
@@ -878,16 +878,16 @@ gs_plugin_loader_get_popular_finish (GsPluginLoader *plugin_loader,
return NULL;
/* grab detail */
- return g_list_copy (g_simple_async_result_get_op_res_gpointer (simple));
+ return gs_plugin_list_copy (g_simple_async_result_get_op_res_gpointer (simple));
}
/******************************************************************************/
/**
- * cd_plugin_loader_get_featured_thread_cb:
+ * gs_plugin_loader_get_featured_thread_cb:
**/
static void
-cd_plugin_loader_get_featured_thread_cb (GSimpleAsyncResult *res,
+gs_plugin_loader_get_featured_thread_cb (GSimpleAsyncResult *res,
GObject *object,
GCancellable *cancellable)
{
@@ -901,7 +901,7 @@ cd_plugin_loader_get_featured_thread_cb (GSimpleAsyncResult *res,
cancellable,
&error);
if (state->list == NULL) {
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
@@ -911,14 +911,14 @@ cd_plugin_loader_get_featured_thread_cb (GSimpleAsyncResult *res,
GS_PLUGIN_LOADER_ERROR,
GS_PLUGIN_LOADER_ERROR_FAILED,
"no featured apps to show");
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
/* success */
state->ret = TRUE;
- cd_plugin_loader_get_all_state_finish (state, NULL);
+ gs_plugin_loader_get_all_state_finish (state, NULL);
out:
return;
}
@@ -972,7 +972,7 @@ gs_plugin_loader_get_featured_async (GsPluginLoader *plugin_loader,
tmp = g_cancellable_new ();
g_object_set_data (G_OBJECT (tmp), "state", state);
g_simple_async_result_run_in_thread (G_SIMPLE_ASYNC_RESULT (state->res),
- cd_plugin_loader_get_featured_thread_cb,
+ gs_plugin_loader_get_featured_thread_cb,
0,
(GCancellable *) tmp);
g_object_unref (tmp);
@@ -1000,16 +1000,16 @@ gs_plugin_loader_get_featured_finish (GsPluginLoader *plugin_loader,
return NULL;
/* grab detail */
- return g_list_copy (g_simple_async_result_get_op_res_gpointer (simple));
+ return gs_plugin_list_copy (g_simple_async_result_get_op_res_gpointer (simple));
}
/******************************************************************************/
/**
- * cd_plugin_loader_search_thread_cb:
+ * gs_plugin_loader_search_thread_cb:
**/
static void
-cd_plugin_loader_search_thread_cb (GSimpleAsyncResult *res,
+gs_plugin_loader_search_thread_cb (GSimpleAsyncResult *res,
GObject *object,
GCancellable *cancellable)
{
@@ -1029,7 +1029,7 @@ cd_plugin_loader_search_thread_cb (GSimpleAsyncResult *res,
continue;
ret = g_cancellable_set_error_if_cancelled (cancellable, &error);
if (ret) {
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
@@ -1043,7 +1043,7 @@ cd_plugin_loader_search_thread_cb (GSimpleAsyncResult *res,
g_timer_start (plugin->timer);
ret = plugin_func (plugin, state->value, &state->list, cancellable, &error);
if (!ret) {
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
@@ -1063,7 +1063,7 @@ cd_plugin_loader_search_thread_cb (GSimpleAsyncResult *res,
cancellable,
&error);
if (!ret) {
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
@@ -1078,14 +1078,14 @@ cd_plugin_loader_search_thread_cb (GSimpleAsyncResult *res,
GS_PLUGIN_LOADER_ERROR,
GS_PLUGIN_LOADER_ERROR_FAILED,
"no search results to show");
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
/* success */
state->ret = TRUE;
- cd_plugin_loader_get_all_state_finish (state, NULL);
+ gs_plugin_loader_get_all_state_finish (state, NULL);
out:
return;
}
@@ -1141,7 +1141,7 @@ gs_plugin_loader_search_async (GsPluginLoader *plugin_loader,
tmp = g_cancellable_new ();
g_object_set_data (G_OBJECT (tmp), "state", state);
g_simple_async_result_run_in_thread (G_SIMPLE_ASYNC_RESULT (state->res),
- cd_plugin_loader_search_thread_cb,
+ gs_plugin_loader_search_thread_cb,
0,
(GCancellable *) tmp);
g_object_unref (tmp);
@@ -1185,10 +1185,10 @@ gs_plugin_loader_category_sort_cb (gconstpointer a, gconstpointer b)
}
/**
- * cd_plugin_loader_get_categories_thread_cb:
+ * gs_plugin_loader_get_categories_thread_cb:
**/
static void
-cd_plugin_loader_get_categories_thread_cb (GSimpleAsyncResult *res,
+gs_plugin_loader_get_categories_thread_cb (GSimpleAsyncResult *res,
GObject *object,
GCancellable *cancellable)
{
@@ -1209,7 +1209,7 @@ cd_plugin_loader_get_categories_thread_cb (GSimpleAsyncResult *res,
continue;
ret = g_cancellable_set_error_if_cancelled (cancellable, &error);
if (ret) {
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
@@ -1223,7 +1223,7 @@ cd_plugin_loader_get_categories_thread_cb (GSimpleAsyncResult *res,
g_timer_start (plugin->timer);
ret = plugin_func (plugin, &state->list, cancellable, &error);
if (!ret) {
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
@@ -1245,14 +1245,14 @@ cd_plugin_loader_get_categories_thread_cb (GSimpleAsyncResult *res,
GS_PLUGIN_LOADER_ERROR,
GS_PLUGIN_LOADER_ERROR_FAILED,
"no categories to show");
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
/* success */
state->ret = TRUE;
- cd_plugin_loader_get_all_state_finish (state, NULL);
+ gs_plugin_loader_get_all_state_finish (state, NULL);
out:
return;
}
@@ -1291,7 +1291,7 @@ gs_plugin_loader_get_categories_async (GsPluginLoader *plugin_loader,
tmp = g_cancellable_new ();
g_object_set_data (G_OBJECT (tmp), "state", state);
g_simple_async_result_run_in_thread (G_SIMPLE_ASYNC_RESULT (state->res),
- cd_plugin_loader_get_categories_thread_cb,
+ gs_plugin_loader_get_categories_thread_cb,
0,
(GCancellable *) tmp);
g_object_unref (tmp);
@@ -1319,16 +1319,16 @@ gs_plugin_loader_get_categories_finish (GsPluginLoader *plugin_loader,
return NULL;
/* grab detail */
- return g_list_copy (g_simple_async_result_get_op_res_gpointer (simple));
+ return gs_plugin_list_copy (g_simple_async_result_get_op_res_gpointer (simple));
}
/******************************************************************************/
/**
- * cd_plugin_loader_get_category_apps_thread_cb:
+ * gs_plugin_loader_get_category_apps_thread_cb:
**/
static void
-cd_plugin_loader_get_category_apps_thread_cb (GSimpleAsyncResult *res,
+gs_plugin_loader_get_category_apps_thread_cb (GSimpleAsyncResult *res,
GObject *object,
GCancellable *cancellable)
{
@@ -1348,7 +1348,7 @@ cd_plugin_loader_get_category_apps_thread_cb (GSimpleAsyncResult *res,
continue;
ret = g_cancellable_set_error_if_cancelled (cancellable, &error);
if (ret) {
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
@@ -1362,7 +1362,7 @@ cd_plugin_loader_get_category_apps_thread_cb (GSimpleAsyncResult *res,
g_timer_start (plugin->timer);
ret = plugin_func (plugin, state->category, &state->list, cancellable, &error);
if (!ret) {
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
@@ -1382,7 +1382,7 @@ cd_plugin_loader_get_category_apps_thread_cb (GSimpleAsyncResult *res,
cancellable,
&error);
if (!ret) {
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
@@ -1398,7 +1398,7 @@ cd_plugin_loader_get_category_apps_thread_cb (GSimpleAsyncResult *res,
GS_PLUGIN_LOADER_ERROR,
GS_PLUGIN_LOADER_ERROR_FAILED,
"no get_category_apps results to show");
- cd_plugin_loader_get_all_state_finish (state, error);
+ gs_plugin_loader_get_all_state_finish (state, error);
g_error_free (error);
goto out;
}
@@ -1409,7 +1409,7 @@ cd_plugin_loader_get_category_apps_thread_cb (GSimpleAsyncResult *res,
/* success */
state->ret = TRUE;
g_object_unref (state->category);
- cd_plugin_loader_get_all_state_finish (state, NULL);
+ gs_plugin_loader_get_all_state_finish (state, NULL);
out:
return;
}
@@ -1465,7 +1465,7 @@ gs_plugin_loader_get_category_apps_async (GsPluginLoader *plugin_loader,
tmp = g_cancellable_new ();
g_object_set_data (G_OBJECT (tmp), "state", state);
g_simple_async_result_run_in_thread (G_SIMPLE_ASYNC_RESULT (state->res),
- cd_plugin_loader_get_category_apps_thread_cb,
+ gs_plugin_loader_get_category_apps_thread_cb,
0,
(GCancellable *) tmp);
g_object_unref (tmp);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
