diff options
| author | David Hill <dhill@conformal.com> | 2014-06-15 15:23:29 -0400 |
|---|---|---|
| committer | David Hill <dhill@conformal.com> | 2014-06-15 15:23:29 -0400 |
| commit | 138d4f455512f7da22fd0cf53338888bdf640801 (patch) | |
| tree | 8b8b36747581fe65f052863d8df00cfa4267f412 /src/core/net-nonblock.c | |
| parent | 57f138c087b649b5bbbbcb75d455ef86f93297f4 (diff) | |
| download | irssi-138d4f455512f7da22fd0cf53338888bdf640801.zip | |
Replace deprecated g_io_channel_close with g_io_channel_shutdown.
g_io_channel_close flushes the buffer and does not return errors.
g_io_channel_shutdown(handle, TRUE, NULL) keeps that behavior.
Diffstat (limited to 'src/core/net-nonblock.c')
| -rw-r--r-- | src/core/net-nonblock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/net-nonblock.c b/src/core/net-nonblock.c index 461b2b87..e637e673 100644 --- a/src/core/net-nonblock.c +++ b/src/core/net-nonblock.c @@ -214,7 +214,7 @@ static void simple_init(SIMPLE_THREAD_REC *rec, GIOChannel *handle) if (net_geterror(handle) != 0) { /* failed */ - g_io_channel_close(handle); + g_io_channel_shutdown(handle, TRUE, NULL); g_io_channel_unref(handle); handle = NULL; } @@ -236,9 +236,9 @@ static void simple_readpipe(SIMPLE_THREAD_REC *rec, GIOChannel *pipe) net_gethostbyname_return(pipe, &iprec); g_free_not_null(iprec.errorstr); - g_io_channel_close(rec->pipes[0]); + g_io_channel_shutdown(rec->pipes[0], TRUE, NULL); g_io_channel_unref(rec->pipes[0]); - g_io_channel_close(rec->pipes[1]); + g_io_channel_shutdown(rec->pipes[1], TRUE, NULL); g_io_channel_unref(rec->pipes[1]); ip = iprec.ip4.family != 0 ? &iprec.ip4 : &iprec.ip6; |