[gvfs] Revert "Use complete_with_cancellable() in file enumerator"



commit 771349122fcca712aaf1e95525d3fd403e5dd7fb
Author: Benjamin Otte <otte redhat com>
Date:   Wed Mar 31 15:13:41 2010 +0200

    Revert "Use complete_with_cancellable() in file enumerator"
    
    This reverts commit 5af6a1dbdd2c6a61b515a5bd64350db3af16dae7.
    
    Replacing complete_in_idle() with a call that directly completes is BAD
    BAD BAD.

 client/gdaemonfileenumerator.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/client/gdaemonfileenumerator.c b/client/gdaemonfileenumerator.c
index 77b7ec4..be27545 100644
--- a/client/gdaemonfileenumerator.c
+++ b/client/gdaemonfileenumerator.c
@@ -276,10 +276,9 @@ trigger_async_done (GDaemonFileEnumerator *daemon, gboolean ok)
 						 (GDestroyNotify)free_info_list);
     }
 
-  _g_simple_async_result_complete_with_cancellable (daemon->async_res,
-                                                    daemon->async_cancel);
+  g_simple_async_result_complete_in_idle (daemon->async_res);
   
-  daemon->async_cancel = NULL;
+  daemon->async_cancel = 0;
   daemon->cancelled_tag = 0;
 
   if (daemon->timeout_tag != 0)
@@ -550,7 +549,7 @@ g_daemon_file_enumerator_close_async (GFileEnumerator      *enumerator,
 
   res = g_simple_async_result_new (G_OBJECT (enumerator), callback, user_data,
 				   g_daemon_file_enumerator_close_async);
-  _g_simple_async_result_complete_with_cancellable (res, cancellable);
+  g_simple_async_result_complete_in_idle (res);
   g_object_unref (res);
 }
 



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