diff options
| author | Dan Winship <danw@gnome.org> | 2012-04-17 09:55:33 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2012-07-10 10:47:49 -0400 |
| commit | a98d26c9bbd40b5d00d5a1536402c9196534087c (patch) | |
| tree | 880f4240119aac8bb592a75de15dfbdc3717a5cc /gio/gfile.c | |
| parent | 4749878f9102d40d072bb5c838f2dd2e8d61d417 (diff) | |
| download | glib-a98d26c9bbd40b5d00d5a1536402c9196534087c.tar.gz glib-a98d26c9bbd40b5d00d5a1536402c9196534087c.tar.bz2 glib-a98d26c9bbd40b5d00d5a1536402c9196534087c.zip | |
GFile: remove some unnecessary code
The "mainloop_barrier" in copy_async_thread() is unnecessary, since
the g_simple_async_result_complete_in_idle() will be queued after all
of the g_io_scheduler_job_send_to_mainloop_async()s, and sources with
the same priority will run in the order in which they were queued.
https://bugzilla.gnome.org/show_bug.cgi?id=661767
Diffstat (limited to 'gio/gfile.c')
| -rw-r--r-- | gio/gfile.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/gio/gfile.c b/gio/gfile.c index d29c5cf80..3e44e4293 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -5758,15 +5758,6 @@ copy_async_progress_in_main (gpointer user_data) return FALSE; } -static gboolean -mainloop_barrier (gpointer user_data) -{ - /* Does nothing, but ensures all queued idles before - this are run */ - return FALSE; -} - - static void copy_async_progress_callback (goffset current_num_bytes, goffset total_num_bytes, @@ -5809,12 +5800,6 @@ copy_async_thread (GIOSchedulerJob *job, data, &error); - /* Ensure all progress callbacks are done running in main thread */ - if (data->progress_cb != NULL) - g_io_scheduler_job_send_to_mainloop (job, - mainloop_barrier, - NULL, NULL); - if (!result) g_simple_async_result_take_error (res, error); |