[tracker/fix-deprecations: 4/4] tracker-writeback: Use cancellable for GTask from data



commit e4b4325693e1e37fd102ac0c12e68cc10e6f84ba
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Sep 27 17:41:51 2013 +0100

    tracker-writeback: Use cancellable for GTask from data

 src/tracker-writeback/tracker-writeback.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/tracker-writeback/tracker-writeback.c b/src/tracker-writeback/tracker-writeback.c
index 1f65552..bbf629d 100644
--- a/src/tracker-writeback/tracker-writeback.c
+++ b/src/tracker-writeback/tracker-writeback.c
@@ -619,7 +619,6 @@ handle_method_call_perform_writeback (TrackerController     *controller,
                WritebackData *data;
                GTask *task;
 
-               task = g_task_new (controller, NULL, NULL, NULL);
                data = writeback_data_new (controller,
                                           writeback_handlers,
                                           priv->connection,
@@ -627,8 +626,10 @@ handle_method_call_perform_writeback (TrackerController     *controller,
                                           results,
                                           invocation,
                                           request);
+               task = g_task_new (controller, data->cancellable, NULL, NULL);
 
-               g_task_set_task_data (task, data, NULL /*(GDestroyNotify) writeback_data_free */);
+               /* No need to free data here, it's done in the callback. */
+               g_task_set_task_data (task, data, NULL);
                g_task_run_in_thread (task, io_writeback_job);
                g_object_unref (task);
        } else {


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