diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-10-21 14:43:44 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-11-21 17:40:51 +0000 |
| commit | 56eb16ff50cee51117db2e4979f5632a8df19e40 (patch) | |
| tree | eea24176c831346a31dc9c7ff80e641f615a108d /gio/gdbusprivate.c | |
| parent | 18482ab17ef5abe3b41bf0f6a076546ff1a5b28e (diff) | |
GDBusWorker: rename some functions
maybe_write_next_message now also closes, and I'm about to make it
consider whether to flush as well, so its name is increasingly
inappropriate. Similarly, write_message_in_idle_cb is a wrapper around
it which could do any of those things.
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=662395
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
Diffstat (limited to 'gio/gdbusprivate.c')
| -rw-r--r-- | gio/gdbusprivate.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c index 2ab591568..71fcd8dd5 100644 --- a/gio/gdbusprivate.c +++ b/gio/gdbusprivate.c @@ -1141,7 +1141,7 @@ write_message_finish (GAsyncResult *res, } /* ---------------------------------------------------------------------------------------------------- */ -static void maybe_write_next_message (GDBusWorker *worker); +static void continue_writing (GDBusWorker *worker); typedef struct { @@ -1213,7 +1213,7 @@ ostream_flush_cb (GObject *source_object, g_mutex_unlock (&data->worker->write_lock); /* OK, cool, finally kick off the next write */ - maybe_write_next_message (data->worker); + continue_writing (data->worker); _g_dbus_worker_unref (data->worker); g_free (data); @@ -1291,7 +1291,7 @@ message_written (GDBusWorker *worker, else { /* kick off the next write! */ - maybe_write_next_message (worker); + continue_writing (worker); } } @@ -1406,7 +1406,7 @@ iostream_close_cb (GObject *source_object, * output_pending must be PENDING_NONE on entry */ static void -maybe_write_next_message (GDBusWorker *worker) +continue_writing (GDBusWorker *worker) { MessageToWriteData *data; @@ -1506,7 +1506,7 @@ maybe_write_next_message (GDBusWorker *worker) * output_pending may be anything */ static gboolean -write_message_in_idle_cb (gpointer user_data) +continue_writing_in_idle_cb (gpointer user_data) { GDBusWorker *worker = user_data; @@ -1514,7 +1514,7 @@ write_message_in_idle_cb (gpointer user_data) * without holding the lock: no other thread ever modifies it. */ if (worker->output_pending == PENDING_NONE) - maybe_write_next_message (worker); + continue_writing (worker); return FALSE; } @@ -1548,7 +1548,7 @@ schedule_write_in_worker_thread (GDBusWorker *worker, idle_source = g_idle_source_new (); g_source_set_priority (idle_source, G_PRIORITY_DEFAULT); g_source_set_callback (idle_source, - write_message_in_idle_cb, + continue_writing_in_idle_cb, _g_dbus_worker_ref (worker), (GDestroyNotify) _g_dbus_worker_unref); g_source_attach (idle_source, worker->shared_thread_data->context); |