diff options
| -rw-r--r-- | lib/gibber/gibber-bytestream-oob.c | 2 | ||||
| -rw-r--r-- | lib/gibber/gibber-fd-transport.c | 12 | ||||
| -rw-r--r-- | lib/gibber/gibber-transport.c | 8 | ||||
| -rw-r--r-- | lib/gibber/gibber-transport.h | 7 | ||||
| -rw-r--r-- | src/tube-stream.c | 2 |
5 files changed, 15 insertions, 16 deletions
diff --git a/lib/gibber/gibber-bytestream-oob.c b/lib/gibber/gibber-bytestream-oob.c index 0f1d38fb..10bd0cf8 100644 --- a/lib/gibber/gibber-bytestream-oob.c +++ b/lib/gibber/gibber-bytestream-oob.c @@ -1180,7 +1180,7 @@ gibber_bytestream_oob_block_read (GibberBytestreamOOB *self, priv->read_blocked = block; DEBUG ("%s the transport bytestream", block ? "block": "unblock"); - gibber_transport_block (priv->transport, block); + gibber_transport_block_receiving (priv->transport, block); } static void diff --git a/lib/gibber/gibber-fd-transport.c b/lib/gibber/gibber-fd-transport.c index 29863c92..39b38677 100644 --- a/lib/gibber/gibber-fd-transport.c +++ b/lib/gibber/gibber-fd-transport.c @@ -50,7 +50,7 @@ static void _do_disconnect(GibberFdTransport *self); static gboolean gibber_fd_transport_buffer_is_empty ( GibberTransport *transport); -static void gibber_fd_transport_block (GibberTransport *transport, +static void gibber_fd_transport_block_receiving (GibberTransport *transport, gboolean block); G_DEFINE_TYPE(GibberFdTransport, gibber_fd_transport, GIBBER_TYPE_TRANSPORT) @@ -111,7 +111,7 @@ gibber_fd_transport_class_init (GibberFdTransportClass *gibber_fd_transport_clas transport_class->disconnect = gibber_fd_transport_disconnect; transport_class->get_sockaddr = gibber_fd_transport_get_sockaddr; transport_class->buffer_is_empty = gibber_fd_transport_buffer_is_empty; - transport_class->block = gibber_fd_transport_block; + transport_class->block_receiving = gibber_fd_transport_block_receiving; gibber_fd_transport_class->read = gibber_fd_transport_read; gibber_fd_transport_class->write = gibber_fd_transport_write; @@ -396,21 +396,21 @@ gibber_fd_transport_buffer_is_empty (GibberTransport *transport) } static void -gibber_fd_transport_block (GibberTransport *transport, - gboolean block) +gibber_fd_transport_block_receiving (GibberTransport *transport, + gboolean block) { GibberFdTransport *self = GIBBER_FD_TRANSPORT (transport); GibberFdTransportPrivate *priv = GIBBER_FD_TRANSPORT_GET_PRIVATE (self); if (block && priv->watch_in != 0) { - DEBUG ("block the transport"); + DEBUG ("block receiving from the transport"); g_source_remove (priv->watch_in); priv->watch_in = 0; } else if (!block && priv->watch_in == 0) { - DEBUG ("unblock the transport"); + DEBUG ("unblock receiving from the transport"); priv->watch_in = g_io_add_watch (priv->channel, G_IO_IN, _channel_io_in, self); } diff --git a/lib/gibber/gibber-transport.c b/lib/gibber/gibber-transport.c index 2c63b9ab..3643b36e 100644 --- a/lib/gibber/gibber-transport.c +++ b/lib/gibber/gibber-transport.c @@ -261,12 +261,12 @@ gibber_transport_emit_buffer_empty (GibberTransport *transport) } void -gibber_transport_block (GibberTransport *transport, - gboolean block) +gibber_transport_block_receiving (GibberTransport *transport, + gboolean block) { GibberTransportClass *cls = GIBBER_TRANSPORT_GET_CLASS (transport); - g_assert (cls->block != NULL); - cls->block (transport, block); + g_assert (cls->block_receiving != NULL); + cls->block_receiving (transport, block); } diff --git a/lib/gibber/gibber-transport.h b/lib/gibber/gibber-transport.h index 641391b2..d5d83235 100644 --- a/lib/gibber/gibber-transport.h +++ b/lib/gibber/gibber-transport.h @@ -55,7 +55,7 @@ struct _GibberTransportClass { gboolean (*get_sockaddr) (GibberTransport *transport, struct sockaddr_storage *addr, socklen_t *len); gboolean (*buffer_is_empty) (GibberTransport *transport); - void (*block) (GibberTransport *transport, gboolean block); + void (*block_receiving) (GibberTransport *transport, gboolean block); }; struct _GibberTransport { @@ -121,9 +121,8 @@ gibber_transport_buffer_is_empty (GibberTransport *transport); void gibber_transport_emit_buffer_empty (GibberTransport *transport); -void -gibber_transport_block (GibberTransport *transport, - gboolean block); +void gibber_transport_block_receiving (GibberTransport *transport, + gboolean block); G_END_DECLS diff --git a/src/tube-stream.c b/src/tube-stream.c index 77e34cf2..e73e42f2 100644 --- a/src/tube-stream.c +++ b/src/tube-stream.c @@ -280,7 +280,7 @@ bytestream_write_blocked_cb (GibberBytestreamIface *bytestream, DEBUG ("bytestream unblocked, restart to read data from the tube socket"); } - gibber_transport_block (transport, blocked); + gibber_transport_block_receiving (transport, blocked); } static void |