[gnome-disk-utility] Stop using GSimpleAsyncResult

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 29b9dee8bf5e602b21da47002448e93e073ec4a9
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Aug 29 14:50:33 2015 -0500

    Stop using GSimpleAsyncResult
    
    It's deprecated. Everything _seems_ to still work (test: delete a
    partition).

 src/disks/gduwindow.c |   25 +++++++++++--------------
 src/libgdu/gduutils.c |   39 +++++++++++++++++++--------------------
 2 files changed, 30 insertions(+), 34 deletions(-)
---
diff --git a/src/disks/gduwindow.c b/src/disks/gduwindow.c
index 7d39f55..3aadc5c 100644
--- a/src/disks/gduwindow.c
+++ b/src/disks/gduwindow.c
@@ -3971,7 +3971,7 @@ on_activate_link (GtkLabel    *label,
 /* ---------------------------------------------------------------------------------------------------- */
 
 typedef struct {
-  GSimpleAsyncResult *simple;
+  GTask *task;
   GduWindow *window;
 } EnsureListData;
 
@@ -3979,7 +3979,7 @@ static void
 ensure_list_data_free (EnsureListData *data)
 {
   g_object_unref (data->window);
-  g_object_unref (data->simple);
+  g_object_unref (data->task);
   g_slice_free (EnsureListData, data);
 }
 
@@ -3989,8 +3989,8 @@ ensure_list_cb (GObject      *source_object,
                 gpointer      user_data)
 {
   EnsureListData *data = user_data;
-  g_simple_async_result_set_op_res_gpointer (data->simple, g_object_ref (res), g_object_unref);
-  g_simple_async_result_complete (data->simple);
+  g_task_set_task_data (data->task, g_object_ref (res), g_object_unref);
+  g_task_return_pointer (data->task, NULL, NULL);
   ensure_list_data_free (data);
 }
 
@@ -4003,11 +4003,10 @@ gdu_window_ensure_unused_list (GduWindow            *window,
 {
   EnsureListData *data = g_slice_new0 (EnsureListData);
   data->window = g_object_ref (window);
-  data->simple = g_simple_async_result_new (G_OBJECT (window),
-                                            callback,
-                                            user_data,
-                                            gdu_window_ensure_unused_list);
-  g_simple_async_result_set_check_cancellable (data->simple, cancellable);
+  data->task = g_task_new (G_OBJECT (window),
+                           cancellable,
+                           callback,
+                           user_data);
   gdu_utils_ensure_unused_list (window->client,
                                 GTK_WINDOW (window),
                                 objects,
@@ -4021,15 +4020,13 @@ gdu_window_ensure_unused_list_finish (GduWindow     *window,
                                       GAsyncResult  *res,
                                       GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
+  GTask *task = G_TASK (res);
 
-  g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE);
+  g_return_val_if_fail (G_IS_TASK (res), FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == gdu_window_ensure_unused_list);
-
   return gdu_utils_ensure_unused_list_finish (window->client,
-                                              G_ASYNC_RESULT (g_simple_async_result_get_op_res_gpointer 
(simple)),
+                                              G_ASYNC_RESULT (g_task_get_task_data (task)),
                                               error);
 }
 
diff --git a/src/libgdu/gduutils.c b/src/libgdu/gduutils.c
index 5d93ee6..f1940ad 100644
--- a/src/libgdu/gduutils.c
+++ b/src/libgdu/gduutils.c
@@ -1004,7 +1004,7 @@ typedef struct
   GtkWindow *parent_window;
   GList *objects;
   GList *object_iter;
-  GSimpleAsyncResult *simple;
+  GTask *task;
   GCancellable *cancellable; /* borrowed ref */
 } UnuseData;
 
@@ -1013,7 +1013,7 @@ unuse_data_free (UnuseData *data)
 {
   g_clear_object (&data->client);
   g_list_free_full (data->objects, g_object_unref);
-  g_clear_object (&data->simple);
+  g_clear_object (&data->task);
   g_slice_free (UnuseData, data);
 }
 
@@ -1027,9 +1027,12 @@ unuse_data_complete (UnuseData    *data,
       gdu_utils_show_error (data->parent_window,
                             error_message,
                             error);
-      g_simple_async_result_take_error (data->simple, error);
+      g_task_return_error (data->task, error);
+    }
+  else
+    {
+      g_task_return_pointer (data->task, NULL, NULL);
     }
-  g_simple_async_result_complete_in_idle (data->simple);
   unuse_data_free (data);
 }
 
@@ -1141,11 +1144,10 @@ gdu_utils_ensure_unused_list (UDisksClient         *client,
   g_list_foreach (data->objects, (GFunc) g_object_ref, NULL);
   data->object_iter = data->objects;
   data->cancellable = cancellable;
-  data->simple = g_simple_async_result_new (G_OBJECT (client),
-                                            callback,
-                                            user_data,
-                                            gdu_utils_ensure_unused_list);
-  g_simple_async_result_set_check_cancellable (data->simple, cancellable);
+  data->task = g_task_new (G_OBJECT (client),
+                           cancellable,
+                           callback,
+                           user_data);
 
   unuse_data_iterate (data);
 }
@@ -1155,21 +1157,18 @@ gdu_utils_ensure_unused_list_finish (UDisksClient  *client,
                                      GAsyncResult  *res,
                                      GError       **error)
 {
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
-  gboolean ret = FALSE;
+  GTask *task = G_TASK (res);
 
-  g_return_val_if_fail (G_IS_ASYNC_RESULT (res), FALSE);
+  g_return_val_if_fail (G_IS_TASK (res), FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == gdu_utils_ensure_unused_list);
-
-  if (g_simple_async_result_propagate_error (simple, error))
-    goto out;
-
-  ret = TRUE;
+  if (g_task_had_error (task))
+    {
+      g_task_propagate_pointer (task, error);
+      return FALSE;
+    }
 
- out:
-  return ret;
+  return TRUE;
 }
 
 /* ---------------------------------------------------------------------------------------------------- */