[Xfce4-commits] <thunar:nick/1.8> Add small convienence function to cancel a task.

[Nick Schermer]

Updating branch refs/heads/nick/1.8
         to 5d598691b5b2331f09f593801e6c118d3a642d68 (commit)
       from 1e58702bbdf2b413c5a0f58e342740b2add6e6d9 (commit)

commit 5d598691b5b2331f09f593801e6c118d3a642d68
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Aug 4 13:05:44 2013 +0200

    Add small convienence function to cancel a task.

 thunar/thunar-deep-count-job.c |    6 +-----
 thunar/thunar-tasks.c          |   15 +++++++++++++++
 thunar/thunar-tasks.h          |    2 ++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/thunar/thunar-deep-count-job.c b/thunar/thunar-deep-count-job.c
index 5b9e512..57511c4 100644
--- a/thunar/thunar-deep-count-job.c
+++ b/thunar/thunar-deep-count-job.c
@@ -463,10 +463,6 @@ thunar_deep_count_job_run (ThunarDeepCountJob *job)
 void
 thunar_deep_count_job_cancel (ThunarDeepCountJob *job)
 {
-  GCancellable *cancellable;
-
   _thunar_return_if_fail (THUNAR_IS_DEEP_COUNT_JOB (job));
-
-  cancellable = g_task_get_cancellable (job->task);
-  g_cancellable_cancel (cancellable);
+  thunar_tasks_cancel (job->task);
 }
diff --git a/thunar/thunar-tasks.c b/thunar/thunar-tasks.c
index 107eff2..f5ebb08 100644
--- a/thunar/thunar-tasks.c
+++ b/thunar/thunar-tasks.c
@@ -60,6 +60,21 @@ thunar_tasks_new (gpointer             source_object,
 
 
 
+void
+thunar_tasks_cancel (GTask *task)
+{
+  GCancellable *cancellable;
+
+  _thunar_return_if_fail (G_IS_TASK (task));
+
+  cancellable = g_task_get_cancellable (task);
+  g_cancellable_cancel (cancellable);
+
+  _thunar_assert (g_task_had_error (task));
+}
+
+
+
 static void
 thunar_tasks_list_directory_thread (GTask        *task,
                                     gpointer      source_object,
diff --git a/thunar/thunar-tasks.h b/thunar/thunar-tasks.h
index 10afbc4..ae83696 100644
--- a/thunar/thunar-tasks.h
+++ b/thunar/thunar-tasks.h
@@ -31,6 +31,8 @@ GTask     *thunar_tasks_new                (gpointer               source_object
                                             GAsyncReadyCallback    callback,
                                             gpointer               callback_data);
 
+void       thunar_tasks_cancel             (GTask                 *task);
+
 void       thunar_tasks_list_directory     (GTask                 *task,
                                             GFile                 *directory);