diff options
author | Luiz Augusto von Dentz <luiz.dentz@openbossa.org> | 2009-02-19 15:58:15 -0300 |
---|---|---|
committer | Luiz Augusto von Dentz <luiz.dentz@openbossa.org> | 2009-02-19 16:23:10 -0300 |
commit | 10d6858927cb3db0a06c42f41cdb5f3175082df3 (patch) | |
tree | 84b4164449b747d56c0d4b86b205f80744162fc5 /serial | |
parent | e777c55aa7cd84fe63bcdee16acde8d1a293b928 (diff) | |
download | bluez-10d6858927cb3db0a06c42f41cdb5f3175082df3.tar.gz |
Make use of g_io_channel_shutdown instead of deprecated g_io_channel_close.
Diffstat (limited to 'serial')
-rw-r--r-- | serial/port.c | 4 | ||||
-rw-r--r-- | serial/proxy.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/serial/port.c b/serial/port.c index ddb07b2c5..4946e1584 100644 --- a/serial/port.c +++ b/serial/port.c @@ -324,7 +324,7 @@ static void rfcomm_connect_cb(GIOChannel *chan, GError *conn_err, int err = errno; error("ioctl(RFCOMMCREATEDEV): %s (%d)", strerror(err), err); reply = failed(port->msg, strerror(err)); - g_io_channel_close(chan); + g_io_channel_shutdown(chan, TRUE, NULL); goto fail; } @@ -332,7 +332,7 @@ static void rfcomm_connect_cb(GIOChannel *chan, GError *conn_err, debug("Serial port %s created", port->dev); - g_io_channel_close(chan); + g_io_channel_shutdown(chan, TRUE, NULL); /* Addressing connect port */ fd = port_open(port); diff --git a/serial/proxy.c b/serial/proxy.c index aab2e87d7..3d21cc3be 100644 --- a/serial/proxy.c +++ b/serial/proxy.c @@ -265,7 +265,7 @@ static gboolean forward_data(GIOChannel *chan, GIOCondition cond, gpointer data) err = channel_write(dest, buf, rbytes); } while (err == G_IO_ERROR_NONE); - g_io_channel_close(dest); + g_io_channel_shutdown(dest, TRUE, NULL); return FALSE; } |