[gnome-software/gnome-3-34] gs-plugin-loader: Properly convert GIO error to GS error when retrieving job result



commit db45c2639556865984e204e27dd79b40b0c90e10
Author: Andre Moreira Magalhaes <andre endlessm com>
Date:   Wed Oct 30 16:23:37 2019 -0300

    gs-plugin-loader: Properly convert GIO error to GS error when retrieving job result

 lib/gs-plugin-loader.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c
index 02099fd3..b26a8b49 100644
--- a/lib/gs-plugin-loader.c
+++ b/lib/gs-plugin-loader.c
@@ -1402,13 +1402,16 @@ gs_plugin_loader_job_process_finish (GsPluginLoader *plugin_loader,
                                     GAsyncResult *res,
                                     GError **error)
 {
+       GsAppList *list = NULL;
+
        g_return_val_if_fail (GS_IS_PLUGIN_LOADER (plugin_loader), NULL);
        g_return_val_if_fail (G_IS_TASK (res), NULL);
        g_return_val_if_fail (g_task_is_valid (res, plugin_loader), NULL);
        g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
+       list = g_task_propagate_pointer (G_TASK (res), error);
        gs_utils_error_convert_gio (error);
-       return g_task_propagate_pointer (G_TASK (res), error);
+       return list;
 }
 
 /**
@@ -1575,13 +1578,16 @@ gs_plugin_loader_job_get_categories_finish (GsPluginLoader *plugin_loader,
                                           GAsyncResult *res,
                                           GError **error)
 {
+       GPtrArray *array;
+
        g_return_val_if_fail (GS_IS_PLUGIN_LOADER (plugin_loader), NULL);
        g_return_val_if_fail (G_IS_TASK (res), NULL);
        g_return_val_if_fail (g_task_is_valid (res, plugin_loader), NULL);
        g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
+       array = g_task_propagate_pointer (G_TASK (res), error);
        gs_utils_error_convert_gio (error);
-       return g_task_propagate_pointer (G_TASK (res), error);
+       return array;
 }
 
 /******************************************************************************/


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]