[Xfce4-commits] <thunar:nick/1.8> Use the correct function to cancel the task.

[Nick Schermer]

Updating branch refs/heads/nick/1.8
         to 5b248c502b765fef77c36ea14f3d54d9693126ac (commit)
       from 412f326eae7871a198693c3b569983691551d215 (commit)

commit 5b248c502b765fef77c36ea14f3d54d9693126ac
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Aug 5 21:15:16 2013 +0200

    Use the correct function to cancel the task.
    
    g_task_return_error_if_cancelled can only be used in the thread
    function, when there is no return value set.

 thunar/thunar-folder.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c
index 46fac6b..e42fbe9 100644
--- a/thunar/thunar-folder.c
+++ b/thunar/thunar-folder.c
@@ -876,7 +876,7 @@ thunar_folder_reload (ThunarFolder *folder)
   if (G_UNLIKELY (folder->task != NULL))
     {
       /* stop the task */
-      g_task_return_error_if_cancelled (folder->task);
+      thunar_tasks_cancel (folder->task);
       g_object_unref (folder->task);
       folder->task = NULL;
     }